Commit Graph

221 Commits

Author SHA1 Message Date
Baris Usakli
a5cceabc89 dont go below 0 2018-03-06 16:37:35 -05:00
Julian Lam
c25d752573 Merge remote-tracking branch 'origin/master' into develop 2018-02-23 14:48:38 -05:00
Barış Soner Uşaklı
c7b73b4e41 closes #6337 2018-02-21 12:52:26 -05:00
Julian Lam
1ce448f2a1 Merge remote-tracking branch 'origin/master' into develop 2018-02-16 21:23:25 -05:00
Barış Soner Uşaklı
15e9bbac92 closes #6311 2018-02-15 14:52:49 -05:00
Barış Soner Uşaklı
ac1f7eefe5 closes #2304 2018-01-31 15:20:17 -05:00
Barış Soner Uşaklı
c7506d77b0 closes #6247 2018-01-26 18:56:17 -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
Barış Soner Uşaklı
8446a733e5 closes #5569 2018-01-05 14:44:18 -05:00
Baris Usakli
025709499c more fixes 2017-12-20 15:19:22 -05:00
Baris Usakli
242dc41aca move privileges to same page 2017-12-20 14:49:20 -05:00
Baris Usakli
4a73621dca chat privilege 2017-12-18 15:43:57 -05:00
Barış Soner Uşaklı
926b763f74 show hit ratio instead 2017-12-14 14:18:56 -05:00
Barış Soner Uşaklı
43180d4b83 #6158 2017-12-08 19:58:12 -05:00
Barış Soner Uşaklı
e6d31c8bd2 add referer check to /api/admin/users/csv 2017-12-01 18:16:59 -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
Peter Jaszkowiak
c47c47f7e3 Use less memory to build translation files (#6070)
* Change languages build to use less memory

Add graceful-fs so no ned to worry about fs limits

* Specify encoding for fs.readFile

Use eachLimit since graceful-fs handles that now
2017-11-16 17:43:52 -05:00
Barış Soner Uşaklı
5b2a674a4f closes #6020 2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı
a73c2628c4 cache improvements, stats 2017-10-25 18:20:44 -04:00
Barış Soner Uşaklı
e7318a1cea Mongo cache (#6002)
* cache mongodb objects

remove user settings cache since it is cached at the object level

* removed indexOf from isMemberOfSets

* change has to get, change maxAge to 0
2017-10-23 18:31:16 -04:00
Peter Jaszkowiak
da9da8190f Bump dependencies
Bumping eslint & configs meant making some linting fixes

For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
2017-10-02 09:24:27 -04:00
Peter Jaszkowiak
dc87d7fc0f Use .js instead of .jst
Fix #5934
2017-09-23 12:51:20 -06:00
Peter Jaszkowiak
23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
2017-08-30 14:26:41 -06:00
Barış Soner Uşaklı
5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
2017-08-24 19:29:15 -04:00
Julian Lam
53ca6d1199 closes #5889 2017-08-24 12:39:57 -04:00
Baris Usakli
bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-16 15:17:26 -04:00
Baris Usakli
0ce3e4b691 post-queue show category, send notification 2017-08-16 15:15:58 -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
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Baris Usakli
de55c8e431 closes #4070 2017-08-02 13:03:39 -04:00
Julian Lam
d06f114705 comma DANGLE 2017-07-28 16:50:18 -04:00
Julian Lam
f77f17dc20 just use emailLogo instead of doing logo with x50.png suffix 2017-07-28 15:07:44 -04:00
Julian Lam
c40b11aa6e updated site upload logic so that site logo is resized for email header, implemented site logo in email header 2017-07-17 10:47:56 -04:00
Barış Soner Uşaklı
0f234601f1 style changes 2017-06-22 19:03:49 -04:00
Barış Soner Uşaklı
78005d6124 show old groups first 2017-06-22 18:12:35 -04:00
Peter Jaszkowiak
44e55d2a98 Less synchronous stuffs 2017-06-01 14:14:43 -06:00
Baris Usakli
da8b1b605c #5723 2017-05-30 17:21:34 -04:00
Baris Usakli
d7684b042f fix tab 2017-05-29 14:52:10 -04:00
Baris Usakli
de5fe25e57 closes #5715 2017-05-29 14:47:01 -04:00
Barış Soner Uşaklı
9664033b73 add memory usage to info page 2017-05-28 18:40:32 -04:00
Barış Soner Uşaklı
b0dd1ad4d7 admin navigation test 2017-05-24 13:25:56 -04:00
Barış Soner Uşaklı
c9d502320f file.delete method 2017-05-24 00:02:30 -04:00
Barış Soner Uşaklı
b8cc67dfff social tests 2017-05-23 20:43:09 -04:00
Barış Soner Uşaklı
73f31640d7 more tests 2017-05-10 16:27:44 -04:00
Barış Soner Uşaklı
873801e9f3 fix test on nodev4 remove console.logs 2017-05-10 15:51:19 -04:00
Barış Soner Uşaklı
90018a7aab fix lint 2017-05-10 15:35:14 -04:00
Barış Soner Uşaklı
66dee3452f more tests for admin uploads 2017-05-10 15:34:36 -04:00
Barış Soner Uşaklı
3a1eba2537 merge 2017-05-08 13:49:35 -04:00
Barış Soner Uşaklı
e7d076a084 closes #5634 2017-05-03 16:36:34 -04:00