Commit Graph

1406 Commits

Author SHA1 Message Date
Julian Lam
c25d752573 Merge remote-tracking branch 'origin/master' into develop 2018-02-23 14:48:38 -05:00
Julian Lam
a4a961639d only triggering forum updated messaging if hostname matches, fixes #6333 2018-02-20 15:32:44 -05:00
Julian Lam
a86d91a552 wrapping up post history work 2018-02-16 21:22:55 -05:00
Julian Lam
c1fef4561b showing history state in post tools load 2018-02-16 18:31:50 -05:00
Julian Lam
501fc3cee9 WIP post diffs 2018-02-16 18:29:19 -05:00
Julian Lam
55788382ea Merge remote-tracking branch 'origin/master' into develop 2018-02-16 18:21:55 -05:00
Barış Soner Uşaklı
15e9bbac92 closes #6311 2018-02-15 14:52:49 -05:00
Barış Soner Uşaklı
dcc896ee05 add tid to vote notifs 2018-02-14 13:40:12 -05:00
Barış Soner Uşaklı
7f9d9b7654 closes #6316 2018-02-08 10:35:20 -05:00
Julian Lam
897a7d84f9 Merge remote-tracking branch 'origin/master' into develop 2018-01-29 18:11:30 -05:00
Barış Soner Uşaklı
8427601b04 closes #6287 2018-01-29 11:56:06 -05:00
Barış Soner Uşaklı
155e20d216 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-01-26 18:58:01 -05:00
Barış Soner Uşaklı
c7506d77b0 closes #6247 2018-01-26 18:56:17 -05:00
Barış Soner Uşaklı
33a8cb947e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-01-22 15:21:20 -05:00
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
2018-01-18 13:02:56 -05:00
Baris Usakli
61e408b4a2 closes #6253 2018-01-17 12:25:58 -05:00
Julian Lam
457194b333 Merge branch 'master' into develop 2018-01-17 11:02:02 -05:00
Barış Soner Uşaklı
f3fda152bf closes #6216 2018-01-16 18:20:57 -05:00
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
2018-01-09 16:30:16 -05:00
Julian Lam
970c8b6f64 Merge branch 'develop' into chat-rewrite 2018-01-06 12:04:17 -05:00
Julian Lam
d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop 2018-01-06 12:04:07 -05:00
Julian Lam
b2b57d49bf WIP add user modal 2018-01-06 12:03:52 -05:00
Barış Soner Uşaklı
2b6410f201 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 2018-01-03 10:51:18 -05:00
Julian Lam
8588a54ff2 Merge remote-tracking branch 'origin/master' into develop 2017-12-28 16:26:35 -05:00
Barış Soner Uşaklı
23dbb42130 closes #6182 2017-12-25 11:06:52 -05:00
Baris Usakli
4a73621dca chat privilege 2017-12-18 15:43:57 -05:00
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
2017-12-18 14:45:06 -05:00
Julian Lam
88b47f357b removed user.uploadFromUrl and associated logic as cropped image modal supercedes it @pichalite 2017-12-15 13:21:31 -05:00
Barış Soner Uşaklı
99eb1d1785 closes #6163 2017-12-11 10:53:29 -05:00
Barış Soner Uşaklı
f11fd566f9 add inf scroll method #6158 2017-12-08 20:10:37 -05:00
Barış Soner Uşaklı
19ae8dc7e7 closes #6154 2017-12-07 12:15:07 -05:00
Baris Usakli
3551d7d68e closes #4804 2017-12-04 14:56:14 -05:00
Barış Soner Uşaklı
4f2f84e47c #4804 2017-11-30 12:39:07 -05:00
Baris Usakli
b19310049d closes #6136 2017-11-29 11:46:36 -05:00
Baris Usakli
f036eb18a4 closes #5936 2017-11-28 15:42:32 -05:00
Barış Soner Uşaklı
71895f3736 closes #6079 2017-11-23 14:19:26 -05:00
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
2017-11-21 14:14:14 -05:00
Barış Soner Uşaklı
5da24b4120 https://github.com/NodeBB/NodeBB/issues/6073 2017-11-16 10:55:59 -05:00
Julian Lam
7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 2017-11-02 14:13:48 -04:00
Barış Soner Uşaklı
5b2a674a4f closes #6020 2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı
25cd21fba8 closes #6019 2017-10-31 10:53:28 -04:00
Baris Usakli
c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
2017-10-19 13:54:56 -04:00
Barış Soner Uşaklı
d8dc79e3c7 closes #5992 2017-10-18 14:49:42 -04:00
Baris Usakli
6a6dc7ef06 closes #5990 2017-10-16 15:35:46 -04:00
Peter Jaszkowiak
46fafb20b9 Remove string.js dependency 2017-10-13 21:02:41 -06:00
Baris Usakli
8276e20254 closes #5937 2017-09-21 14:30:12 -04:00
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı
5344edc2a7 closes #5885 2017-08-18 20:08:19 -04:00
Baris Usakli
575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-15 13:00:18 -04:00
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
2017-08-15 12:59:40 -04:00