2065f895d5
closes #6037
7 years ago
ea3fde332b
notification email fixes
...
add new notification image
fix url to user settings, no need for userslug to be passed in
7 years ago
321998dd4f
Merge branch 'develop'
7 years ago
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
7 years ago
9e5a8856d1
fix wrong sorting option in acp
7 years ago
7ac01b4c06
Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/6 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/11
7 years ago
5ed6b5c414
Add User (uid) Welcome Notification ( #6045 )
7 years ago
766f94745f
updated bootstrap and bootswatch css on installer template, closes #6033
7 years ago
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
7 years ago
008f757a9b
closes #6030
7 years ago
e3a7649290
closes #6027
7 years ago
25cd21fba8
closes #6019
7 years ago
41fbf7117d
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
7 years ago
a73c2628c4
cache improvements, stats
7 years ago
62ae171432
Merge remote-tracking branch 'origin/master' into develop
7 years ago
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
7 years ago
9cbf1597cd
Merge remote-tracking branch 'origin/master' into develop
7 years ago
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
7 years ago
500c978a26
closes #5944
7 years ago
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
7 years ago
6852c92ed6
Merge remote-tracking branch 'origin/develop'
7 years ago
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
7 years ago
38a7030639
Revert "Merge pull request #5923 from NodeBB/patch-5922"
...
This reverts commit f8ddabc8844976d13013
8 years ago
f40d37ad48
Fix #5922
8 years ago
a6b993ef6c
updating 500-embed to load after page is fully loaded, #5733
8 years ago
fdffaf9ed2
re-organized ip blacklist page
8 years ago
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.
8 years ago
23e7222dfa
Update Nodemailer to v4
...
also filter out .jst files from email template dropdowns
8 years ago
5cc39e8546
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
# src/views/admin/manage/ip-blacklist.tpl
8 years ago
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
8 years ago
864321f727
re-organize newbiePostDelay fields
8 years ago
53ca6d1199
closes #5889
8 years ago
0498832317
closes #5888
8 years ago
714a7066ec
add some styling to blacklist rules textarea
8 years ago
5699236fd2
added missing relative_path to view sitemap button
8 years ago
c0c0a28f21
point to the correct section for user registration settings
8 years ago
bc0645dc26
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
a9b1a0bdc4
fix tpl name
8 years ago
0ce3e4b691
post-queue show category, send notification
8 years ago
5a968730d5
closes #5880
8 years ago
575c9a41cd
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
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
8 years ago
fc0e5421d6
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
7ab152e582
fix missing template var name
8 years ago
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
8 years ago
e0e783ec05
closes #5866
8 years ago
e836ddf6e2
fix link to topic
8 years ago
4f9cbabec3
fixes #5853
8 years ago
de55c8e431
closes #4070
8 years ago
875672522e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/search.js
8 years ago
a9dbdc75af
closes #5825
8 years ago
84c1a182e5
Merge remote-tracking branch 'origin/master' into develop
8 years ago
292d27716a
closes #5842
8 years ago
184dacf1d7
Merge branch 'master' into develop
8 years ago
c4fbed24f8
Squashed commit of the following:
...
commit 9c86d9b2904e14927cd7e9679b92aec0951d1063
Merge: ebfa63a 5a7f811
Author: Julian Lam <julian@nodebb.org>
Date: Thu Jul 20 08:41:39 2017 -0400
Merge branch 'noscript-login' of https://github.com/An-dz/NodeBB into noscript
commit 5a7f81185e8f9bd7d2d011c3d495988be7e437a3
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Mon Jul 17 23:07:14 2017 -0300
Rename clashing variable 'next'
commit ebfa63a984073a58c17aa408c363cdb03ef89985
Merge: c1801cd f159d0d
Author: Julian Lam <julian@nodebb.org>
Date: Mon Jul 17 16:30:40 2017 -0400
Merge branch 'noscript-logout' of https://github.com/An-dz/NodeBB into noscript
commit c1801cda14e6363491e30b659902e2ae71f7e1f7
Merge: 7a5f9f3 9fd542d
Author: Julian Lam <julian@nodebb.org>
Date: Mon Jul 17 16:30:31 2017 -0400
Merge branch 'noscript-register' of https://github.com/An-dz/NodeBB into noscript
commit 7a5f9f35abc834bb72ddddc9ca07d34f2fde8353
Merge: 44851f9https://github.com/An-dz/NodeBB into noscript
commit f159d0d9ef1b7f600e830a96fdb4b9c87c79bb4a
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jul 6 12:16:38 2017 -0300
Prevent form submit
Required for theme change
commit d37b95cb71d32d4483190609798e244c331db165
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jul 6 01:49:52 2017 -0300
Prevent link action with scripts
Required for the theme change that changes the buttons to `a` tags.
commit 9fd542d8970b7d1a4126f4edc4b44eab7d708fb0
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 19:57:56 2017 -0300
Fix tests
commit cdad5bf8c2891ad76f7441fd4d8a74b058a14e6d
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 19:09:17 2017 -0300
Update error handling
commit 4ff11cd136a4fb98483f837e2cebc741380dfe76
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 17:29:08 2017 -0300
Remove async waterfall
commit df01d44e821a70c984b89e9585a325c3e02c6e37
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 16:59:43 2017 -0300
Set noscript compose as noscript at start
commit 4bcc380da72239b8315cc849a77a3036e06e4a12
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 16:59:12 2017 -0300
Remove last useless next
commit b5eac6fea11e209934c0648a7e75ad07a2167123
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 18:35:08 2017 -0300
Last function requires no next
commit 20a5cce6e6e32a454c304c448383707ec44c75a8
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 18:06:58 2017 -0300
Remove more useless next calls
commit 85ee22a79bcbbb1995106f43d4c74d6ba9206cab
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 17:46:07 2017 -0300
Remove useless next calls
commit 7d984c47ad24faac1fe537dee4a5a7d697e8634c
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 15:45:31 2017 -0300
Support old themes
commit 4a09dfbd08253115c342a9e829c4e6940cecb8cc
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 15:37:23 2017 -0300
Moved all error handling into helpers function
commit 391aa6e67ef9ab67304005e14ac0633cdb630713
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jun 8 15:37:37 2017 -0300
ESLint - Fix mixed conditionals
commit 80ccc6fd581d791f31e7ab62de8de611837bfc3c
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 18:08:15 2017 -0300
Compose without scripts
commit 2aca811256721238ca0cede4954213d369009885
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 18:00:44 2017 -0300
Register without scripts
commit 097bb51577fb26f8e22f86dc274cb670ab606a8a
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 16:42:15 2017 -0300
Logout without scripts
commit d497e08109891079656fee1c145043a9c0e55f2e
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 16:27:10 2017 -0300
Login without script
8 years ago
43a70270ef
closes #5835
8 years ago
b983be2919
fix colspans in category privilege tab
8 years ago
44851f97ac
added logic for hiding logo if none is set, preventing crash on startup if no logo is set
8 years ago
5cec946871
fixed bug with logo being stretched in emails
8 years ago
c40b11aa6e
updated site upload logic so that site logo is resized for email header, implemented site logo in email header
8 years ago
39e78a8a12
forgot the css :rage2:
8 years ago
bcdfba653a
tweaking hero image
8 years ago
5f24d63005
digest tpl
8 years ago
4c0135e188
fixed missing payload items in invitation email
8 years ago
0b8b3fafbf
banned and invitation
8 years ago
065b3a3a03
notif_chat tpl
8 years ago
a9540a13a1
fixing url in footer
8 years ago
f0f856fe6b
more padding adjustments
8 years ago
f9233d5c9b
more padding fixes
8 years ago
b7d0ea900e
who knew you couldn't put two paragraphs inside a td
8 years ago
733f694cf3
adjusted some margins
8 years ago
f128f988f3
slimmed down some data, testing notif_post again
8 years ago
82dda3e2e6
added email closing back to notif_post
8 years ago
582dd1ed2e
testing new footer with new_post tpl
8 years ago
51349bb71f
more email templates updated
8 years ago
5a9ae8f4c7
rearrange menu items
8 years ago
7c6c1adb04
test email done
8 years ago
0d0e0d7311
removed prerender text and used partials for header and footer
8 years ago
6c768030cc
using variable for urls again, welcome.tpl done I think
8 years ago
10d23f5447
resized logo again
8 years ago
a2627d2066
added default payload to emails, and adding nodebb logo for email header
8 years ago
15d368c6b9
more changes to welcome.tpl
8 years ago
020d3acfe9
WIP welcome email
8 years ago
e036e26238
closes #5813
8 years ago
923bd86662
Widgets refactor ( #5817 )
...
* widgets refactor
render widgets server side
widgets can use all the data the template can use
* fix tests
8 years ago
e9360347ea
less padding, closes #5811
8 years ago
e0de922ede
Revert "widgets refactor"
...
This reverts commit 9e94edb5aa
8 years ago
9e94edb5aa
widgets refactor
...
render widgets server side
widgets can use all the data the template can use
8 years ago
f1cbf563fc
closes #5751
8 years ago
da8b1b605c
#5723
8 years ago
d13eb52f39
closes #5722
8 years ago
fa25dcd6a5
move ACP category selector in line with pills
8 years ago
88d5f97280
closes #5717
8 years ago
de5fe25e57
closes #5715
8 years ago
9664033b73
add memory usage to info page
8 years ago
1b98449686
closes #5704
8 years ago
5e4b9479d4
closes #5677
8 years ago
816809ce3c
fixes #5606
8 years ago
064a8aa6d7
Allowing custom date range to be supplied in pageviews graph, closes #5541
8 years ago
aca07a0f20
fix typo
8 years ago
3a1eba2537
merge
8 years ago
480352c650
send the banned user an email with reason + time limit if applies
8 years ago
ea6f981686
closes #5638
8 years ago
e7d076a084
closes #5634
8 years ago
af6cde5534
show how many nodes responded
8 years ago
33e8ecc1f4
closes #5404
8 years ago
b91b41dfa3
show database values in gbs
8 years ago
c7929ec7d8
Add option for disabling language autodetection
8 years ago
7b91da067b
closes #5602
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
484a800327
Merge branch master into develop
8 years ago
010473e5cc
Merge branch 'master' into patch-pitaj
8 years ago
0ef30e91ba
Use ace-builds npm package instead of vendor
...
ace can be referenced as an r.js module, reduces acp bundle size
8 years ago
4c89497cc4
Closes #5521
8 years ago
5985a8a7a3
closes #5574
8 years ago
e121a5a798
closes #5574
8 years ago
4b3dcd1a02
Merge remote-tracking branch 'origin/master' into develop
8 years ago
7f713ee822
Admin option to allow all users to view votes ( #5534 )
...
* Admin option to allow all users to view votes
* Fix </strong></strong>
8 years ago
860999fa6c
Merge remote-tracking branch 'origin/master' into develop
8 years ago
62f445ad7f
ACP: added tagsinput to other fields that are "comma separated"
8 years ago
debe34b96c
better styling for tagsinput in ACP and added it to general -> keywords
8 years ago
447b7b02ca
use tagsinput for #5439 instead
8 years ago
f2eb4b8083
closes #5439
8 years ago
8da8e4d8c3
closes #5469
8 years ago
af2d9fb85b
Merge branch 'master' into develop
8 years ago
2ccf60a6ec
fixed duplicate uninstall button
8 years ago
58cbf44143
Merge branch 'master' into develop
8 years ago
007051c14c
Fix #5476
8 years ago
b1ceec7571
Merge remote-tracking branch 'origin/master' into develop
8 years ago
09a1ed0869
Merge pull request #5371 from kingjan1999/master
...
Update FontAwesome to 4.7.0
8 years ago
72e77772db
Merge branch 'master' into develop
8 years ago
1d5b3cc73f
ACP manage tags page UI changes
8 years ago
a9f144230e
Merge branch 'master' into develop
8 years ago
7b7565ee8e
Merge pull request #5468 from pichalite/acp-groups
...
ACP manage groups UI updates
8 years ago
672d7352bb
Merge branch 'master' into develop
8 years ago
aea40902b0
Fix markup in category privileges template
8 years ago
f09f1f6ed8
Fix ACP templates markup
8 years ago
dcb0f18422
ACP manage groups UI updates
8 years ago
e887dda37a
Merge pull request #5461 from pichalite/image-dimension
...
Use ACP profile image dimension setting in cropper
8 years ago
a99572fc48
Use ACP profile image dimension setting in cropper
8 years ago
9f15008247
Address review issues
8 years ago
c75391f9f5
Sound system improvements
...
- Fix sound ACP uploads
- Display soundpack names with sound files
- Soundpacks can have sounds with identical names
- Link sounds during build step
- Generate map of sound name to file name during build step
- Change how soundpacks work. It's now done via a field in plugin.json
8 years ago
fcaefbadca
Merge remote-tracking branch 'origin/master' into develop
8 years ago
c25836b5fc
Option to upload without cropping ( #5447 )
...
* Option to upload without cropping
* Fix styling
* Fix styling
* Add missing semi-colon
* I fail at styling :fail:
8 years ago
0667870286
set an active state for pageview options
8 years ago
3d1425605a
prettification of pageview stats
8 years ago
5e35170805
ghfw :rage1:
8 years ago
9e354a09d1
prettier stats on dashboard
8 years ago
387110fecc
closes #5315
8 years ago
8a0a74d95e
Merge remote-tracking branch 'origin/master' into develop
8 years ago
Baris Usakli
Julian Lam
yariplus
acardinale
Barış Soner Uşaklı
Peter Jaszkowiak
Dravere
psychobunny
Harmdhast
pichalite
Ben Lubar
Anil Mandepudi