Baris Usakli
2065f895d5
closes #6037
2017-11-17 15:26:36 -05:00
Baris Usakli
ea3fde332b
notification email fixes
...
add new notification image
fix url to user settings, no need for userslug to be passed in
2017-11-17 14:13:55 -05:00
Julian Lam
321998dd4f
Merge branch 'develop'
2017-11-16 10:11:20 -05:00
Barış Soner Uşaklı
dd176dd5f2
Notification delivery ( #6072 )
...
* ability for users to choose how they receive notifications
add type field to more notifications, the type field is used to
determine what to do based on user
setting(none,notification,email,notificationemail)
* change var name to types
* cleanup
* add event types for privileged users
* remove unused language keys
* fix uids check
* changed if statements
* upgrade script to preserver old settings
2017-11-15 21:35:10 -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
766f94745f
updated bootstrap and bootswatch css on installer template, closes #6033
2017-11-03 11:29:06 -04: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
Baris Usakli
e3a7649290
closes #6027
2017-11-01 12:31:15 -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
Julian Lam
6852c92ed6
Merge remote-tracking branch 'origin/develop'
2017-10-03 13:37:43 -04:00
Peter Jaszkowiak
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
2017-09-23 12:51:20 -06:00
Julian Lam
38a7030639
Revert "Merge pull request #5923 from NodeBB/patch-5922"
...
This reverts commit f8ddabc8844976d13013
2017-09-11 15:37:18 -04:00
Peter Jaszkowiak
f40d37ad48
Fix #5922
2017-09-08 13:23:30 -06:00
Julian Lam
a6b993ef6c
updating 500-embed to load after page is fully loaded, #5733
2017-09-08 11:55:37 -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
Peter Jaszkowiak
abffc29128
Use Benchpress ( #5901 )
...
* Use Benchpress
* Use Benchpress.compileParse
* Error for template load failure
* Use benchpressjs package
* Compile templates on demand
* Fix user settings page
* Fix admin search to exclude `.jst` files
* Fix 500-embed
So ajaxify can still show an error if the server goes down
2017-08-24 19:26:50 -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
bc0645dc26
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-08-16 15:17:26 -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
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
Barış Soner Uşaklı
fc0e5421d6
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
2017-08-12 20:37:12 -04:00
Barış Soner Uşaklı
7ab152e582
fix missing template var name
2017-08-12 20:36:39 -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
e0e783ec05
closes #5866
2017-08-09 10:48:26 -04:00
Baris Usakli
e836ddf6e2
fix link to topic
2017-08-03 14:14:05 -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
875672522e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/search.js
2017-07-28 14:19:09 -04:00
