hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,016 Commits
2 Branches
0 Tags
158 MiB
Commit Graph

1337 Commits (6c3ebf3b1c6dd24ba91d08893fc4311d0488213a)

Author SHA1 Message Date
Linda Badurina 8b354a26e0 "Post" Settings Fixes
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
Julian Lam 17c52a515d fix incorrect padding/margin values in images in digest
Julian Lam e37c8003b9 replaced 40px padding with more sensible sizes, fixes
Julian Lam b1cd68928b updated digest header
Peter Jaszkowiak 9b11413d14 Bundle admin scripts, remove CDN scripts () 
Close
Peter Jaszkowiak c731661a39 Remove external sources from installer page () 
* Remove external sources from installer page

* Remove bootstrap.min.css

* Make spinner display consistently cross-platform

* Change spinner to look better
Baris Usakli 2065f895d5 closes
Baris Usakli ea3fde332b notification email fixes 
add new notification image
fix url to user settings, no need for userslug to be passed in
Julian Lam 321998dd4f Merge branch 'develop'
Barış Soner Uşaklı dd176dd5f2
Notification delivery () 
* 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
Baris Usakli 9e5a8856d1 fix wrong sorting option in acp
yariplus 7ac01b4c06 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/6 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/11
acardinale 5ed6b5c414 Add User (uid) Welcome Notification ()
Julian Lam 766f94745f updated bootstrap and bootswatch css on installer template, closes
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop'
Barış Soner Uşaklı 008f757a9b closes
Baris Usakli e3a7649290 closes
Barış Soner Uşaklı 25cd21fba8 closes
Barış Soner Uşaklı 41fbf7117d Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı a73c2628c4 cache improvements, stats
Peter Jaszkowiak 62ae171432 Merge remote-tracking branch 'origin/master' into develop
Barış Soner Uşaklı e7318a1cea Mongo cache () 
* 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
Julian Lam 9cbf1597cd Merge remote-tracking branch 'origin/master' into develop
Julian Lam cd6dcff38b Split up customJS into customHTML and customJS for better organisation () 
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, 

* Added upgrade scripts for
Baris Usakli 500c978a26 closes
Dravere 38900a9964 Smtp emailer issue 5951 () 
* 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
Julian Lam 6852c92ed6 Merge remote-tracking branch 'origin/develop'
Peter Jaszkowiak dc87d7fc0f Use .js instead of .jst 
Fix
Julian Lam 38a7030639 Revert "Merge pull request from NodeBB/patch-5922" 
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
Peter Jaszkowiak f40d37ad48 Fix
Julian Lam a6b993ef6c updating 500-embed to load after page is fully loaded,
psychobunny fdffaf9ed2 re-organized ip blacklist page
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.
Peter Jaszkowiak 23e7222dfa Update Nodemailer to v4 
also filter out .jst files from email template dropdowns
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
Peter Jaszkowiak abffc29128 Use Benchpress () 
* 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
psychobunny 864321f727 re-organize newbiePostDelay fields
Julian Lam 53ca6d1199 closes
Barış Soner Uşaklı 0498832317 closes
psychobunny 714a7066ec add some styling to blacklist rules textarea
psychobunny 5699236fd2 added missing relative_path to view sitemap button
psychobunny c0c0a28f21 point to the correct section for user registration settings
Baris Usakli bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Baris Usakli a9b1a0bdc4 fix tpl name
Baris Usakli 0ce3e4b691 post-queue show category, send notification
Baris Usakli 5a968730d5 closes
Baris Usakli 575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı f161bbf956 Post queue () 
* 

* 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
Barış Soner Uşaklı fc0e5421d6 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı 7ab152e582 fix missing template var name
Baris Usakli bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	public/src/admin/extend/plugins.js
Baris Usakli e0e783ec05 closes
Baris Usakli e836ddf6e2 fix link to topic
Julian Lam 4f9cbabec3 fixes
Baris Usakli de55c8e431 closes
Baris Usakli 875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 
# Conflicts:
#	src/search.js
Baris Usakli a9dbdc75af closes
Julian Lam 84c1a182e5 Merge remote-tracking branch 'origin/master' into develop
Barış Soner Uşaklı 292d27716a closes
Julian Lam 184dacf1d7 Merge branch 'master' into develop
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
Baris Usakli 43a70270ef closes
Barış Soner Uşaklı b983be2919 fix colspans in category privilege tab
Julian Lam 44851f97ac added logic for hiding logo if none is set, preventing crash on startup if no logo is set
Julian Lam 5cec946871 fixed bug with logo being stretched in emails
Julian Lam c40b11aa6e updated site upload logic so that site logo is resized for email header, implemented site logo in email header
Julian Lam 39e78a8a12 forgot the css :rage2:
Julian Lam bcdfba653a tweaking hero image
Julian Lam 5f24d63005 digest tpl
Julian Lam 4c0135e188 fixed missing payload items in invitation email
Julian Lam 0b8b3fafbf banned and invitation
Julian Lam 065b3a3a03 notif_chat tpl
Julian Lam a9540a13a1 fixing url in footer
Julian Lam f0f856fe6b more padding adjustments
Julian Lam f9233d5c9b more padding fixes
Julian Lam b7d0ea900e who knew you couldn't put two paragraphs inside a td
Julian Lam 733f694cf3 adjusted some margins
Julian Lam f128f988f3 slimmed down some data, testing notif_post again
Julian Lam 82dda3e2e6 added email closing back to notif_post
Julian Lam 582dd1ed2e testing new footer with new_post tpl
Julian Lam 51349bb71f more email templates updated
Baris Usakli 5a9ae8f4c7 rearrange menu items
Julian Lam 7c6c1adb04 test email done
Julian Lam 0d0e0d7311 removed prerender text and used partials for header and footer
Julian Lam 6c768030cc using variable for urls again, welcome.tpl done I think
Julian Lam 10d23f5447 resized logo again
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header
Julian Lam 15d368c6b9 more changes to welcome.tpl
Julian Lam 020d3acfe9 WIP welcome email
Baris Usakli e036e26238 closes
Barış Soner Uşaklı 923bd86662 Widgets refactor () 
* widgets refactor

render widgets server side
widgets can use all the data the template can use

* fix tests
Barış Soner Uşaklı e9360347ea less padding, closes
Baris Usakli e0de922ede Revert "widgets refactor" 
This reverts commit 9e94edb5aa.
Baris Usakli 9e94edb5aa widgets refactor 
render widgets server side
widgets can use all the data the template can use
Barış Soner Uşaklı f1cbf563fc closes
Baris Usakli da8b1b605c
Baris Usakli d13eb52f39 closes
psychobunny fa25dcd6a5 move ACP category selector in line with pills
psychobunny 88d5f97280 closes
Baris Usakli de5fe25e57 closes
Barış Soner Uşaklı 9664033b73 add memory usage to info page
psychobunny 1b98449686 closes
Barış Soner Uşaklı 5e4b9479d4 closes
Julian Lam 816809ce3c fixes
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes
Barış Soner Uşaklı aca07a0f20 fix typo
Barış Soner Uşaklı 3a1eba2537 merge
psychobunny 480352c650 send the banned user an email with reason + time limit if applies
Barış Soner Uşaklı ea6f981686 closes
Barış Soner Uşaklı e7d076a084 closes
Barış Soner Uşaklı af6cde5534 show how many nodes responded
barisusakli 33e8ecc1f4 closes
barisusakli b91b41dfa3 show database values in gbs
Peter Jaszkowiak c7929ec7d8 Add option for disabling language autodetection
barisusakli 7b91da067b closes
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak 484a800327 Merge branch master into develop
Peter Jaszkowiak 010473e5cc Merge branch 'master' into patch-pitaj
Peter Jaszkowiak 0ef30e91ba Use ace-builds npm package instead of vendor 
ace can be referenced as an r.js module, reduces acp bundle size
pichalite 4c89497cc4 Closes
psychobunny 5985a8a7a3 closes
psychobunny e121a5a798 closes
Julian Lam 4b3dcd1a02 Merge remote-tracking branch 'origin/master' into develop
Ben Lubar 7f713ee822 Admin option to allow all users to view votes () 
* Admin option to allow all users to view votes

* Fix </strong></strong>
Julian Lam 860999fa6c Merge remote-tracking branch 'origin/master' into develop
psychobunny 62f445ad7f ACP: added tagsinput to other fields that are "comma separated"
psychobunny debe34b96c better styling for tagsinput in ACP and added it to general -> keywords
psychobunny 447b7b02ca use tagsinput for instead
psychobunny f2eb4b8083 closes
psychobunny 8da8e4d8c3 closes
Julian Lam af2d9fb85b Merge branch 'master' into develop
psychobunny 2ccf60a6ec fixed duplicate uninstall button
Julian Lam 58cbf44143 Merge branch 'master' into develop
Peter Jaszkowiak 007051c14c Fix
Julian Lam b1ceec7571 Merge remote-tracking branch 'origin/master' into develop
psychobunny 09a1ed0869 Merge pull request from kingjan1999/master 
Update FontAwesome to 4.7.0
Julian Lam 72e77772db Merge branch 'master' into develop
pichalite 1d5b3cc73f ACP manage tags page UI changes
Julian Lam a9f144230e Merge branch 'master' into develop
psychobunny 7b7565ee8e Merge pull request from pichalite/acp-groups 
ACP manage groups UI updates
Julian Lam 672d7352bb Merge branch 'master' into develop
pichalite aea40902b0 Fix markup in category privileges template
pichalite f09f1f6ed8 Fix ACP templates markup
pichalite dcb0f18422 ACP manage groups UI updates
Julian Lam e887dda37a Merge pull request from pichalite/image-dimension 
Use ACP profile image dimension setting in cropper
pichalite a99572fc48 Use ACP profile image dimension setting in cropper
Peter Jaszkowiak 9f15008247 Address review issues
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
Julian Lam fcaefbadca Merge remote-tracking branch 'origin/master' into develop
Anil Mandepudi c25836b5fc Option to upload without cropping () 
* Option to upload without cropping

* Fix styling

* Fix styling

* Add missing semi-colon

* I fail at styling :fail:
psychobunny 0667870286 set an active state for pageview options
psychobunny 3d1425605a prettification of pageview stats
psychobunny 5e35170805 ghfw :rage1:
psychobunny 9e354a09d1 prettier stats on dashboard
barisusakli 387110fecc closes
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route
psychobunny df1a1811f2 add horizontal rule on top of image crop tools
pichalite 2c5f8ed8e6 Add image options to cropper modal
psychobunny dbc3113940 Merge pull request from pichalite/cropperjs 
Ability to crop profile images before uploading
pichalite b757f563df Move tpl and less to core
pichalite 6a073277ac Fix ACP layout on tablets
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts
Stephan 374bc04cdb fixed missing translation string
Julian Lam 48909e753c Merge branch 'master' into develop
Dominic Lennon 3507e4ce0e Adding closing <p>
Dominic Lennon a06e39528f Code review change
kingjan1999 cbe8807ebd update fontawesome.tpl
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=`
Dominic Lennon ed19454eca Adding more specific timing for session timings
Julian Lam 05fdd35818 removed menu item for flags management in ACP
Julian Lam db20df0110 Merge branch 'master' into develop
barisusakli 476ec6e4ee closes
psychobunny 66d8c29d25 use different path for installer files
Julian Lam 29c7ae7645 Merge remote-tracking branch 'origin/master' into develop
psychobunny 29cf6f528c no need to check for logged in status in ACP
Julian Lam c640bdf2b9 Merge branch 'master' into develop
Julian Lam 926186108b ACP Translations
Peter Jaszkowiak daf3ab4db4 WIP
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`
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
Peter Jaszkowiak 3008794797 `admin/general` JS translations and misc
Peter Jaszkowiak 95bef8f3f6 `admin/extend` JS translations and misc
Peter Jaszkowiak 38eba81933 ACP menu and title translations
Peter Jaszkowiak 20db4657b2 `admin/general` translations
Peter Jaszkowiak 3cd6a8a94b `admin/extend` translations
Peter Jaszkowiak 50aed01c57 `admin/development` translations
Peter Jaszkowiak 6c1b852d48 `admin/appearance` translations
Peter Jaszkowiak 8931702136 `admin/advanced` translations
Julian Lam 76bcc1c327 Merge branch 'flagging-refactor' into develop
barisusakli 55b68197aa closes
barisusakli 9d75c48236 closes closes closes
Julian Lam dc508fa0cb Merge remote-tracking branch 'origin/master' into flagging-refactor
Julian Lam ebc9abd773 upgrade script and graphs for
barisusakli 0b9829850c closes
Julian Lam 5d63c0aa3b Merge remote-tracking branch 'origin/master' into flagging-refactor
psychobunny 6b7b51eaf0 Merge pull request from pitaj/master 
ACP search updated to support translations
Peter Jaszkowiak f1cfed50a1 Translate skins and themes fully
Julian Lam cd3002e812 removed user flag reset method and associated socket call from ACP
psychobunny bcb3903446 priv table headers
Peter Jaszkowiak 5223bb5191 Merge branch 'master' of github.com:nodebb/nodebb
barisusakli fb42b83e1b remove hardcoded value @pichalite
barisusakli d6c2779ed0 remove placeholder
barisusakli 4cb48c46ab closes
Peter Jaszkowiak a431dc0305 ACP search updated to support translations
Julian Lam 0e8bf17ff0 re: , bringing back the RELOAD BUTTON :rage2:
Stuart Williams a20027d8f5 Add missing relative path to Admin tags and widgets links
Julian Lam 7d523fae0f closes
Julian Lam e6c9c89342 closes
pichalite 9bcb5710c1 UI fixes for ACP -> Manage -> Registration Queue
pichalite 0087a672ba UI fixes for ACP -> Manage -> Users
Ben Lubar 2185d8eb99 Ban UI fixes () 
- 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"
Julian Lam 7993f6a4d8 fix duplicate labels in cookies ACP template
Julian Lam 66aea0eed1 closes
Anil Mandepudi 619ca48403 remove shims for IE8 ()
Julian Lam 02998669c3 introducing option to disable chat message editing/deletion
Julian Lam d4d3fa3102 add warning about gmail routing
barisusakli 1e486875f4 add top posters and most rep to acp
Julian Lam 7ba76fc0b6 showing assignee avatar in flags list
barisusakli 5f16205d15 closes
barisusakli dd7839b7f5 add admin next to username
barisusakli 9a55498fc1 changes to manage/users
Julian Lam 80fe6bde5d removed 'No Assignee' option, updated flag saving logic
Barış Soner Uşaklı f1e6ccdbfc remove dupe header
Barış Soner Uşaklı 9d0dc35703 closes
Barış Soner Uşaklı e2cbc8bc69 fix timeago on acp users
barisusakli d7c559a209 moved active users up
barisusakli 2c140c2107 ability to filter flags by category
psychobunny cecdd205cd Merge pull request from phit/mixed-content 
Fix mixed content warning on 503 status page and installer
barisusakli 72c75bd781 add pagination to flags page
phit 2342d59e6f fix mixed content warning on 503 status page and installer
Julian Lam b12607b1de added uid to flag history, fixed loading on IS, worked around tjs bug
Julian Lam 4e6b2555d0 moved flag history expansion to its own method, showing usernames in assignee history event
Julian Lam d04a10225c WIP showing updated flag data, history, updating flag data
Julian Lam 8dc57cba58 allowing updating of flag data
Julian Lam 7d53b778de WIP extending flags management interface with new options for state, assignee, notes, etc
barisusakli 447fc26b9a fix styling issue on reqister queue
barisusakli a42d8c5be2 simplify keys
barisusakli fcbdfa5688 remove post cache dump
barisusakli 1364fb94bf show debug info
barisusakli fac68d52f6 cache group membership methods 
groups.isMember
groups.isMembers
groups.isMemberOfGroups
clear cache for user on group.join & group.leave
barisusakli becacdefb0 new hooks to customize registration queue with custom data
barisusakli 46d2168918 closes
barisusakli c01a2bfa33 default sounds to off, show correct setting in user settings page
barisusakli 3056adf0e1 change to inactive
barisusakli 162f14b229 closes
Julian Lam 194716cd68 re:
barisusakli 6d34bb4657 closes
barisusakli cbafbab107 closes
barisusakli 56118ec1da fix 500-embed.tpl
Julian Lam 785f4fc5a0 updating to jQuery 3.x on frontend and ACP
Julian Lam 25cd772e0e closes
barisusakli e5ecb333f9 closes
Julian Lam 2428d5e442 Update bootstrap in ACP 
Also fixed  by moving user creation modal to root level
(outside of .panel)
barisusakli f7540a7edc closes
Ben Lubar de49de3c56 Show accounts using the same IP address as a registration queue entry ()
barisusakli e4fa0289d6 closes
Julian Lam 093b21fc31 fixes
barisusakli f77d9053ad closes
barisusakli bc255110cc closes
barisusakli ed756f18f4 Merge branch 'master' of https://github.com/NodeBB/NodeBB
barisusakli e55043e5ab closes
Julian Lam bc961e2157 removing reload, closes , closes
barisusakli 037b901e85 closes
Barış Soner Uşaklı e1c0a8f3b3 Merge pull request from BenLubar/self-topic-deletion 
add edit/delete post, delete topic privileges per-category
Ben Lubar f62da5c4e9 see
Julian Lam 9b8bbde0d3 tweak ACP email settings form syntax
Ben Lubar 26df552d55 Add edit, delete, and topics:delete permissions for users acting on their own posts
Julian Lam f060c7a378 not using relative reference for tjs value
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
Julian Lam 077f90581b updated plugin tab labels, and added out of date plugin count
barisusakli 2cc804084f closes
Ben Lubar fc387111e2 make keeping avatar versions an option in the ACP that is turned off by default
Julian Lam e7386e20cf closes
Ben Lubar 40b57d6cbe add "Admin Approval for IPs", which works like Normal for new users and Admin Approval for sockpuppet accounts ()
psychobunny 3744f1ecd2 updated fontawesome.tpl
barisusakli 45ff71fd06 closes
Julian Lam 8fd5236641 closes
barisusakli d2cbd7e6dc new priv for uploads
psychobunny 1a48f47e2b Merge pull request from pichalite/fix-mobile-menu 
fixes
Julian Lam a2b0576b79 showing temporary ban indicator in Users ACP,
Julian Lam 61fe9594d7 ban integration frontend for ACP,
barisusakli 789a3736af closes
barisusakli 14b067a838 closes
barisusakli 1102a685d9 closes
psychobunny 3e23426c31 better messaging on flags page
psychobunny bbc570c499 socket disconnected icon for ACP
psychobunny c44fa866e7 nprogress bar in ACP
Julian Lam b3d6a8ef9a mobile fixes for registration queue page
Julian Lam b30151725d fixed error shown when saving sounds ACP page
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
pichalite bdfad2beda fixes
Jan efbc5f729d update fontawesome.tpl to FA 4.6.2 () 
remove newline

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

* just to make @juluanlam happy
barisusakli c758f59014 closes
barisusakli 77cf860c7a closes
Julian Lam 2e2c8b8e77 fixes
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)
barisusakli cd2c2da420 closes
barisusakli 3648d531fa closes
Julian Lam 5858d914bf closes
barisusakli ff9b2bad49 closes
pichalite 4bb5dad05d move ACP user reg type
pichalite e23377580d fixes
Julian Lam 0449e014f6 updated some help text
Julian Lam f91f705f90 Merge branch 'master' into fix-vendors
barisusakli b948e031f6 closes
Barış Soner Uşaklı 99ae0eb378 closes
Julian Lam 22f73a8f68 fixes
psychobunny f277c66089 closes
barisusakli e8b8f115b7 closes
psychobunny 0c1376c884 closes
pichalite 497592965f fixes issue-4386
barisusakli 677b97d8bb closes
Julian Lam cf8f1210cd added syntax hints to blacklist page
barisusakli b6e22b7723 closes
Julian Lam 184a2c4540 IP blacklist functionality -- re: 
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
kingjan1999 147e36a7a5 update fontawesome.tpl to FA 4.5
psychobunny 50b813ae2f merging pull 4347
pichalite de421d5f8c remove language string in ACP
barisusakli 4b531cb655 closes
barisusakli c156d1cb34 closes
pichalite e878b32444 closes
barisusakli 0b2f01b8bc info page
Barış Soner Uşaklı 3d55eec885 Merge pull request from samhax/delete-user-invites 
Delete user invites from APM
HSam a62e31dc70 Finished the invite removal button changes.
HSam 48db16fba7 Finished adding a new delete to also remove the reference from the invites list on the APM.
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.
barisusakli 392814824e fix timestamp
barisusakli f3d2ad5f1f lets break some themes :evil:
psychobunny 92f86eee9c closes
barisusakli df9558f1fa closes
Julian Lam 3f2872979f added buzz
Julian Lam 44aae7daa5 removed hammer, updated semver, added mousetrap
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
psychobunny ee6d16c3d8 closes
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"
psychobunny 9e832e006a closes
barisusakli ac09036156 closes
psychobunny 99719414fe closes
psychobunny e069150625 closes
psychobunny 637c20f44d closes
psychobunny 75917e25b3 closes
psychobunny d0862911d3 closes
Ole R 6d35690cbb Prevent breaking eventLoopLagThreshold value 
[This problem](https://community.nodebb.org/topic/7955/and-once-again-all-my-data-has-gone/4) occurs when you put a value less than `10`.
barisusakli c62a60029a fix incorrect id
Julian Lam 9b9f4b252f fixes
barisusakli 086e99de5c wip flagged posts
pichalite a4d0026d93 ACP styling fixes
psychobunny bffa2d686c ACP -> navigation, removed text on mobile
barisusakli 767c798b2f log self account delete, logout on self account delete
pichalite 4d6cb6f523 add children-place holder back
barisusakli 32ca95319e closes
Julian Lam 9b02bb8f51 closes
psychobunny e017ad432f closes
psychobunny 42c0b973f1 closes
pichalite 15cb39bc3a style updates
pichalite 5d38b8d687 display "Select Skin" for skins
pichalite deda23c708 Use Skins instead of Themes
barisusakli 1ad4128649 closes , closes
barisusakli dea74aa11e removed heapdump
Julian Lam 00a22e945d closes
barisusakli c10b2fdb60 closes
Julian Lam 1660e13aed
barisusakli 6be8675580 closes
barisusakli 7185463d81 display avg object size in bytes
barisusakli ac77f78d6b closes
barisusakli dffb57ba14 closes
barisusakli 478faac945 closes
barisusakli 1449d438f5 closes
Julian Lam 0ded293caf removed JSONP listener
psychobunny 89901b2caa reorganized settings/tags acp
psychobunny 339b4c30fc ability to set maximum related topics rendered in ACP
Julian Lam 37b13b4879 Re-added file extension restriction ACP option 
Closes
Julian Lam c1460d36f0 Deprecated uploader.open, use uploader.show instead 
... as it now takes a single Object argument instead of multiple
parameters.

Also, closes . Help text is just omitted now.
Julian Lam 4cc4824087 Merge pull request from pitaj/master 
Maximum invites and invites are stored
Julian Lam 5adb8da427 enabled Gmail routing for email fallback
Julian Lam 7d9136f655 closes
Julian Lam 335d711dbd closes
Julian Lam 91c012e642
Julian Lam a936866688 revamped ACP Flags interface,
Peter Jaszkowiak 67905667a9 Added admin-only invites
Peter Jaszkowiak a3cfcd9a48 Maximum invites, invites stored 
Added the ability for admins to restrict the maximum amount of invites
a user can make. Invites are stored and displayed in the registration
queue admin page.
Julian Lam 6d386dd2ee Fixed some labelling issues and added support for last month
Julian Lam 9c1b067445 Closes 
Added toggles to change graph to monthly view vs regular
single-day view.

Also fixed issue where labels were out of date as the graph
data changed.
Julian Lam 9589de551e added toggler to disable toobusy if necessary
barisusakli 23e57a8001 closes
Julian Lam 051a8e22df Removed allowedFileExtensions meta config 
Now, when NodeBB needs to determine file compatibility, jimp
will attempt to open the file for reading. If it fails, file is
considered to be of an invalid type.
Julian Lam efe0726f9b removing unused plaintext templates, closes
barisusakli 323cc165b6 closes 
dont use post file upload for cover uploads
check cover upload file size against new setting
store cover uploads in profile folder
use `uid-profilecover` filename for cover uploads
barisusakli 90c2a16b94 closes
barisusakli 1be178f2a5 sync ACP stats over pubsub
Julian Lam de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage
Julian Lam b8b9da2c30 Squashed commit of the following: 
commit 62d59620d26bc97c7d689e9af57cd8bff654c79e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 11:04:27 2015 -0500

    tweaked 503 template

commit 15a61cbc239c9d654691d91cdadce59e13d97586
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:58:19 2015 -0500

    added text about reloading being required if threshold values are changed

commit 3fe87699332ef0628b4db31f4afef245802a7bc0
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 10:53:35 2015 -0500

    added ACP settings for toobusy

commit f6a9964baff051072052e6ef99da9e1ffba014df
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 08:53:53 2015 -0500

    removed unused 503a template

commit e6d444736baf4c676f8461d30a5504c6e45df163
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 02:01:11 2015 -0500

    updated code to send static 503 instead of maintenance-style page

commit 11089ae2bb833e068b01ee77ee745d9fd5344805
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Nov 4 01:18:45 2015 -0500

    added toobusy support so the Node process doesn't fall over at high load
yariplus 853aa37cd2 Add user home pages.
Julian Lam 3314ab4b83 fixes
nodebb-misty 4ec57d4110 Merge branch 'master' into user-icons
psychobunny a670f2facc organized cover acp pages
psychobunny 8e893869ff custom user profile covers
psychobunny 7148d44f90 default cover images for groups
Julian Lam 526afc0910 Merge remote-tracking branch 'origin/master' into user-icons
psychobunny 07c50cba7d titles for ACP routes
psychobunny 4baeda7c09 navigation acp styling / checkboxes
Julian Lam 68c3f9d849 Squashed commit of the following: 
commit 56582bc9eee5d81a01f42a28808b617b9c96873a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 05:21:11 2015 -0400

    added missing template

commit 6462a1626e7d8d77210b6e10eace5c9214335f33
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 05:19:07 2015 -0400

    sitemap index

commit 3cfd56f1fbc8e03405dc394375bf5ff6eef21322
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 04:47:52 2015 -0400

    sitemap routes, controllers, and library methods for pages, categories, and topics

commit e58e07c0881bdbe16d503b4679b85f761b02163c
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 04:07:39 2015 -0400

    added groups to sitemap

commit 7ee584b632
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Oct 27 01:43:06 2015 -0400

    If notification dropdown is double-clicked, all notifications are marked read

commit 488f147bef
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 22:39:19 2015 -0400

    closes 

commit 5e1bd58a02
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 22:28:30 2015 -0400

    closes 

commit 57d3980267
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 22:16:08 2015 -0400

    closes 

commit 555c5b82da
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 21:19:20 2015 -0400

    check user settings

commit 5454862c1c
Author: barisusakli <barisusakli@gmail.com>
Date:   Mon Oct 26 20:26:02 2015 -0400

    wait for all callbacks when creating tags

commit 051c5077eb
Merge: 839fd93 e0e04ef
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Mon Oct 26 09:54:12 2015 -0400

    Merge pull request  from drlogout/master

    Fixed wrong method name in socket.io/groups.js from isAdmin to isAdmi…

commit e0e04ef892
Author: Christian Nolte <hello@noltech.net>
Date:   Mon Oct 26 14:50:32 2015 +0100

    Fixed wrong method name in socket.io/groups.js from isAdmin to isAdministrator

commit 839fd935ad
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 21:54:35 2015 -0400

    add back thread tools filter

commit 37060bf1a3
Merge: 5820a19 bf918bd
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Sun Oct 25 18:13:06 2015 -0400

    Merge pull request  from cubehouse/patch-1

    Upgrade script fails on some consoles

commit 5820a193f6
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 17:04:46 2015 -0400

    closes 

commit 0d88d52557
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 17:03:33 2015 -0400

    up theme

commit 9bc43ba5e1
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 16:57:42 2015 -0400

    closes 

commit aafd4b6984
Author: barisusakli <barisusakli@gmail.com>
Date:   Sun Oct 25 15:56:17 2015 -0400

    closes 

commit bf918bd016
Author: James Holding <cubehouse@users.noreply.github.com>
Date:   Sun Oct 25 10:14:00 2015 +0000

    Upgrade script fails on some consoles

    The upgrade script errors/fails on some consoles if the stdout.columns isn't set (my console did this when upgrading a Docker instance of NodeBB).
    Checking for stdout.columns before using, falling back to a couple of spaces for slightly prettiness if we can't work out the console width.
barisusakli 9bc43ba5e1 closes
Julian Lam f7f43de644 Merge remote-tracking branch 'origin/master' into user-icons
Julian Lam b52475c270 Merge remote-tracking branch 'origin/master' into user-icons 
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
barisusakli 50c7ccccb5 fix flags
barisusakli 1bfe7bf3dd fix t.js
barisusakli 2bb8555d35 fix t.js
barisusakli c100764915 fix t.js syntax
barisusakli a9fae94e5a switch to dbStats, only display fileSize if it exists
barisusakli 3b9fdcaa2b more mongodb info
barisusakli e60c1d8736 added process info
barisusakli fc4e7c0fff navigation cleanup
barisusakli e2a5440ae8 closes
barisusakli 47e2dd9478 closes
barisusakli 0ce1e666e7 disabling/enabling parent will disable/enable children
Julian Lam 4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons 
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
Julian Lam 95129a1b40 closes
barisusakli 4d87890942 closes
Julian Lam 896abb59d3 Update default gravatar admin option to defaultAvatar
Julian Lam 97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons
barisusakli 22d6742422 closes
barisusakli bcd8bdf0df closes
Julian Lam 730a62519f Merge remote-tracking branch 'origin/master' into user-icons
Julian Lam f6d5b52a8b WIP user-icons
barisusakli 41fb4fe6b5 remove IS topics on category 
ability to specify a container for IS, instead of always assuming
$(document)
barisusakli 5e0a7d7dac some more acp/nav fixes
barisusakli ec32e4ea4b small tweak
barisusakli e4f0cd856a prettier admin navigation page
barisusakli c617a3f008 inf scroll changes 
dont load main post if start > 0
Julian Lam ebed9d641c Add new ACP option to upload Touch Icon, 
Also added a number of fixes for mobile enhancements, such
as serving a manifest.json file for Android devices, and
serving proper link tags for all uploaded touch icons.

This commit also creates a new template helper for link tags.
psychobunny 5f9eafcccb potential fix for acp rash
barisusakli 13508ca7f9 closes
barisusakli 75af978145 closes
Julian Lam fa109241cc Update fontawesome picker module (iconSelect) 
- Removed 'fa-doesnt-exist' icon
- Added a icon filter search input
- Added a "No Icon" button at the bottom
- Added link back to full FA list
- If icon is picked, it shows the icon class in the search input
psychobunny 70da64b927 button to revert to original email template
psychobunny 109fe895b3 ability to edit and save custom email templates
psychobunny 55748ac3f5 ability to select what kind of test email to send
psychobunny 4855e69498 email partials for footer