Commit Graph

189 Commits

Author SHA1 Message Date
Julian Lam
a86d91a552 wrapping up post history work 2018-02-16 21:22:55 -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ı
a224c557c0 closes #6326 2018-02-15 12:46:04 -05:00
Barış Soner Uşaklı
723f31a362 closes #6323 2018-02-14 11:53:57 -05:00
Julian Lam
da3ce2e1d5 added error text for multiple associations 2018-02-14 10:38:01 -05:00
Barış Soner Uşaklı
651b1cc9f8 closes #6321 2018-02-13 10:52:05 -05:00
Barış Soner Uşaklı
7b6282f530 closes #6308 2018-02-12 17:12:24 -05:00
Barış Soner Uşaklı
7a2d6fe22d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-02-02 10:36:25 -05:00
psychobunny
29be18ae5b closes #6268 2018-01-31 15:03:23 -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ı
2e2b97033e closes #6248 , closes #6282 2018-01-26 12:25:59 -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
Julian Lam
ac2e185e34 Fixes #6261
If a connection to the parent process is not detected, disable
the restart and reload buttons (as they won't work anyway).
2018-01-19 13:24:00 -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
Barış Soner Uşaklı
81d4766c1a closes #6236 2018-01-15 10:56:25 -05:00
Barış Soner Uşaklı
72140e5338 closes #5991, closes #5884 2018-01-12 17:29:47 -05:00
Julian Lam
3de54a5488 Merge branch 'develop' into chat-rewrite 2018-01-11 15:27:17 -05:00
Julian Lam
f37b9d786d Merge remote-tracking branch 'origin/master' into develop 2018-01-11 15:27:01 -05:00
Barış Soner Uşaklı
2f3b7279be closes #6212 2018-01-10 16:14:42 -05:00
Barış Soner Uşaklı
f70ddce5f9 fix typo in language file 2018-01-10 10:22:31 -05:00
Julian Lam
9bcd4928c7 Merge branch 'develop' into chat-rewrite 2018-01-09 16:34:31 -05:00
Julian Lam
ec07247854 Merge remote-tracking branch 'origin/master' into develop 2018-01-09 16:34:23 -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
Barış Soner Uşaklı
530b0e8439 closes #6217 2018-01-08 12:34:13 -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ı
8446a733e5 closes #5569 2018-01-05 14:44:18 -05:00
Julian Lam
eea124b312 room rename logic 2017-12-21 16:51:16 -05:00
Baris Usakli
242dc41aca move privileges to same page 2017-12-20 14:49:20 -05:00
Julian Lam
d967201b2a drastically simplified main window resizing logic, some language changes 2017-12-19 16:27:41 -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
541aa7fbc6 closes #6177 2017-12-15 16:02:20 -05:00
Barış Soner Uşaklı
108c3c980a show invalid url error if request.head fails 2017-12-14 18:07:32 -05:00
Barış Soner Uşaklı
99eb1d1785 closes #6163 2017-12-11 10:53:29 -05:00
Barış Soner Uşaklı
2bf275fe29 #6158 2017-12-10 11:02:48 -05:00
Barış Soner Uşaklı
43180d4b83 #6158 2017-12-08 19:58:12 -05:00
Barış Soner Uşaklı
19ae8dc7e7 closes #6154 2017-12-07 12:15:07 -05:00
Baris Usakli
f177b01022 closes #6147 2017-12-06 11:54:08 -05:00
Julian Lam
553f894540 error message for disabled SSO registration 2017-12-05 14:16:22 -05:00
Barış Soner Uşaklı
d9e115c3e6 closes #6146 2017-12-05 13:50:06 -05:00
Baris Usakli
3551d7d68e closes #4804 2017-12-04 14:56:14 -05:00
Julian Lam
8affaac8f0 tweaking source copy and removing a bit more commented out html. Moving some items around 2017-11-30 15:19:58 -05:00
Linda Badurina
c72864888d ACP "Posts" Changes
- Seperate section for "Post Length" settings
- New section for settings that only apply to new users
- Changed order of some settings under "posting restrctions" and "new user restrictions"
- Uncapitalized words that shouldn't have been capitalized
2017-11-30 15:19:58 -05:00
Julian Lam
830028b1d5 language strings and fallbacks for #5955 2017-11-23 15:24:51 -05:00
Julian Lam
cdc00cc0f2 added 'dissociate' translation string for #5955 2017-11-22 16:36:27 -05:00