Commit Graph

661 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
b084a596fa closes #6301 2018-02-01 14:33: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ı
0a5d16d1cd closes #6284 2018-01-26 15:50:31 -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
Barış Soner Uşaklı
d8b5d40668 closes #6242 2018-01-18 13:33:06 -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ı
72140e5338 closes #5991, closes #5884 2018-01-12 17:29:47 -05:00
Ben Lubar
5b1ed21634 [database/mongo] Improve speed of sortedSetRank (#6229)
* [database/mongo] Improve speed of sortedSetRank

* [database/mongo] Fix sortedSetRank to filter by _key
2018-01-12 13:32:07 -05:00
Julian Lam
c47987b305 fixed test for error when adding self to chat 2018-01-12 13:19:14 -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ı
a2ba01b0d7 fix test 2018-01-10 16:33:22 -05:00
Barış Soner Uşaklı
2f3b7279be closes #6212 2018-01-10 16:14:42 -05:00
Julian Lam
ec07247854 Merge remote-tracking branch 'origin/master' into develop 2018-01-09 16:34:23 -05:00
Baris Usakli
ecf6c0f3ec closes #4652 2018-01-09 14:33:23 -05:00
Barış Soner Uşaklı
7eab9f6ab0 add missing ; 2018-01-08 13:53:05 -05:00
Barış Soner Uşaklı
fdb221c106 fix helper test 2018-01-08 13:41:20 -05:00
Peter Jaszkowiak
4387d5d466 Ensure installed correct version of modules on startup, bump dependencies (#6207)
* Ensure installed correct version of modules

* Bump dependencies

* Bump promise-polyfill

* Fix emailer test

* Fix auto-install regression

introduced in 9b5e0f9e95
2018-01-06 14:06:42 -05:00
Julian Lam
d1ccd78ac2 Merge remote-tracking branch 'origin/master' into develop 2018-01-06 12:04:07 -05:00
Barış Soner Uşaklı
8446a733e5 closes #5569 2018-01-05 14:44:18 -05:00
Barış Soner Uşaklı
87d40e9e78 fix increment to use data 2018-01-03 14:24:07 -05:00
Barış Soner Uşaklı
ff6c6a54c1 make upload permissions global
give upload image permission to registered users on install
add global privileges to app.user.privileges for client side use
2018-01-03 13:27:34 -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ı
108c3c980a show invalid url error if request.head fails 2017-12-14 18:07:32 -05:00
Barış Soner Uşaklı
b778c8433a change hook name 2017-12-13 12:06:52 -05:00
Barış Soner Uşaklı
b55087dab7 closes #6166 2017-12-13 12:06:45 -05:00
Barış Soner Uşaklı
ea83be50a1 closes #6161 2017-12-11 11:21:22 -05:00
Barış Soner Uşaklı
18b559bab0 fix test name 2017-12-10 11:10:59 -05:00
Barış Soner Uşaklı
2bf275fe29 #6158 2017-12-10 11:02:48 -05:00
Barış Soner Uşaklı
2455df438c fix test 2017-12-09 12:48:41 -05:00
Barış Soner Uşaklı
43180d4b83 #6158 2017-12-08 19:58:12 -05:00
Barış Soner Uşaklı
8e04e86e24 closes #5912 2017-12-07 20:43:07 -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ı
e6d31c8bd2 add referer check to /api/admin/users/csv 2017-12-01 18:16:59 -05:00
Barış Soner Uşaklı
e3fd402070 escape email in registration queue and invites 2017-12-01 17:38:02 -05:00
Barış Soner Uşaklı
a7a3f3619b dont allow login with invalid ip, escape ip display on user/info page 2017-11-30 14:24:17 -05:00
caoyi
da5997a06e Fix typo (#6135)
Fix typo
2017-11-30 13:01:51 -05:00
Julian Lam
78c83f2561 fixing tests 2017-11-30 12:53:49 -05:00
Barış Soner Uşaklı
4f2f84e47c #4804 2017-11-30 12:39:07 -05:00
Baris Usakli
a19537dc25 closes #6137 2017-11-29 14:04:45 -05:00
Baris Usakli
b19310049d closes #6136 2017-11-29 11:46:36 -05:00
Baris Usakli
d9c38c7e4f closes #6132 2017-11-28 14:20:16 -05:00
Julian Lam
e83813c531 Emailer tests for Digest.getSubscribers (#6130)
* added additional tests for Digest.getSubscribers

* added another test and tweaked existing digest list building tests
2017-11-28 11:48:31 -05:00
Barış Soner Uşaklı
07ed3807d8 remove console.log 2017-11-27 13:04:18 -05:00
Barış Soner Uşaklı
caaa72b752 closes #6124 2017-11-27 12:52:08 -05:00
Barış Soner Uşaklı
d96674da64 add test for composer fix 2017-11-23 19:13:43 -05:00
Baris Usakli
dbf815ed47 closes #6103 2017-11-22 12:10:40 -05:00
Peter Jaszkowiak
4fcedc6f31 Enable imports in custom email templates (#6052)
* Enable imports in custom email templates

* Compile emails on config change

* Add error logging

* Add emailer tests

* Fix tests

* Only build when config changes
2017-11-21 10:51:20 -05:00