1337 Commits (6c3ebf3b1c6dd24ba91d08893fc4311d0488213a)

Author SHA1 Message Date
Barış Soner Uşaklı 4cd0020584 closes #6449 7 years ago
Julian Lam 7ba2ac9f69 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Julian Lam 8e822c7772 Added user consent pages (#6430)
- "Your Rights & Consent" user settings page
7 years ago
Andrew Rodrigues 67c8d4b560 maximize graph w/ fullscreen API 7 years ago
Julian Lam 13a3f44ed3 closes #6432 7 years ago
Barış Soner Uşaklı 47606c8df5 merge 7 years ago
Julian Lam c1aa46c663 added new option to disable post diffs /cc @BenLubar 7 years ago
Barış Soner Uşaklı 2faaf5b35f closes https://github.com/julianlam/nodebb-plugin-mentions/issues/99 7 years ago
Timothy Fike 585d613d4b fix reload actions (#6394)
* fix reload actions

* wait until restart action is complete instead of using timeouts.

* Change Reload nominclature to Rebuild and Restart.
7 years ago
Peter Jaszkowiak dcf1865b54 Fix ACP alerts to use same system as client (#6396)
* Fix PostCSS warning message

* Fix disconnect indicator styling

Would increase size of quick actions when active

* Use same alert system in ACP and client

- Remove snackbar
- Add styling and fix template for ACP (based on Persona)
7 years ago
Barış Soner Uşaklı ae0f1847ae allow multiple origins for access-control-allow-origin header
add access-control-allow-credentials header to acp
7 years ago
Peter Jaszkowiak eaae5b52cd ACP quick actions (#6374)
* ACP quick actions

- Moved restart, build & restart, and logout into separate buttons
- Moved buttons on mobile into the side menu
- Added version and upgrade alert to header / mobile menu
- Moved version checking to server-side with a cache for rate limiting
- Changed "reload" translations to "rebuild and restart"

* Change info alert to black-on-white to match focused search bar

* Fix tests

* Fallback for failed fetch of latest version
7 years ago
Barış Soner Uşaklı dcb6af5768 closes #6373 7 years ago
Baris Usakli 8492a1586f closes #6360 7 years ago
Andrew Rodrigues 5602092de9 closes #6347 7 years ago
Julian Lam c93f943bef Merge branch 'develop' 7 years ago
Barış Soner Uşaklı b79cd93a49 add some ids to acp elements 7 years ago
Julian Lam c25d752573 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı c7b73b4e41 closes #6337 7 years ago
Julian Lam 1ce448f2a1 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı a224c557c0 closes #6326 7 years ago
Barış Soner Uşaklı 723f31a362 closes #6323 7 years ago
Barış Soner Uşaklı 651b1cc9f8 closes #6321 7 years ago
Barış Soner Uşaklı 7a2d6fe22d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 7 years ago
Barış Soner Uşaklı 42b447ce6a closes #6297 7 years ago
psychobunny 29be18ae5b closes #6268 7 years ago
psychobunny d9ccd9c319 closes #6173 7 years ago
psychobunny d8deb322ff closes #6295 7 years ago
Barış Soner Uşaklı 08fa0683eb check is file 7 years ago
Barış Soner Uşaklı c7506d77b0 closes #6247 7 years ago
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).
7 years ago
Barış Soner Uşaklı f3fda152bf closes #6216 7 years ago
Barış Soner Uşaklı 72140e5338 closes #5991, closes #5884 7 years ago
Barış Soner Uşaklı 735534c719 #6225 7 years ago
Baris Usakli ecf6c0f3ec closes #4652 7 years ago
Barış Soner Uşaklı 8446a733e5 closes #5569 7 years ago
Barış Soner Uşaklı ff6c6a54c1 make upload permissions global
give upload image permission to registered users on install
add global privileges to app.user.privileges for client side use
7 years ago
Baris Usakli 242dc41aca move privileges to same page 7 years ago
Baris Usakli 4a73621dca chat privilege 7 years ago
Barış Soner Uşaklı 926b763f74 show hit ratio instead 7 years ago
Barış Soner Uşaklı e453057acc add settings-menu id 7 years ago
Barış Soner Uşaklı 99eb1d1785 closes #6163 7 years ago
Barış Soner Uşaklı b84e132601 remove unused settings 7 years ago
Barış Soner Uşaklı 19ae8dc7e7 closes #6154 7 years ago
Baris Usakli f177b01022 closes #6147 7 years ago
Barış Soner Uşaklı e3fd402070 escape email in registration queue and invites 7 years ago
Julian Lam f08627be17 minor whitespace fix 7 years ago
Julian Lam 8affaac8f0 tweaking source copy and removing a bit more commented out html. Moving some items around 7 years ago
Linda Badurina 5924713a3b ACP > Posts
- Removed all commented out tpls but one because js file for it is in the works
- Removed unfinished js file
- Removed unfinished checkbox html
7 years ago
Linda Badurina 5ee098ab2b Failed JS Attempt
(For Andrew to see)
7 years ago
Linda Badurina 8b354a26e0 "Post" Settings Fixes 7 years ago
Linda Badurina c72864888d ACP "Posts" Changes
- Seperate section for "Post Length" settings
- New section for settings that only apply to new users
- Changed order of some settings under "posting restrctions" and "new user restrictions"
- Uncapitalized words that shouldn't have been capitalized
7 years ago
Julian Lam 17c52a515d fix incorrect padding/margin values in images in digest 7 years ago
Julian Lam e37c8003b9 replaced 40px padding with more sensible sizes, fixes #6138 7 years ago
Julian Lam b1cd68928b updated digest header 7 years ago
Peter Jaszkowiak 9b11413d14 Bundle admin scripts, remove CDN scripts (#6122)
Close #6120
7 years ago
Peter Jaszkowiak c731661a39 Remove external sources from installer page (#6101)
* Remove external sources from installer page

* Remove bootstrap.min.css

* Make spinner display consistently cross-platform

* Change spinner to look better
7 years ago
Baris Usakli 2065f895d5 closes #6037 7 years ago
Baris Usakli ea3fde332b notification email fixes
add new notification image
fix url to user settings, no need for userslug to be passed in
7 years ago
Julian Lam 321998dd4f Merge branch 'develop' 7 years ago
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
7 years ago
Baris Usakli 9e5a8856d1 fix wrong sorting option in acp 7 years ago
yariplus 7ac01b4c06 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/6 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/11 7 years ago
acardinale 5ed6b5c414 Add User (uid) Welcome Notification (#6045) 7 years ago
Julian Lam 766f94745f updated bootstrap and bootswatch css on installer template, closes #6033 7 years ago
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 7 years ago
Barış Soner Uşaklı 008f757a9b closes #6030 7 years ago
Baris Usakli e3a7649290 closes #6027 7 years ago
Barış Soner Uşaklı 25cd21fba8 closes #6019 8 years ago
Barış Soner Uşaklı 41fbf7117d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı a73c2628c4 cache improvements, stats 8 years ago
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop 8 years ago
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
8 years ago
Julian Lam 9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 8 years ago
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
8 years ago
Baris Usakli 500c978a26 closes #5944 8 years ago
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
8 years ago
Julian Lam 6852c92ed6 Merge remote-tracking branch 'origin/develop' 8 years ago
Peter Jaszkowiak dc87d7fc0f Use .js instead of .jst
Fix #5934
8 years ago
Julian Lam 38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
8 years ago
Peter Jaszkowiak f40d37ad48 Fix #5922 8 years ago
Julian Lam a6b993ef6c updating 500-embed to load after page is fully loaded, #5733 8 years ago
psychobunny fdffaf9ed2 re-organized ip blacklist page 8 years ago
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.
8 years ago
Peter Jaszkowiak 23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
8 years ago
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
8 years ago
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
8 years ago
psychobunny 864321f727 re-organize newbiePostDelay fields 8 years ago
Julian Lam 53ca6d1199 closes #5889 8 years ago
Barış Soner Uşaklı 0498832317 closes #5888 8 years ago
psychobunny 714a7066ec add some styling to blacklist rules textarea 8 years ago
psychobunny 5699236fd2 added missing relative_path to view sitemap button 8 years ago
psychobunny c0c0a28f21 point to the correct section for user registration settings 8 years ago
Baris Usakli bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Baris Usakli a9b1a0bdc4 fix tpl name 8 years ago
Baris Usakli 0ce3e4b691 post-queue show category, send notification 8 years ago
Baris Usakli 5a968730d5 closes #5880 8 years ago
Baris Usakli 575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
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
8 years ago
Barış Soner Uşaklı fc0e5421d6 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı 7ab152e582 fix missing template var name 8 years ago
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
8 years ago
Baris Usakli e0e783ec05 closes #5866 8 years ago
Baris Usakli e836ddf6e2 fix link to topic 8 years ago
Julian Lam 4f9cbabec3 fixes #5853 8 years ago
Baris Usakli de55c8e431 closes #4070 8 years ago
Baris Usakli 875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
8 years ago
Baris Usakli a9dbdc75af closes #5825 8 years ago
Julian Lam 84c1a182e5 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Barış Soner Uşaklı 292d27716a closes #5842 8 years ago
Julian Lam 184dacf1d7 Merge branch 'master' into develop 8 years ago
Julian Lam 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: 44851f9 d37b95c
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Jul 17 16:30:10 2017 -0400

    Merge branch 'noscript-compose' of https://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
Baris Usakli 43a70270ef closes #5835 8 years ago
Barış Soner Uşaklı b983be2919 fix colspans in category privilege tab 8 years ago
Julian Lam 44851f97ac added logic for hiding logo if none is set, preventing crash on startup if no logo is set 8 years ago
Julian Lam 5cec946871 fixed bug with logo being stretched in emails 8 years ago
Julian Lam c40b11aa6e updated site upload logic so that site logo is resized for email header, implemented site logo in email header 8 years ago
Julian Lam 39e78a8a12 forgot the css :rage2: 8 years ago
Julian Lam bcdfba653a tweaking hero image 8 years ago
Julian Lam 5f24d63005 digest tpl 8 years ago
Julian Lam 4c0135e188 fixed missing payload items in invitation email 8 years ago
Julian Lam 0b8b3fafbf banned and invitation 8 years ago
Julian Lam 065b3a3a03 notif_chat tpl 8 years ago
Julian Lam a9540a13a1 fixing url in footer 8 years ago
Julian Lam f0f856fe6b more padding adjustments 8 years ago
Julian Lam f9233d5c9b more padding fixes 8 years ago
Julian Lam b7d0ea900e who knew you couldn't put two paragraphs inside a td 8 years ago
Julian Lam 733f694cf3 adjusted some margins 8 years ago
Julian Lam f128f988f3 slimmed down some data, testing notif_post again 8 years ago
Julian Lam 82dda3e2e6 added email closing back to notif_post 8 years ago
Julian Lam 582dd1ed2e testing new footer with new_post tpl 8 years ago
Julian Lam 51349bb71f more email templates updated 8 years ago
Baris Usakli 5a9ae8f4c7 rearrange menu items 8 years ago
Julian Lam 7c6c1adb04 test email done 8 years ago
Julian Lam 0d0e0d7311 removed prerender text and used partials for header and footer 8 years ago
Julian Lam 6c768030cc using variable for urls again, welcome.tpl done I think 8 years ago
Julian Lam 10d23f5447 resized logo again 8 years ago
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header 8 years ago
Julian Lam 15d368c6b9 more changes to welcome.tpl 8 years ago
Julian Lam 020d3acfe9 WIP welcome email 8 years ago
Baris Usakli e036e26238 closes #5813 8 years ago
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
8 years ago
Barış Soner Uşaklı e9360347ea less padding, closes #5811 8 years ago
Baris Usakli e0de922ede Revert "widgets refactor"
This reverts commit 9e94edb5aa.
8 years ago
Baris Usakli 9e94edb5aa widgets refactor
render widgets server side
widgets can use all the data the template can use
8 years ago
Barış Soner Uşaklı f1cbf563fc closes #5751 8 years ago
Baris Usakli da8b1b605c #5723 8 years ago
Baris Usakli d13eb52f39 closes #5722 8 years ago
psychobunny fa25dcd6a5 move ACP category selector in line with pills 8 years ago
psychobunny 88d5f97280 closes #5717 8 years ago
Baris Usakli de5fe25e57 closes #5715 8 years ago
Barış Soner Uşaklı 9664033b73 add memory usage to info page 8 years ago
psychobunny 1b98449686 closes #5704 8 years ago
Barış Soner Uşaklı 5e4b9479d4 closes #5677 8 years ago
Julian Lam 816809ce3c fixes #5606 8 years ago
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes #5541 8 years ago
Barış Soner Uşaklı aca07a0f20 fix typo 8 years ago
Barış Soner Uşaklı 3a1eba2537 merge 8 years ago
psychobunny 480352c650 send the banned user an email with reason + time limit if applies 8 years ago
Barış Soner Uşaklı ea6f981686 closes #5638 8 years ago
Barış Soner Uşaklı e7d076a084 closes #5634 8 years ago
Barış Soner Uşaklı af6cde5534 show how many nodes responded 8 years ago
barisusakli 33e8ecc1f4 closes #5404 8 years ago
barisusakli b91b41dfa3 show database values in gbs 8 years ago
Peter Jaszkowiak c7929ec7d8 Add option for disabling language autodetection 8 years ago
barisusakli 7b91da067b closes #5602 8 years ago
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak 484a800327 Merge branch master into develop 8 years ago
Peter Jaszkowiak 010473e5cc Merge branch 'master' into patch-pitaj 8 years ago
Peter Jaszkowiak 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
pichalite 4c89497cc4 Closes #5521 8 years ago
psychobunny 5985a8a7a3 closes #5574 8 years ago
psychobunny e121a5a798 closes #5574 8 years ago
Julian Lam 4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Ben Lubar 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
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 62f445ad7f ACP: added tagsinput to other fields that are "comma separated" 8 years ago
psychobunny debe34b96c better styling for tagsinput in ACP and added it to general -> keywords 8 years ago
psychobunny 447b7b02ca use tagsinput for #5439 instead 8 years ago
psychobunny f2eb4b8083 closes #5439 8 years ago
psychobunny 8da8e4d8c3 closes #5469 8 years ago
Julian Lam af2d9fb85b Merge branch 'master' into develop 8 years ago
psychobunny 2ccf60a6ec fixed duplicate uninstall button 8 years ago
Julian Lam 58cbf44143 Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 007051c14c Fix #5476 8 years ago
Julian Lam b1ceec7571 Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 09a1ed0869 Merge pull request #5371 from kingjan1999/master
Update FontAwesome to 4.7.0
8 years ago
Julian Lam 72e77772db Merge branch 'master' into develop 8 years ago
pichalite 1d5b3cc73f ACP manage tags page UI changes 8 years ago
Julian Lam a9f144230e Merge branch 'master' into develop 8 years ago
psychobunny 7b7565ee8e Merge pull request #5468 from pichalite/acp-groups
ACP manage groups UI updates
8 years ago
Julian Lam 672d7352bb Merge branch 'master' into develop 8 years ago
pichalite aea40902b0 Fix markup in category privileges template 8 years ago
pichalite f09f1f6ed8 Fix ACP templates markup 8 years ago
pichalite dcb0f18422 ACP manage groups UI updates 8 years ago
Julian Lam e887dda37a Merge pull request #5461 from pichalite/image-dimension
Use ACP profile image dimension setting in cropper
8 years ago
pichalite a99572fc48 Use ACP profile image dimension setting in cropper 8 years ago
Peter Jaszkowiak 9f15008247 Address review issues 8 years ago
Peter Jaszkowiak 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
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop 8 years ago
Anil Mandepudi 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
psychobunny 0667870286 set an active state for pageview options 8 years ago
psychobunny 3d1425605a prettification of pageview stats 8 years ago
psychobunny 5e35170805 ghfw :rage1: 8 years ago
psychobunny 9e354a09d1 prettier stats on dashboard 8 years ago
barisusakli 387110fecc closes #5315 8 years ago
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route 8 years ago
psychobunny df1a1811f2 add horizontal rule on top of image crop tools 8 years ago
pichalite 2c5f8ed8e6 Add image options to cropper modal 8 years ago
psychobunny dbc3113940 Merge pull request #5412 from pichalite/cropperjs
Ability to crop profile images before uploading
8 years ago
pichalite b757f563df Move tpl and less to core 8 years ago
pichalite 6a073277ac Fix ACP layout on tablets 8 years ago
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts 8 years ago
Stephan 374bc04cdb fixed missing translation string 8 years ago
Julian Lam 48909e753c Merge branch 'master' into develop 8 years ago
Dominic Lennon 3507e4ce0e Adding closing <p> 8 years ago
Dominic Lennon a06e39528f Code review change 8 years ago
kingjan1999 cbe8807ebd update fontawesome.tpl 8 years ago
Peter Jaszkowiak 05b68391dd Use `/assets` for client assets
- Route `/assets` -> `build/public`, falling back on `public`
- Moved destinations for `nodebb.min.js`, `acp.min.js`, `admin.css`, `stylesheet.css`, `templates`, and `sounds` to `build/public`
- r.js modules previously routed through express are now symlinked into `public/build/src/modules`
- minfiles no longer served from a memory cache
- use config `views_dir` setting everywhere template directory is used
- fix cache buster `v=v=`
8 years ago
Dominic Lennon ed19454eca Adding more specific timing for session timings 8 years ago
Julian Lam 05fdd35818 removed menu item for flags management in ACP 8 years ago
Julian Lam db20df0110 Merge branch 'master' into develop 8 years ago
barisusakli 476ec6e4ee closes #5307 8 years ago
psychobunny 66d8c29d25 use different path for installer files 8 years ago
Julian Lam 29c7ae7645 Merge remote-tracking branch 'origin/master' into develop 8 years ago
psychobunny 29cf6f528c no need to check for logged in status in ACP 8 years ago
Julian Lam c640bdf2b9 Merge branch 'master' into develop 8 years ago
Julian Lam 926186108b ACP Translations 8 years ago
Peter Jaszkowiak daf3ab4db4 WIP 8 years ago
Peter Jaszkowiak 038c45f4b6 `admin/manage` translations, misc
- Translate Manage templates and JS
- Change `translator.translate -> .html` into `.translateHtml` where fitting
- Translate `admin/partials/download_plugin_item`
8 years ago
Peter Jaszkowiak 94eb74646c `admin/manage/categories` translations
- Fix privilege table headers so bottom borders align
- Fix `/admin` route to show Dashboard title correctly
- Translate ACP category management and privileges templates
- Translate ACP category management JS
- Remove unnecessary translates in JS
- Fix bootbox wrapper to work with translations containing html
8 years ago
Peter Jaszkowiak 3008794797 `admin/general` JS translations and misc 8 years ago
Peter Jaszkowiak 95bef8f3f6 `admin/extend` JS translations and misc 8 years ago
Peter Jaszkowiak 38eba81933 ACP menu and title translations 8 years ago
Peter Jaszkowiak 20db4657b2 `admin/general` translations 8 years ago
Peter Jaszkowiak 3cd6a8a94b `admin/extend` translations 8 years ago
Peter Jaszkowiak 50aed01c57 `admin/development` translations 8 years ago
Peter Jaszkowiak 6c1b852d48 `admin/appearance` translations 8 years ago
Peter Jaszkowiak 8931702136 `admin/advanced` translations 8 years ago
Julian Lam 76bcc1c327 Merge branch 'flagging-refactor' into develop 8 years ago
barisusakli 55b68197aa closes #4544 8 years ago
barisusakli 9d75c48236 closes #4563 closes #4569 closes #4566 8 years ago
Julian Lam dc508fa0cb Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
Julian Lam ebc9abd773 upgrade script and graphs for #5232 8 years ago
barisusakli 0b9829850c closes #5273 8 years ago
Julian Lam 5d63c0aa3b Merge remote-tracking branch 'origin/master' into flagging-refactor 8 years ago
psychobunny 6b7b51eaf0 Merge pull request #5170 from pitaj/master
ACP search updated to support translations
8 years ago
Peter Jaszkowiak f1cfed50a1 Translate skins and themes fully 8 years ago
Julian Lam cd3002e812 removed user flag reset method and associated socket call from ACP 8 years ago
psychobunny bcb3903446 priv table headers 8 years ago
Peter Jaszkowiak 5223bb5191 Merge branch 'master' of github.com:nodebb/nodebb 8 years ago
barisusakli fb42b83e1b remove hardcoded value @pichalite 8 years ago
barisusakli d6c2779ed0 remove placeholder #5242 8 years ago
barisusakli 4cb48c46ab closes #5242 8 years ago
Peter Jaszkowiak a431dc0305 ACP search updated to support translations 8 years ago
Julian Lam 0e8bf17ff0 re: #5211, bringing back the RELOAD BUTTON :rage2: 8 years ago
Stuart Williams a20027d8f5 Add missing relative path to Admin tags and widgets links 8 years ago
Julian Lam 7d523fae0f closes #5200 8 years ago
Julian Lam e6c9c89342 closes #5197 8 years ago
pichalite 9bcb5710c1 UI fixes for ACP -> Manage -> Registration Queue 8 years ago
pichalite 0087a672ba UI fixes for ACP -> Manage -> Users 8 years ago
Ben Lubar 2185d8eb99 Ban UI fixes (#5169)
- Permanent bans assigned by global moderators no longer expire immediately
  (does not apply retroactively)
- Bans with no reason given no longer have "undefined" as their reason
  (applies retroactively)
- 0 is now a selectable value for "ban duration, select 0 for permanent"
9 years ago
Julian Lam 7993f6a4d8 fix duplicate labels in cookies ACP template 9 years ago
Julian Lam 66aea0eed1 closes #5167 9 years ago
Anil Mandepudi 619ca48403 remove shims for IE8 (#5157) 9 years ago
Julian Lam 02998669c3 introducing option to disable chat message editing/deletion 9 years ago
Julian Lam d4d3fa3102 add warning about gmail routing 9 years ago
barisusakli 1e486875f4 add top posters and most rep to acp 9 years ago
Julian Lam 7ba76fc0b6 showing assignee avatar in flags list 9 years ago
barisusakli 5f16205d15 closes #5109 9 years ago
barisusakli dd7839b7f5 add admin next to username 9 years ago
barisusakli 9a55498fc1 changes to manage/users 9 years ago
Julian Lam 80fe6bde5d removed 'No Assignee' option, updated flag saving logic 9 years ago
Barış Soner Uşaklı f1e6ccdbfc remove dupe header 9 years ago
Barış Soner Uşaklı 9d0dc35703 closes #5081 9 years ago
Barış Soner Uşaklı e2cbc8bc69 fix timeago on acp users 9 years ago
barisusakli d7c559a209 moved active users up 9 years ago
barisusakli 2c140c2107 ability to filter flags by category 9 years ago
psychobunny cecdd205cd Merge pull request #5035 from phit/mixed-content
Fix mixed content warning on 503 status page and installer
9 years ago
barisusakli 72c75bd781 add pagination to flags page 9 years ago
phit 2342d59e6f fix mixed content warning on 503 status page and installer 9 years ago
Julian Lam b12607b1de added uid to flag history, fixed loading on IS, worked around tjs bug 9 years ago
Julian Lam 4e6b2555d0 moved flag history expansion to its own method, showing usernames in assignee history event 9 years ago
Julian Lam d04a10225c WIP showing updated flag data, history, updating flag data 9 years ago
Julian Lam 8dc57cba58 allowing updating of flag data 9 years ago
Julian Lam 7d53b778de WIP extending flags management interface with new options for state, assignee, notes, etc 9 years ago
barisusakli 447fc26b9a fix styling issue on reqister queue 9 years ago
barisusakli a42d8c5be2 simplify keys 9 years ago
barisusakli fcbdfa5688 remove post cache dump 9 years ago
barisusakli 1364fb94bf show debug info 9 years ago
barisusakli fac68d52f6 cache group membership methods
groups.isMember
groups.isMembers
groups.isMemberOfGroups
clear cache for user on group.join & group.leave
9 years ago
barisusakli becacdefb0 new hooks to customize registration queue with custom data 9 years ago
barisusakli 46d2168918 closes #5017 9 years ago
barisusakli c01a2bfa33 default sounds to off, show correct setting in user settings page 9 years ago
barisusakli 3056adf0e1 change to inactive 9 years ago
barisusakli 162f14b229 closes #4908 9 years ago
Julian Lam 194716cd68 re: #5002 9 years ago
barisusakli 6d34bb4657 closes #2166 9 years ago
barisusakli cbafbab107 closes #4986 9 years ago
barisusakli 56118ec1da fix 500-embed.tpl 9 years ago
Julian Lam 785f4fc5a0 updating to jQuery 3.x on frontend and ACP 9 years ago
Julian Lam 25cd772e0e closes #4766 9 years ago
barisusakli e5ecb333f9 closes #4978 9 years ago
Julian Lam 2428d5e442 Update bootstrap in ACP
Also fixed #4872 by moving user creation modal to root level
(outside of .panel)
9 years ago
barisusakli f7540a7edc closes #4811 9 years ago
Ben Lubar de49de3c56 Show accounts using the same IP address as a registration queue entry (#4965) 9 years ago
barisusakli e4fa0289d6 closes #4961 9 years ago
Julian Lam 093b21fc31 fixes #4954 9 years ago
barisusakli f77d9053ad closes #4795 9 years ago
barisusakli bc255110cc closes #2832 9 years ago
barisusakli ed756f18f4 Merge branch 'master' of https://github.com/NodeBB/NodeBB 9 years ago
barisusakli e55043e5ab closes #4867 9 years ago
Julian Lam bc961e2157 removing reload, closes #4936, closes #4929 9 years ago
barisusakli 037b901e85 closes #4919 9 years ago
Barış Soner Uşaklı e1c0a8f3b3 Merge pull request #4909 from BenLubar/self-topic-deletion
add edit/delete post, delete topic privileges per-category
9 years ago
Ben Lubar f62da5c4e9 see NodeBB/NodeBB#4909 9 years ago
Julian Lam 9b8bbde0d3 tweak ACP email settings form syntax 9 years ago
Ben Lubar 26df552d55 Add edit, delete, and topics:delete permissions for users acting on their own posts 9 years ago
Julian Lam f060c7a378 not using relative reference for tjs value 9 years ago
Julian Lam 7902987900 added jqueryUI to list of prefetched resources, and updated its loader to not use $.getScript(). Updated require.js files to use ?v= in the url argument for cache buster 9 years ago
Julian Lam 077f90581b updated plugin tab labels, and added out of date plugin count 9 years ago
barisusakli 2cc804084f closes #4890 9 years ago
Ben Lubar fc387111e2 make keeping avatar versions an option in the ACP that is turned off by default 9 years ago
Julian Lam e7386e20cf closes #4505 9 years ago
Ben Lubar 40b57d6cbe add "Admin Approval for IPs", which works like Normal for new users and Admin Approval for sockpuppet accounts (#4882) 9 years ago
psychobunny 3744f1ecd2 updated fontawesome.tpl 9 years ago
barisusakli 45ff71fd06 closes #2475 9 years ago
Julian Lam 8fd5236641 closes #4844 9 years ago
barisusakli d2cbd7e6dc new priv for uploads 9 years ago
psychobunny 1a48f47e2b Merge pull request #4690 from pichalite/fix-mobile-menu
fixes #4660
9 years ago
Julian Lam a2b0576b79 showing temporary ban indicator in Users ACP, #4807 9 years ago
Julian Lam 61fe9594d7 ban integration frontend for ACP, #4807 9 years ago
barisusakli 789a3736af closes #4820 9 years ago
barisusakli 14b067a838 closes #4800 9 years ago
barisusakli 1102a685d9 closes #4749 9 years ago
psychobunny 3e23426c31 better messaging on flags page 9 years ago
psychobunny bbc570c499 socket disconnected icon for ACP #4609 9 years ago
psychobunny c44fa866e7 nprogress bar in ACP #4609 9 years ago
Julian Lam b3d6a8ef9a mobile fixes for registration queue page 9 years ago
Julian Lam b30151725d fixed error shown when saving sounds ACP page 9 years ago
psychobunny b37b083a4d new privilege: Access Topic
differentiation between Access Category and Access Topic, ie. allows you
to see the category view but not actually enter the topic itself
9 years ago
pichalite bdfad2beda fixes #4660 9 years ago
Jan efbc5f729d update fontawesome.tpl to FA 4.6.2 (#4607)
remove newline

sort icons
9 years ago
Julian Lam 920bc213d3 updated acp advanced/errors table to span the entire page 9 years ago
Julian Lam ba412f4a56 fully completed #4658 9 years ago
Julian Lam 149565169b closes #4658 9 years ago
barisusakli 54ccdf5262 closes #4651 9 years ago
Barış Soner Uşaklı 86cab0787a closes #4668 9 years ago
barisusakli b3fa5583f8 closes #4650 9 years ago
Julian Lam fb9c97e2c8 :shipit: @pichalite 9 years ago
pichalite a507768a8f fix ACP->General->Sounds layout on mobile (#4606)
* fix ACP->General->Sounds layout on mobile

* just to make @juluanlam happy
9 years ago
barisusakli c758f59014 closes #2302 9 years ago
barisusakli 77cf860c7a closes #4588 9 years ago
Julian Lam 2e2c8b8e77 fixes #4584 9 years ago
Julian Lam 8eaff1492a Added ACP option to customise recent post
Before, could either be OP or last reply.

Now, you can choose between OP, last reply, or last post (which
includes OP)
9 years ago
barisusakli cd2c2da420 closes #4575 9 years ago
barisusakli 3648d531fa closes #4545 9 years ago
Julian Lam 5858d914bf closes #4550 9 years ago
barisusakli ff9b2bad49 closes #4512 9 years ago
pichalite 4bb5dad05d move ACP user reg type 9 years ago
pichalite e23377580d fixes #4506 9 years ago
Julian Lam 0449e014f6 updated some help text 9 years ago
Julian Lam f91f705f90 Merge branch 'master' into fix-vendors 9 years ago
barisusakli b948e031f6 closes #2779 9 years ago
Barış Soner Uşaklı 99ae0eb378 closes #4468 9 years ago
Julian Lam 22f73a8f68 fixes #4463 9 years ago
psychobunny f277c66089 closes #4459 9 years ago
barisusakli e8b8f115b7 closes #3652 9 years ago
psychobunny 0c1376c884 closes #4390 9 years ago
pichalite 497592965f fixes issue-4386 9 years ago
barisusakli 677b97d8bb closes #2873 9 years ago
Julian Lam cf8f1210cd added syntax hints to blacklist page 9 years ago
barisusakli b6e22b7723 closes #4367 9 years ago
Julian Lam 184a2c4540 IP blacklist functionality -- re: #4367
Squashed commit of the following:

commit 5c42fd732d091fa66cf5b45a2af5e1697cc1efcd
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:29:45 2016 -0400

    allowing blacklist.test to be called synchronously

commit 979faf2dba5e6f6e2ae1bd07341e63678438daf1
Author: Julian Lam <julian@nodebb.org>
Date:   Mon Mar 14 17:01:14 2016 -0400

    added plain ipv6 support and finished middleware logic

commit d4b72fc1aadff34df3ed7dec52ca8d3c3728a078
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 16:05:31 2016 -0500

    WIP IP Banning logic middleware

commit f08b2553890c5522b6a1eaf521fe4e94df40574a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 15:26:27 2016 -0500

    tweaks to ACP, rule validator

commit 868abacaa494e6b8a88bd4ea429b1b066a9ecb2e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Mar 11 13:50:05 2016 -0500

    IP Banning ACP page, styling, save&load functionality
9 years ago
kingjan1999 147e36a7a5 update fontawesome.tpl to FA 4.5 9 years ago
psychobunny 50b813ae2f merging pull 4347 9 years ago
pichalite de421d5f8c remove language string in ACP 9 years ago
barisusakli 4b531cb655 closes #4345 9 years ago
barisusakli c156d1cb34 closes #4344 9 years ago
pichalite e878b32444 closes #4258 9 years ago
barisusakli 0b2f01b8bc info page 9 years ago
Barış Soner Uşaklı 3d55eec885 Merge pull request #4317 from samhax/delete-user-invites
Delete user invites from APM
9 years ago
HSam a62e31dc70 Finished the invite removal button changes. 9 years ago
HSam 48db16fba7 Finished adding a new delete to also remove the reference from the invites list on the APM. 9 years ago
HSam 4d87f0276b In the process of adding the delete button to the invitation panel. Apparently, the delete method doesn't work with the invitation items, so I might need to add some extra logic. 9 years ago
barisusakli 392814824e fix timestamp 9 years ago
barisusakli f3d2ad5f1f lets break some themes :evil: 9 years ago
psychobunny 92f86eee9c closes #4296 9 years ago
barisusakli df9558f1fa closes #4268 9 years ago
Julian Lam 3f2872979f added buzz 9 years ago
Julian Lam 44aae7daa5 removed hammer, updated semver, added mousetrap 9 years ago
Julian Lam e1323c0295 Updated js code so vendors can be added to the modules folder, so
they can be required properly and we can finally get rid of that
really annoying "mismatched anonymous" error in Require.js.

First module to make the transition: Chart.js
9 years ago
psychobunny ee6d16c3d8 closes #4266 9 years ago
Julian Lam 088940d4c7 Squashed commit of the following:
commit 49e6c0040cc82c1e2684933a8e167ef14854aff8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 16:12:15 2016 -0500

    added recording and charts for topic and post counts globally and by cid

commit e02ff70757f778aa016fbc42ef10a5da2d07a9d9
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 15:35:49 2016 -0500

    added labels to charts

commit e75d83bf3886e5183bcf5fcd848d71c513761e01
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 13:30:47 2016 -0500

    added per category graphs to ACP management page

commit e3f543200950925cc9e8bf33cccb592f949a100e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Thu Feb 25 12:36:11 2016 -0500

    updated analytics to move helper methods to analytics lib and sending per category analytics to ACP page

commit 01891d8f7c408925fcdad18dcaa941e5ebbeb9b2
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Feb 24 16:48:55 2016 -0500

    saving per-category analytics, and updated the writeData method to use async for "clarity"
9 years ago
psychobunny 9e832e006a closes #2920 9 years ago
barisusakli ac09036156 closes #4053 9 years ago
psychobunny 99719414fe closes #4052 9 years ago
psychobunny e069150625 closes #2165 9 years ago