Commit Graph

1664 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
f70ddce5f9 fix typo in language file 2018-01-10 10:22:31 -05:00
Misty (Bot)
c2ba848d00 Latest translations and fallbacks 2018-01-10 09:25:19 +00: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
Misty (Bot)
b9ef1a4805 Latest translations and fallbacks 2018-01-09 09:25:06 +00:00
Barış Soner Uşaklı
530b0e8439 closes #6217 2018-01-08 12:34:13 -05:00
Misty (Bot)
e779942215 Latest translations and fallbacks 2018-01-07 09:24:30 +00: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
Barış Soner Uşaklı
2b6410f201 Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission 2018-01-03 10:51:18 -05:00
Misty (Bot)
a524f9b55f Latest translations and fallbacks 2018-01-01 09:25:13 +00:00
Misty (Bot)
64cbb331b7 Latest translations and fallbacks 2017-12-31 09:24:49 +00:00
Misty (Bot)
1fd0b760b1 Latest translations and fallbacks 2017-12-30 09:25:45 +00:00
Misty (Bot)
e563e8ac82 Latest translations and fallbacks 2017-12-29 09:24:50 +00:00
Julian Lam
dee18d8442 Merge branch 'develop' into chat-rewrite 2017-12-28 16:26:50 -05:00
Julian Lam
8588a54ff2 Merge remote-tracking branch 'origin/master' into develop 2017-12-28 16:26:35 -05:00
Misty (Bot)
4217d06ad0 Latest translations and fallbacks 2017-12-26 09:24:52 +00:00
Julian Lam
eea124b312 room rename logic 2017-12-21 16:51:16 -05:00
Julian Lam
c9364291fb Merge branch 'develop' into chat-rewrite 2017-12-21 11:07:17 -05:00
Julian Lam
f2c251e89c Merge branch 'master' into develop 2017-12-21 11:06:59 -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
Misty (Bot)
094bab24c9 Latest translations and fallbacks 2017-12-17 09:24:44 +00: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
Misty (Bot)
89f5015d83 Latest translations and fallbacks 2017-12-11 09:24:38 +00:00
Barış Soner Uşaklı
2bf275fe29 #6158 2017-12-10 11:02:48 -05:00
Misty (Bot)
0dc37abe1d Latest translations and fallbacks 2017-12-09 09:25:30 +00:00
Barış Soner Uşaklı
43180d4b83 #6158 2017-12-08 19:58:12 -05:00
Misty (Bot)
421685ee69 Latest translations and fallbacks 2017-12-08 09:26:28 +00:00
Barış Soner Uşaklı
19ae8dc7e7 closes #6154 2017-12-07 12:15:07 -05:00
Misty (Bot)
302e20d47d Latest translations and fallbacks 2017-12-07 09:26:36 +00:00
Baris Usakli
f177b01022 closes #6147 2017-12-06 11:54:08 -05:00
Julian Lam
9a59aaa755 topic merge fallbacks 2017-12-06 10:52:46 -05:00
Misty (Bot)
a77a681156 Latest translations and fallbacks 2017-12-06 09:26:44 +00: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
Misty (Bot)
e7a6326b2f Latest translations and fallbacks 2017-12-05 09:26:39 +00:00
Baris Usakli
3551d7d68e closes #4804 2017-12-04 14:56:14 -05:00
Misty (Bot)
dceeb0dd5f Latest translations and fallbacks 2017-12-04 09:25:56 +00:00
Misty (Bot)
dc1fad7956 Latest translations and fallbacks 2017-12-03 09:25:02 +00:00
Misty (Bot)
c0883f629f Latest translations and fallbacks 2017-12-02 09:25:38 +00:00
Julian Lam
50e824f77a it email translation 2017-12-01 17:04:42 -05:00
Misty (Bot)
7269aa17e0 Latest translations and fallbacks 2017-12-01 09:26:10 +00:00