948 Commits (ea8cf6545c170e8811ba018e6d8e682cc2fc7d8c)

Author SHA1 Message Date
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"
8 years ago
Julian Lam 7993f6a4d8 fix duplicate labels in cookies ACP template 8 years ago
Julian Lam 66aea0eed1 closes #5167 8 years ago
Anil Mandepudi 619ca48403 remove shims for IE8 (#5157) 8 years ago
Julian Lam 02998669c3 introducing option to disable chat message editing/deletion 8 years ago
Julian Lam d4d3fa3102 add warning about gmail routing 8 years ago
barisusakli 1e486875f4 add top posters and most rep to acp 8 years ago
Julian Lam 7ba76fc0b6 showing assignee avatar in flags list 8 years ago
barisusakli 5f16205d15 closes #5109 8 years ago
barisusakli dd7839b7f5 add admin next to username 8 years ago
barisusakli 9a55498fc1 changes to manage/users 8 years ago
Julian Lam 80fe6bde5d removed 'No Assignee' option, updated flag saving logic 8 years ago
Barış Soner Uşaklı f1e6ccdbfc remove dupe header 8 years ago
Barış Soner Uşaklı 9d0dc35703 closes #5081 8 years ago
Barış Soner Uşaklı e2cbc8bc69 fix timeago on acp users 8 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
psychobunny 637c20f44d closes #3526 9 years ago
psychobunny 75917e25b3 closes #4026 9 years ago
psychobunny d0862911d3 closes #4181 9 years ago
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`.
9 years ago
barisusakli c62a60029a fix incorrect id 9 years ago
Julian Lam 9b9f4b252f fixes #4139 9 years ago
barisusakli 086e99de5c wip flagged posts 9 years ago
pichalite a4d0026d93 ACP styling fixes 9 years ago
psychobunny bffa2d686c ACP -> navigation, removed text on mobile 9 years ago
barisusakli 767c798b2f log self account delete, logout on self account delete 9 years ago
pichalite 4d6cb6f523 add children-place holder back 9 years ago
barisusakli 32ca95319e closes #3436 9 years ago
Julian Lam 9b02bb8f51 closes #4074 9 years ago
psychobunny e017ad432f closes #3810 9 years ago
psychobunny 42c0b973f1 closes #3134 9 years ago
pichalite 15cb39bc3a style updates 9 years ago
pichalite 5d38b8d687 display "Select Skin" for skins 9 years ago
pichalite deda23c708 Use Skins instead of Themes 9 years ago
barisusakli 1ad4128649 closes #3917, closes #2941 9 years ago
barisusakli dea74aa11e removed heapdump 9 years ago
Julian Lam 00a22e945d closes #3899 9 years ago
barisusakli c10b2fdb60 closes #4022 9 years ago
Julian Lam 1660e13aed #3695 9 years ago
barisusakli 6be8675580 closes #4012 9 years ago
barisusakli 7185463d81 display avg object size in bytes 9 years ago
barisusakli ac77f78d6b closes #3994 9 years ago
barisusakli dffb57ba14 closes #3986 9 years ago
barisusakli 478faac945 closes #3997 9 years ago
barisusakli 1449d438f5 closes #3969 9 years ago
Julian Lam 0ded293caf removed JSONP listener 9 years ago
psychobunny 89901b2caa reorganized settings/tags acp 9 years ago
psychobunny 339b4c30fc ability to set maximum related topics rendered in ACP 9 years ago
Julian Lam 37b13b4879 Re-added file extension restriction ACP option
Closes #3918
9 years ago
Julian Lam c1460d36f0 Deprecated uploader.open, use uploader.show instead
... as it now takes a single Object argument instead of multiple
parameters.

Also, closes #3942. Help text is just omitted now.
9 years ago
Julian Lam 4cc4824087 Merge pull request #3908 from pitaj/master
Maximum invites and invites are stored
9 years ago
Julian Lam 5adb8da427 enabled Gmail routing for email fallback 9 years ago
Julian Lam 7d9136f655 closes #3926 9 years ago
Julian Lam 335d711dbd closes #3907 9 years ago
Julian Lam 91c012e642 #3907 9 years ago
Julian Lam a936866688 revamped ACP Flags interface, #3907 9 years ago
Peter Jaszkowiak 67905667a9 Added admin-only invites 9 years ago
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.
9 years ago
Julian Lam 6d386dd2ee Fixed some labelling issues and added support for last month 9 years ago
Julian Lam 9c1b067445 Closes #3884
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.
9 years ago
Julian Lam 9589de551e added toggler to disable toobusy if necessary 9 years ago
barisusakli 23e57a8001 closes #3861 9 years ago
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.
9 years ago
Julian Lam efe0726f9b removing unused plaintext templates, closes #3854 9 years ago
barisusakli 323cc165b6 closes #3851
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
9 years ago
barisusakli 90c2a16b94 closes #3835 9 years ago
barisusakli 1be178f2a5 sync ACP stats over pubsub 9 years ago
Julian Lam de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage 9 years ago
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
9 years ago
yariplus 853aa37cd2 Add user home pages. #3616 9 years ago
Julian Lam 3314ab4b83 fixes #3809 9 years ago
nodebb-misty 4ec57d4110 Merge branch 'master' into user-icons 9 years ago
psychobunny a670f2facc organized cover acp pages 9 years ago
psychobunny 8e893869ff custom user profile covers 9 years ago
psychobunny 7148d44f90 default cover images for groups 9 years ago
Julian Lam 526afc0910 Merge remote-tracking branch 'origin/master' into user-icons 9 years ago
psychobunny 07c50cba7d titles for ACP routes 9 years ago
psychobunny 4baeda7c09 navigation acp styling / checkboxes 9 years ago
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 #3781

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

    closes #3782

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

    closes #3790

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 #3792 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 #3787 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 #3789

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 #3788

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

    closes #3786

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.
9 years ago
barisusakli 9bc43ba5e1 closes #3788 9 years ago
Julian Lam f7f43de644 Merge remote-tracking branch 'origin/master' into user-icons 9 years ago
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
9 years ago
barisusakli 50c7ccccb5 fix flags 9 years ago
barisusakli 1bfe7bf3dd fix t.js 9 years ago
barisusakli 2bb8555d35 fix t.js 9 years ago
barisusakli c100764915 fix t.js syntax 9 years ago
barisusakli a9fae94e5a switch to dbStats, only display fileSize if it exists 9 years ago
barisusakli 3b9fdcaa2b more mongodb info 9 years ago
barisusakli e60c1d8736 added process info 9 years ago
barisusakli fc4e7c0fff navigation cleanup 9 years ago
barisusakli e2a5440ae8 closes #3741 9 years ago
barisusakli 47e2dd9478 closes #3107 9 years ago
barisusakli 0ce1e666e7 disabling/enabling parent will disable/enable children 9 years ago
Julian Lam 4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
9 years ago
Julian Lam 95129a1b40 closes #3693 9 years ago
barisusakli 4d87890942 closes #3715 9 years ago
Julian Lam 896abb59d3 Update default gravatar admin option to defaultAvatar 9 years ago
Julian Lam 97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons 9 years ago
barisusakli 22d6742422 closes #3569 9 years ago
barisusakli bcd8bdf0df closes #3687 9 years ago
Julian Lam 730a62519f Merge remote-tracking branch 'origin/master' into user-icons 9 years ago
Julian Lam f6d5b52a8b WIP user-icons 9 years ago
barisusakli 41fb4fe6b5 remove IS topics on category
ability to specify a container for IS, instead of always assuming
$(document)
9 years ago
barisusakli 5e0a7d7dac some more acp/nav fixes 10 years ago
barisusakli ec32e4ea4b small tweak 10 years ago