1397 Commits (cb326958cb78c6965ffb46f724eff860f72b8b59)

Author SHA1 Message Date
Julian Lam 897a7d84f9 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 8427601b04 closes #6287 7 years ago
Barış Soner Uşaklı 155e20d216 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı c7506d77b0 closes #6247 7 years ago
Barış Soner Uşaklı 33a8cb947e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Ben Lubar e85aabbe74 Allow running as a cluster without Redis (#6233)
* [database/*] Allow databases other than Redis to provide pubsub for clustering if Redis is not present

* [pubsub] Delay messages sent before the database is ready until the database is ready.

* [pubsub] Restore old behavior of not using the database in non-clustered NodeBB instances.

See comment: https://github.com/NodeBB/NodeBB/pull/6233#issuecomment-357814968
7 years ago
Baris Usakli 61e408b4a2 closes #6253 7 years ago
Julian Lam 457194b333 Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı f3fda152bf closes #6216 7 years ago
Julian Lam 19e53ab61b Lots o' chat changes
- Added chat room management (instead of tagsinput)
- Chat leave button in chat options dropdown
- Refreshing participants when user is added
- Updated autocomplete module so that it can be shown above a modal
  (z-index 100005 > 20000)
- Using cant-chat-with-yourself source string, which wasn't defined
  before, but was still used
7 years ago
Julian Lam 970c8b6f64 Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam b2b57d49bf WIP add user modal 7 years ago
Barış Soner Uşaklı 2b6410f201 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 7 years ago
Julian Lam 8588a54ff2 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 23dbb42130 closes #6182 7 years ago
Baris Usakli 4a73621dca chat privilege 7 years ago
Julian Lam 82a95a03be Chat message soft deletion -- closes #6181
Squashed commit of the following:

commit f84c06bdcc45f24ef7ffde6a8f33b48d8f97fc36
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 14:42:47 2017 -0500

    added restore handler for chat messages

commit 725cd370c6ea1e8f4a28298350f3dc024d4e668e
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 14:23:52 2017 -0500

    backend logic and testing complete for deletion and restoration of chat messages

commit 072da758319cc93fa4c6f8bc0d672a1b716dc06e
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 13:52:35 2017 -0500

    changing message delete logic to not remove mids, but to filter when retrieving

commit 68bf373305ab82737658a7c31dc5549af4d6d69f
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 12:37:58 2017 -0500

    logic to handle deletion of a deleted chat message -- added some failing tests

commit 6899d0d234fa752e227188aa69cfcabd0d0500cc
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Dec 18 11:35:36 2017 -0500

    chat message deletion logic
7 years ago
Julian Lam 88b47f357b removed user.uploadFromUrl and associated logic as cropped image modal supercedes it @pichalite 7 years ago
Barış Soner Uşaklı 99eb1d1785 closes #6163 7 years ago
Barış Soner Uşaklı f11fd566f9 add inf scroll method #6158 7 years ago
Barış Soner Uşaklı 19ae8dc7e7 closes #6154 7 years ago
Baris Usakli 3551d7d68e closes #4804 7 years ago
Barış Soner Uşaklı 4f2f84e47c #4804 7 years ago
Baris Usakli b19310049d closes #6136 7 years ago
Baris Usakli f036eb18a4 closes #5936 7 years ago
Barış Soner Uşaklı 71895f3736 closes #6079 7 years ago
Peter Jaszkowiak 74ceb78800 Upvote notification frequency selection (#6087)
Closes #5963

- Notify on every upvote
- Notify on every tenth upvote
- Notify logarithmically (on 10, 100, 1000...)
- Disable upvote notifications
7 years ago
Barış Soner Uşaklı 5da24b4120 https://github.com/NodeBB/NodeBB/issues/6073 8 years ago
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 8 years ago
Barış Soner Uşaklı 5b2a674a4f closes #6020 8 years ago
Barış Soner Uşaklı 25cd21fba8 closes #6019 8 years ago
Baris Usakli c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
8 years ago
Barış Soner Uşaklı d8dc79e3c7 closes #5992 8 years ago
Baris Usakli 6a6dc7ef06 closes #5990 8 years ago
Peter Jaszkowiak 46fafb20b9 Remove string.js dependency 8 years ago
Baris Usakli 8276e20254 closes #5937 8 years ago
Barış Soner Uşaklı ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı 5344edc2a7 closes #5885 8 years ago
Baris Usakli 575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı f161bbf956 Post queue (#5878)
* #5876

* add user to post queue table

* add time of post into queue

add posting restrictions to queue

* fix shouldQueueLogic for guests

* add test for post-queue route
8 years ago
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
8 years ago
Baris Usakli bd5edc55aa closes #5086 8 years ago
Julian Lam 184dacf1d7 Merge branch 'master' into develop 8 years ago
Julian Lam d9ace1723c removed references to libs that aren't used 8 years ago
Barış Soner Uşaklı cc4f4e7282 style changes 8 years ago
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header 8 years ago
Julian Lam 9c71da1577 sending callback with welcome email test 8 years ago
Baris Usakli 5167c1aa4f Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Julian Lam 3bd02d58e3 fixes logic that allowed posts beyond maximum post length if min is set to 0, @barisusakli 8 years ago