Commit Graph

1426 Commits

Author SHA1 Message Date
Julian Lam
178d4b2f92 don't allow room owner to kick themselves out 2018-04-30 12:49:42 -04:00
Julian Lam
a08572b800 kick support for chats, #6479 2018-04-30 12:35:17 -04:00
Julian Lam
dc386b5b23 Merge branch 'master' into user-blocking 2018-04-27 15:58:04 -04:00
Julian Lam
4bac78a568 wrapping up basic blocking UCP for #6463 2018-04-27 15:37:00 -04:00
Barış Soner Uşaklı
9ae5946e7a Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-04-26 12:17:51 -04:00
Barış Soner Uşaklı
adf9d8eb83 closes #6469 2018-04-25 12:45:25 -04:00
Barış Soner Uşaklı
5d2a7106f6 change upload storage 2018-04-12 12:35:05 -04:00
Julian Lam
7ba2ac9f69 Merge remote-tracking branch 'origin/master' into develop 2018-04-11 16:30:03 -04:00
Peter Jaszkowiak
ce09813bf0 Show failed minify file and fix username editing privilege (#6445)
* Fix global mods and admins being unable to change usernames

* Message file which failed to minify
2018-04-10 16:06:25 -04:00
Barış Soner Uşaklı
927537c759 #6431 add private upload info 2018-04-09 20:22:36 -04:00
Barış Soner Uşaklı
b35bfb81ce ability to delete uploads from account page #6431 2018-04-09 20:03:33 -04:00
Julian Lam
8e822c7772 Added user consent pages (#6430)
- "Your Rights & Consent" user settings page
2018-04-09 12:23:53 -04:00
Julian Lam
f769e734ed removed error output from user reset for rate limiting or incorrect email, so users cannot validate emails via this endpoint 2018-04-04 13:09:53 -04:00
Barış Soner Uşaklı
caf43e3025 closes #6358 2018-04-03 14:20:07 -04:00
Julian Lam
113fed05d8 closes #6412 2018-04-02 12:29:22 -04:00
Baris Usakli
46576189be closes #6392 2018-03-26 16:22:13 -04:00
Timothy Fike
585d613d4b fix reload actions (#6394)
* fix reload actions

* wait until restart action is complete instead of using timeouts.

* Change Reload nominclature to Rebuild and Restart.
2018-03-26 15:17:40 -04:00
Julian Lam
ae46ec0cae fix tests, #6368 2018-03-20 11:55:24 -04:00
Julian Lam
ebc67185c3 closes #6368 2018-03-20 10:55:35 -04:00
Julian Lam
9e44fc6ae2 fixes #6371 2018-03-20 08:41:49 -04:00
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