Commit Graph

443 Commits (a654a2a5fe3b108b2db956c4843aabb76ed3356f)

Author SHA1 Message Date
Julian Lam 05df8900db closes
Julian Lam 9db0f59432 part of
Julian Lam 4cc4824087 Merge pull request from pitaj/master
Maximum invites and invites are stored
Julian Lam 2d203d7dca Squashed commit of the following:
Closes 

commit 3d4f494ed3257bceda8f6f82057cab83f0f252b3
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 12:06:42 2015 -0500

    theme minvers for 

commit b608ce61854f8195143685bb9753b80d32b26e95
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 12:01:03 2015 -0500

    Allowing chat modal to edit and delete messages

    re: 

commit 0104db90a4070582f3938b6929dae35f985bac35
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:51:23 2015 -0500

    Fixed issue where newSet calculations were off

    ... sometimes.

    Also, rendering of edited messages now parses a template partial,
    instead of just replacing the content.

commit 5cb6ca600425ca9320c599b32306e93dcc5aa4ce
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:07:12 2015 -0500

    If edited content matches existing content...

    ... then edit is aborted.

commit 6e7495247b1895589c716db29f919a934087b924
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:05:08 2015 -0500

    some linting and fixed issue where new msgs when deleted would crash server

commit db4a9e40d6dff44569c2437378121db8fdf75cf8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 17:25:56 2015 -0500

    Message deletion for , and fixed bug

    Fixed bug where chat modal would spawn even though user was sitting
    on the /chats page.

commit a5aa2498ab4a8bba02a6daa43a9dbed7b3e37976
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:55:23 2015 -0500

    wiring up the edit button, 

commit 5f2afdcf6f2b9eae6b5873ca100149e65e3d385d
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:20:39 2015 -0500

    added indicator to show if and when a message had been edited

commit e8301132d525c1b9fd46c98cdb282ac7ea7a0d7f
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:06:39 2015 -0500

    Allowing editing of chat messages

commit bfd991be1cb1769599f7d5d2b1638e313c3c2dcb
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 10:33:49 2015 -0500

    Added messageId to messages object return

commit 0306ee6657b3288dd4547c66869d7d4ece0b31ad
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 08:20:17 2015 -0500

    WIP 
Julian Lam acc2dfa037 latest translations, closes
Peter Jaszkowiak a3cfcd9a48 Maximum invites, invites stored
Added the ability for admins to restrict the maximum amount of invites
a user can make. Invites are stored and displayed in the registration
queue admin page.
Julian Lam 65ce8a50b3 Removed cant-vote-self-post
As suggested in , a positive
action has been applied when a user attempts to upvote
their own post. It will now open the upvoters modal
instead of throwing an alertError.

Closes 
Julian Lam 65396000d2 Updated modal to not be .confirm() but .dialog()
Also updated composer code to actually send a link back
to the other topic...

Closes 
Julian Lam 0260c5b68b updated image_spec to not have gif, but bmp
Julian Lam 93c077dabd closes
Julian Lam 48b5bab849 closes
Julian Lam 82f78d910d tweaks to language and updating theme minvers
Julian Lam de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage
Julian Lam b8b9da2c30 Squashed commit of the following:
commit 62d59620d26bc97c7d689e9af57cd8bff654c79e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 11:04:27 2015 -0500

    tweaked 503 template

commit 15a61cbc239c9d654691d91cdadce59e13d97586
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:58:19 2015 -0500

    added text about reloading being required if threshold values are changed

commit 3fe87699332ef0628b4db31f4afef245802a7bc0
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:53:35 2015 -0500

    added ACP settings for toobusy

commit f6a9964baff051072052e6ef99da9e1ffba014df
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 08:53:53 2015 -0500

    removed unused 503a template

commit e6d444736baf4c676f8461d30a5504c6e45df163
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 02:01:11 2015 -0500

    updated code to send static 503 instead of maintenance-style page

commit 11089ae2bb833e068b01ee77ee745d9fd5344805
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 01:18:45 2015 -0500

    added toobusy support so the Node process doesn't fall over at high load
yariplus f815f2d981 Fix userhomepage derps
psychobunny 5c44c365dd chat with %1
psychobunny f6f43fe3de a couple extra useful "posted in" strings
Julian Lam 526afc0910 Merge remote-tracking branch 'origin/master' into user-icons
psychobunny 80da65b4ef unused lang strings
Julian Lam b52475c270 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
barisusakli 7f66494a57 closes
barisusakli 0da39d036b uploading string
barisusakli e2a5440ae8 closes
barisusakli 47e2dd9478 closes
barisusakli 7854e67b7b closes
Julian Lam 4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
Julian Lam 95129a1b40 closes
Julian Lam 97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons
psychobunny be28d7db98 changing bookmark alert to be more accurate to what it actually does
psychobunny 2669241c06 closes
Julian Lam a52f6cf0b4 User Account Edit and Change Picture Modal
Julian Lam 78863a438f Firing new hook `filter:auth.list`
This new plugins allows SSO services to list whether a
user has authenticated via that service, and will display
as such in the user's profile editing screen.
barisusakli 04be0411e7 build search categories server side
barisusakli ade9a44b11 closes
barisusakli 15b667850e closes
barisusakli bb4984a9aa closes
barisusakli e6755d0adc closes
Julian Lam 3baad54223 Close
This commit introduces notification creation if a user requests
membership to a group (in which case notifications are sent to
all group owners), and user invites to a group (in which case
a notification is sent to the invitee).
barisusakli eaefd9d24c remove meta/title.js and meta.title.build
psychobunny 098c56a106 global:header.navigation
psychobunny a217b42cb1 bonus two for - chats/username route
psychobunny 22fc257e36 bonus for - groups/group route
psychobunny 89b8622cfa other routes done, closes
psychobunny 0e0d8474a4 page titles for user pages
barisusakli 07d12e85ae closes https://github.com/NodeBB/nodebb-theme-persona/issues/124
psychobunny 0caa095ea4 closes
psychobunny 0150e0e063 closes
barisusakli f8f3e3faa7 closes https://github.com/NodeBB/nodebb-theme-persona/issues/79
barisusakli 8178e210e4 Fix indents
Axel 91e81065dc Localize "Group Name:"
Axel 79d7721971 Add category and subcategories localization
Axel 85d7b04846 Add missing localization
Axel 9c2d7a2468 new language keys
Barış Soner Uşaklı 6bd131815f Merge pull request from yariplus/mintags
Add minimum tags per topic setting.
yariplus bd863e1ccb Fix derp.
yariplus 546efbbd1b Add translations for min and max tag errors.
barisusakli 65ab5733ef added categories navigation item, ability to change logo url
Julian Lam e25d2fa6e6 closed
Julian Lam cbe810341c changed some wording in user.json to use past participle tense
barisusakli daf1a388eb closes
barisusakli 81eeab42ed category filter on /unread
barisusakli 5ee1951245 closes
barisusakli 57c2418157 closes
barisusakli 718f61e3bd closes
barisusakli a31178ebd8 closes
psychobunny 98cde1a9d6 missing lang key for error: cant-remove-last-admin
psychobunny 19b50c8888 missing lang key for already-flagged
barisusakli 2880a77a9f closes
Julian Lam 05049946d4 updated error strings
psychobunny 56e5f505a0 no need to yell! :p
barisusakli b292aeea72 closes
also dont allow loading posts of a topic if its deleted via
topics.loadMore
barisusakli b94d4f7fe5 Merge remote-tracking branch 'origin/master'
Conflicts:
	public/language/en_GB/error.json
barisusakli 9749658d35 added about me field
Julian Lam 1c94866ab3 addressed some issues brought up re: singular vs plural
Barış Soner Uşaklı a481d2c3fe closes
psychobunny f7734d9b91 missing lang string
barisusakli 8c7ded3062 closes
barisusakli fa9fde43fb closes
barisusakli 663ad38727 closes
psychobunny c92ef6cf34 closes
psychobunny 5db4714ba8 add success message to watch / ignore category methods
barisusakli 729fb1d696 advanced search change
barisusakli 0b76ed90aa no group title
Barış Soner Uşaklı 436a9a61b8 fix language file
Julian Lam 3c6d154a27 translation strings for
Julian Lam 56fc958939 closes
psychobunny 80b308b9a6 [[user:more]]
barisusakli 7a3b4c08e0 closes
Barış Soner Uşaklı f928b87997 use component, add user.watch title
barisusakli 5bc2e7dac2 closes
Barış Soner Uşaklı abd3979fb3 closes
psychobunny 09e0d660cd tags:enter_tags_here better messaging
Barış Soner Uşaklı 8b21f1c8ab dont reload settings page on every save
only show an alert if reload is required
renamed settings.language to settings.userLang to match the config
Barış Soner Uşaklı 5140e5db8d closes
Barış Soner Uşaklı 73505e9bd0 closes
Julian Lam 55262b399a tweaks and refactoring for
Julian Lam ade12116a1 closed
barisusakli 9084ee2d7e cleanup popular.js
Barış Soner Uşaklı 1d5e15eab4 closes
Julian Lam 8b81f3d835 server-side support for hidden option in group admin,
Julian Lam 711dff1dd0 added language strings for
Barış Soner Uşaklı da305210e2 closes
barisusakli aa94dafac1 closes
Barış Soner Uşaklı 276cd51836 closes
Barış Soner Uşaklı 0421b6ef06 closes
Julian Lam 0d9d9bf110 added two new language strings
Barış Soner Uşaklı c98720ee4c show results as WIP
Barış Soner Uşaklı be92f07ab9 save/clear search preferences
Julian Lam 1843d0364e closed
barisusakli b41119a374 show seconds like search page
barisusakli eff1256dfb search sort, search in posts, titles, posts& titles
barisusakli 38dd3d4281 search newer/older than and better pagination
barisusakli 161b934827 reply count filter atleast/atmost
barisusakli def600e927 search in categories and children
barisusakli 255f50343c closes
Julian Lam d284e89d6c added too-many-messages language key
Julian Lam 607e88b3c3 fixed browser title in user groups page
Julian Lam bc9ede7b6c changed emailer.send so that it processes a callback, if provided. Also added new option to receive emails every time a topic you subscribe to is posted to.
Julian Lam d2217b8137 closed
Julian Lam 04be40158c if you attempt to join a group when you're already in a group, you can't anymore.
barisusakli 6ccdf187ea closes
Julian Lam 50ac813388 Merge branch 'private-groups', closed
Julian Lam 675968f0f3 cover photo for groups,
barisusakli 5a940778ee closes
barisusakli 456b844e61 closes
barisusakli 08c1dad3ee topics.isFollowing works with multiple tids now
barisusakli f417e07b9d user search changes
Julian Lam 635393a274 group creation and deletion from outside ACP,
Julian Lam b4731ad47b added colorpicker to frontend, badge colour changes for groups,
Julian Lam 7be0830751 properly showing private state in group details,
Julian Lam 84c19921b9 newly created groups automatically assign the creator as the owner, some tweaks to isPrivate parsing, added groups link to header,
Julian Lam 3a3d45155e show pending members in frontend UI,
Julian Lam a5d7fee623 Merge remote-tracking branch 'origin/master' into private-groups
Julian Lam a907fa2187 added concept of group ownership,
barisusakli a77a761433 closes
barisusakli ce9c17f8e5 ability to search posts by user
barisusakli 60f1b9679a search filters
Julian Lam b97c9e4467 shorter language string for composer guest handle placeholder,
Julian Lam 7dc309fc16 template in composer
barisusakli e6b4a45cda closes
barisusakli 080c54d414
barisusakli ddd6ed9e8c 403 page
Julian Lam 1b526026a0 closed
Julian Lam d51683f62e closed
barisusakli 519b1b7e37 closes
barisusakli 9e1789dc58 closes
Julian Lam a7bc05aeb6 less formal language for
Julian Lam b91d39a0d3 almost everything for
Julian Lam adfb89a2ad closed
barisusakli 41d806f67f removed unused language string