Commit Graph

201 Commits

Author SHA1 Message Date
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
Barış Soner Uşaklı
13f5d29cb9 eslint 2017-04-27 19:16:32 -04:00
Barış Soner Uşaklı
af6cde5534 show how many nodes responded 2017-04-27 18:58:21 -04:00
Peter Jaszkowiak
1ac14a466e Reject non-audio upload requests to the sounds route 2017-04-24 11:22:38 -06:00
Peter Jaszkowiak
c7929ec7d8 Add option for disabling language autodetection 2017-04-21 22:10:25 -06:00
Julian Lam
d18cfced96 Merge remote-tracking branch 'origin/master' into develop 2017-04-12 23:57:14 -04:00
Peter Jaszkowiak
1ed571189c Make utils and translator easier to require
Move utils.walk to file.walk, backwards compatible
2017-04-08 20:27:52 -06:00
Julian Lam
58cbf44143 Merge branch 'master' into develop 2017-02-27 10:05:20 -05:00
Peter Jaszkowiak
007051c14c Fix #5476 2017-02-25 19:51:49 -07:00
Julian Lam
ddea9f534e running eslint again 2017-02-24 12:47:46 -05:00
Julian Lam
72e77772db Merge branch 'master' into develop 2017-02-24 12:46:40 -05:00
Peter Jaszkowiak
dd2b930824 Resolve merge conflicts, minify only .js files 2017-02-23 18:31:49 -07:00
Julian Lam
8154e29ad5 Merge branch 'master' into develop 2017-02-23 13:08:20 -05:00
Julian Lam
672d7352bb Merge branch 'master' into develop 2017-02-23 12:32:03 -05:00
psychobunny
458cbfd603 show dashboard notice if forum is running in dev mode 2017-02-23 12:14:20 -05:00
Peter Jaszkowiak
4bb49a7171 ESlint no-unused-vars 2017-02-18 15:05:36 -07:00
Peter Jaszkowiak
32dc7c23ea ESlint guard-for-in, no-nested-ternary
and operator-linebreak
2017-02-18 13:28:03 -07:00
Peter Jaszkowiak
896c8c7343 ESlint object-curly-spacing 2017-02-18 12:30:49 -07:00
Peter Jaszkowiak
1493afee2a ESlint indent 2017-02-18 02:38:03 -07:00
Peter Jaszkowiak
3b0dd2d1ef ESlint padded-blocks 2017-02-18 02:32:24 -07:00
Peter Jaszkowiak
feb8405f95 ESlint eol-last 2017-02-18 02:30:48 -07:00