Baris Usakli
2065f895d5
closes #6037
2017-11-17 15:26:36 -05:00
Julian Lam
321998dd4f
Merge branch 'develop'
2017-11-16 10:11:20 -05:00
Baris Usakli
9e5a8856d1
fix wrong sorting option in acp
2017-11-15 14:01:20 -05:00
yariplus
7ac01b4c06
Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/6 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/11
2017-11-14 14:11:25 -05:00
acardinale
5ed6b5c414
Add User (uid) Welcome Notification ( #6045 )
2017-11-07 09:17:27 -05:00
Julian Lam
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
2017-11-02 14:13:48 -04:00
Barış Soner Uşaklı
008f757a9b
closes #6030
2017-11-02 13:16:07 -04:00
Barış Soner Uşaklı
25cd21fba8
closes #6019
2017-10-31 10:53:28 -04:00
Barış Soner Uşaklı
41fbf7117d
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-10-25 18:21:54 -04:00
Barış Soner Uşaklı
a73c2628c4
cache improvements, stats
2017-10-25 18:20:44 -04:00
Peter Jaszkowiak
62ae171432
Merge remote-tracking branch 'origin/master' into develop
2017-10-23 17:13:35 -06: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
Julian Lam
9cbf1597cd
Merge remote-tracking branch 'origin/master' into develop
2017-10-12 14:01:14 -04:00
Julian Lam
cd6dcff38b
Split up customJS into customHTML and customJS for better organisation ( #5981 )
...
* WIP
* fixed customJS not actually working in footer
* Moving scripts to footer, #5980
* Added upgrade scripts for #5980
2017-10-12 13:38:27 -04:00
Baris Usakli
500c978a26
closes #5944
2017-10-12 13:03:43 -04:00
Dravere
38900a9964
Smtp emailer issue 5951 ( #5954 )
...
* Fixed typo at emailer.js line 66 (serice -> service)
* When custom SMTP user and password is empty no authentication is attempted
* Added options to choose custom smtp connection security
* Made custom smtp connection security strings translatable
* Changed switch to if-else for custom smtp security option
* Fixed emailer.js lint errors
* Move custom setting to top of list
2017-10-04 18:26:44 -04:00
psychobunny
fdffaf9ed2
re-organized ip blacklist page
2017-09-01 19:29:09 -04:00
Harmdhast
0b520f8d65
Template - Benchpress | Variable call fix
...
Change the way the var is called to match the new benchpressjs templating system.
Fixes the admin permission panel.
2017-09-01 01:10:38 +02: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
psychobunny
864321f727
re-organize newbiePostDelay fields
2017-08-24 14:25:09 -04:00
Julian Lam
53ca6d1199
closes #5889
2017-08-24 12:39:57 -04:00
Barış Soner Uşaklı
0498832317
closes #5888
2017-08-22 10:28:35 -04:00
psychobunny
714a7066ec
add some styling to blacklist rules textarea
2017-08-21 19:05:37 -04:00
psychobunny
5699236fd2
added missing relative_path to view sitemap button
2017-08-21 18:58:01 -04:00
psychobunny
c0c0a28f21
point to the correct section for user registration settings
2017-08-21 18:46:43 -04:00
Baris Usakli
a9b1a0bdc4
fix tpl name
2017-08-16 15:17:10 -04:00
Baris Usakli
0ce3e4b691
post-queue show category, send notification
2017-08-16 15:15:58 -04:00
Baris Usakli
5a968730d5
closes #5880
2017-08-15 14:43:43 -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
Barış Soner Uşaklı
7ab152e582
fix missing template var name
2017-08-12 20:36:39 -04:00
Julian Lam
4f9cbabec3
fixes #5853
2017-08-03 12:06:15 -04:00
Baris Usakli
de55c8e431
closes #4070
2017-08-02 13:03:39 -04:00
Baris Usakli
a9dbdc75af
closes #5825
2017-07-26 14:32:53 -04:00
Barış Soner Uşaklı
292d27716a
closes #5842
2017-07-22 19:21:22 -04:00
Baris Usakli
43a70270ef
closes #5835
2017-07-18 11:31:18 -04:00
Barış Soner Uşaklı
b983be2919
fix colspans in category privilege tab
2017-07-17 15:29:36 -04:00
Baris Usakli
5a9ae8f4c7
rearrange menu items
2017-07-13 17:18:01 -04:00
Baris Usakli
e036e26238
closes #5813
2017-07-10 14:55:57 -04:00
Barış Soner Uşaklı
923bd86662
Widgets refactor ( #5817 )
...
* widgets refactor
render widgets server side
widgets can use all the data the template can use
* fix tests
2017-07-10 12:54:45 -04:00
Barış Soner Uşaklı
e9360347ea
less padding, closes #5811
2017-07-09 16:08:06 -04:00
Baris Usakli
e0de922ede
Revert "widgets refactor"
...
This reverts commit 9e94edb5aa
2017-07-07 15:35:06 -04:00
Baris Usakli
9e94edb5aa
widgets refactor
...
render widgets server side
widgets can use all the data the template can use
2017-07-07 15:33:16 -04:00
Barış Soner Uşaklı
f1cbf563fc
closes #5751
2017-06-12 12:56:03 -04:00
Baris Usakli
da8b1b605c
#5723
2017-05-30 17:21:34 -04:00
Baris Usakli
d13eb52f39
closes #5722
2017-05-30 14:10:16 -04:00
psychobunny
fa25dcd6a5
move ACP category selector in line with pills
2017-05-29 18:26:20 -04:00
psychobunny
88d5f97280
closes #5717
2017-05-29 17:12:02 -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
