Commit Graph

7219 Commits (01aeb45af89cd5d64f9944e545c9684ed8e1ac18)

Author SHA1 Message Date
Barış Soner Uşaklı ab4d4478e3 added rewards essentials
Julian Lam d67efa3a5b update core to allow composer to define static route
barisusakli 59c350e63c closes
barisusakli 20ca1e40aa fallback
barisusakli d44d036b67 up mongodb connect-mongo remove workaround
barisusakli 1070fff0e3 closes
barisusakli 3ea453e8a0 closes
Barış Soner Uşaklı 24114539d5 closes
barisusakli fddc6157a3 fix return of getRecentTopicReplies
barisusakli 005db18120 closes
Julian Lam 2ef42e79ec added filter for popular route
barisusakli 18013c5518 closes
Julian Lam 1d42655bb5 allow User.create to accept fullname
Julian Lam 8fa2c34fc5 Deprecated action:user.loggedOut, updated plugin deprecation notices
... to show replacement, if available.
barisusakli aa30973f0a fix params
barisusakli dea74aa11e removed heapdump
barisusakli a6074da17e closes
barisusakli f91afb5b99 closes
Julian Lam 57918332e9 fixed issue with no 'from' name when using NodeMailer
barisusakli 80cc251741 style
barisusakli 96aa94ee10 refactor categories
Barış Soner Uşaklı 1a86e68394 fix references
Julian Lam 00a22e945d closes
barisusakli c28494724f filter dupes
Julian Lam fb0ce8f60f Updated subject line in text emails
Would always show "NodeBB" before. Now shows proper site title.
barisusakli eb57276980 fix test
barisusakli c10b2fdb60 closes
barisusakli 7ad90b4ef6 closes
barisusakli caabbcf9fd closes
barisusakli d9b6a06714 limit topic views by session
barisusakli e693843314 closes
inb4 2016
Julian Lam 4147e0cb94 closes
Julian Lam fcb381f922 Fixes
Guests now trigger topic notifications, and the translator has
been updated so that translations inside translations are
handled in a way that doesn't cause the translator to explode.
Julian Lam 1660e13aed
Julian Lam de34c7d576 fixed
barisusakli 3b1a2d65ab fix revokeAllSessions
barisusakli 990434476b group.exists([]) fix
barisusakli e1392fd61b whitespace fix
barisusakli e6b7b51956 getHomePageRoutes
barisusakli 6be8675580 closes
barisusakli 99d64db9e0 closes
allow both `.png` and `png`
barisusakli 77b9406841 closes
barisusakli 8e5d26ec36 missing ,
barisusakli 6b42b8c9d9 added static:app.reload closes
barisusakli 9a5b308015 closes
barisusakli cf889b70bd closes
barisusakli 29e87ac984 fix initial room creation
barisusakli 7185463d81 display avg object size in bytes
barisusakli ac77f78d6b closes
barisusakli 300996b0d1 closes
barisusakli 687d29a44b closes
barisusakli dffb57ba14 closes
barisusakli 478faac945 closes
barisusakli a43eef283c store user sessionId mapping per user
Julian Lam ad9a1d0f2c closes
Squashed commit of the following:

commit 23de0708708ed190eafbcd6ea93d43333cb87aa3
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Dec 23 10:48:16 2015 -0500

    wired up session revocation, 

commit 45a3f18321b74a9b6893d404b6c870f1ec4d95cd
Author: Julian Lam <julian@designcreateplay.com>
Date:   Wed Dec 23 09:49:27 2015 -0500

    session deletion via session uuid

commit 2bf87338cf9bfa2df0b299639421d8da7553c69a
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 13:53:35 2015 -0500

    WIP 

commit 623f45c3fa8b96f8b6eec0613eb7f9463348ab93
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 10:22:24 2015 -0500

    saving more metadata and displaying sessions in UCP 

commit d0567ed7cc33a1aea66e921b657f782038f32191
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 10:21:38 2015 -0500

    updated fontawesome to v4.5.0

commit 7131c97fe8ab42838eb2915a04e74f80f3d9a133
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 09:39:16 2015 -0500

    saving user-agent metadata into user session 

commit 661b7e6dba774b80b5dc6d04f89a79f809ff791e
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 22 09:23:24 2015 -0500

    New user auth methods to add/revoke sessions, 
Julian Lam d9125c215c more notif crash fixes
barisusakli 94d8671447 not needed
barisusakli ab0797a6d8 chat fixes
update bootstrap tags input
dont allow adding self to chat room
barisusakli df605babff closes
barisusakli abed319da2 closes
barisusakli 5b1999be10 Merge remote-tracking branch 'origin/master'
barisusakli 0887105046 created chat:room hashes, save owner uid in hash, update chat uids when they message
Julian Lam a38d79e6ec fixing notifications crash again
barisusakli b4014ac420 closes
Julian Lam 36eed0f22f more tweaks to notif grouping
Julian Lam 64efe541f5 fix
barisusakli a3dc427e67 if there are no messages pass empty array
barisusakli 3d0e412bfd removed extra vars
barisusakli b3f63e0a0d closes
barisusakli c8edb6de29 fix semicolon
barisusakli 1e8409ef83 fix tab
barisusakli 5b530253bb closes
barisusakli dff3d7f20e various group chat fixes
fix multiple modals using the same tagsinput
fix online user getting chat notification
fix owner not being able to remove users in the chat modal
barisusakli 80fd0b20bd closes
barisusakli 1449d438f5 closes
barisusakli f0b333e8a1 closes
Julian Lam fe5e5ea8ef fixing another null crash
barisusakli f73e6eb4a1 fix related
barisusakli 5e9a656709 Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat
barisusakli 80544119dc some changes to related code
Julian Lam fe90dd77c1 fixed
psychobunny b2049e7acf add color/bgColor to return
Julian Lam 0ded293caf removed JSONP listener
barisusakli 270f8130da closes
barisusakli 26ac05dd5c Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat
barisusakli 9981555042 rename
barisusakli e067d26ca3 closes
psychobunny 89901b2caa reorganized settings/tags acp
psychobunny 339b4c30fc ability to set maximum related topics rendered in ACP
psychobunny ba719148c1 generic "related topics" functionality
barisusakli 4827ea04fc messaging.getTeaser
barisusakli 3d79e0750b fix edit delete for rooms
barisusakli d2b54ae0f8 display less derpy chat list
barisusakli f71fd0a3ec only allow users in the room to get raw message content
Julian Lam f4187fc671 fixing crash with deleted notifications
Barış Soner Uşaklı f4e502c793 simpler isNewSet
Julian Lam 40f0076b77 fixed bug with notif merging
Julian Lam 9f5815555a fixed null error with notif grouping
Julian Lam 05df8900db closes
Julian Lam 9db0f59432 part of
Julian Lam 33a3a56fd7 Fixed issue where -w and -a flags didn't work in NodeBB reset.
barisusakli 002e931a9c rev
barisusakli da5891bcf6 remove debug
barisusakli 832a20e59e markRead fixes
barisusakli 1bd9b364e4 fix notifs, dont send to self, fix notification path to roomId
barisusakli d8810ceae9 send messages
barisusakli 784ff07907 ability to add/remove users from chat rooms, tagsinput
barisusakli 8fab270852 leaveRoom method, small fixes
barisusakli f8a6666e1a chat notify changes
barisusakli 29d8b9c181 more room changes app.openChat
barisusakli d5bccfb292 delete chats on user delete
barisusakli c5d2f61b01 more fixes
barisusakli 43c697a5df edit message
barisusakli a1ab50bd2d check admin and priv groups
barisusakli 6b12bd2328 update messaging.editMessage
barisusakli 5d1169e686 changed the chat route to /chats/:roomid?
barisusakli 58d05f7c79 recent chat list with rooms
barisusakli e2e547db45 first part of messaging refactor
barisusakli 8bda497b41 upgrade script for chats
Julian Lam 37b13b4879 Re-added file extension restriction ACP option
Closes 
Julian Lam cc4997aeca fixes
Julian Lam a4d8ab9d12 fixes
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.
barisusakli 24a302ea1a closes
Barış Soner Uşaklı fd215c774f Merge pull request from akhoury/patch-3
[minor] meta tag, content-type shouldnt be escaped
barisusakli 518552de64 dont calculate pid index on new replies
Aziz Khoury b4c8301596 [minor] meta tag, content-type shouldnt be escaped
so `text/html; charset=UTF-8` and not `text&#x2F;html; charset=UTF-8`
Julian Lam bcbc8608a4 newSet calculations bugfix
Julian Lam 3b6b36cfa6 fixing possible crash
Julian Lam 4cc4824087 Merge pull request from pitaj/master
Maximum invites and invites are stored
Julian Lam 2d203d7dca Squashed commit of the following:
Closes 

commit 3d4f494ed3257bceda8f6f82057cab83f0f252b3
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 12:06:42 2015 -0500

    theme minvers for 

commit b608ce61854f8195143685bb9753b80d32b26e95
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 12:01:03 2015 -0500

    Allowing chat modal to edit and delete messages

    re: 

commit 0104db90a4070582f3938b6929dae35f985bac35
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:51:23 2015 -0500

    Fixed issue where newSet calculations were off

    ... sometimes.

    Also, rendering of edited messages now parses a template partial,
    instead of just replacing the content.

commit 5cb6ca600425ca9320c599b32306e93dcc5aa4ce
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:07:12 2015 -0500

    If edited content matches existing content...

    ... then edit is aborted.

commit 6e7495247b1895589c716db29f919a934087b924
Author: Julian Lam <julian@designcreateplay.com>
Date:   Fri Dec 11 11:05:08 2015 -0500

    some linting and fixed issue where new msgs when deleted would crash server

commit db4a9e40d6dff44569c2437378121db8fdf75cf8
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 17:25:56 2015 -0500

    Message deletion for , and fixed bug

    Fixed bug where chat modal would spawn even though user was sitting
    on the /chats page.

commit a5aa2498ab4a8bba02a6daa43a9dbed7b3e37976
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:55:23 2015 -0500

    wiring up the edit button, 

commit 5f2afdcf6f2b9eae6b5873ca100149e65e3d385d
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:20:39 2015 -0500

    added indicator to show if and when a message had been edited

commit e8301132d525c1b9fd46c98cdb282ac7ea7a0d7f
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 14:06:39 2015 -0500

    Allowing editing of chat messages

commit bfd991be1cb1769599f7d5d2b1638e313c3c2dcb
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 10:33:49 2015 -0500

    Added messageId to messages object return

commit 0306ee6657b3288dd4547c66869d7d4ece0b31ad
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Dec 8 08:20:17 2015 -0500

    WIP 
barisusakli d12e8e1116 closes
barisusakli 42cce3771b closes
barisusakli 8dc9475041 closes
barisusakli 60e186c8f3 refactor api/username api/email
barisusakli dcbf53bae3 moved search to dbsearch
barisusakli 745007a2b3 closes
barisusakli 0ffd5254ad closes , closes
Barış Soner Uşaklı cdca09a7b2 escape error message on 500 page
barisusakli 7b21760f00 refactor get user by x
Barış Soner Uşaklı 69bc870017 Merge pull request from lots0logs/master
Add api endpoints to get user by username and by email
Julian Lam d1fb09caec apparently I *did* need html-to-text.
Julian Lam 963d9b22b3 Removing and updating dependencies to satisfy david-dm.org
Julian Lam 5adb8da427 enabled Gmail routing for email fallback
Julian Lam 7d9136f655 closes
Dustin Falgout 17e5d72815 fix waterfall
Signed-off-by: Dustin Falgout <dustin@falgout.us>
Dustin Falgout 0e5830d6f2 add api endpoints to get user by username and by email
Signed-off-by: Dustin Falgout <dustin@falgout.us>
Julian Lam f77f39e937 Fixed
Also updated port local variable to be a Number, since all of the
conditional checks assume it is a number, when all along it has
been a string.... heh.
yariplus 12fb512d3c Don't change url when homepage is set to a category.
Julian Lam 3a520cdfbf Successful web installer now doesn't show 503
Julian Lam 1b9defdf8b closes
Julian Lam 335d711dbd closes
Julian Lam 91c012e642
Julian Lam a936866688 revamped ACP Flags interface,
Peter Jaszkowiak 259eb585d6 Added template data for admin invite only
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 bbc42a937e fixed LRU cache problem
Barış Soner Uşaklı 5521a55db9 Merge pull request from Schamper/debug-fix
Also clean the minifier process options if the --debug option is used
barisusakli 124b79f6aa fix user search pagination
Schamper 6b21e34c76 Also clean the minifier process options if the --debug option is used
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.
barisusakli 9f48d3e6d2 check pid before setting cache
barisusakli 1c71001e1d check err and print info
Julian Lam 97ce08f5af Removed rel="canonical", closes
On the advice of the following articles:
  - http://googlewebmastercentral.blogspot.com/2013/04/5-common-mistakes-with-relcanonical.html
  - https://moz.com/blog/rel-confused-answers-to-your-rel-canonical-questions

rel="canonical" should not be shown on the same page
as rel="prev" and rel="next" as Google will implicitly
assume that they all point to the same page. With the
"pageless" variety only showing the first page of posts,
it explains exactly why any post content after the first
page is not indexed by Google.

... or perhaps it *is* indexed, but not returned. Who
the heck knows. 😄
Julian Lam 9589de551e added toggler to disable toobusy if necessary
barisusakli 33f07b82f9 closes
barisusakli ecd777b659 closes https://github.com/NodeBB/nodebb-theme-persona/issues/206
barisusakli 59ed276dce dont allow banned users to flag
barisusakli b08f6073de check ogImageUrl
barisusakli 5a9edf5973 closes
Raphael Beer cf7b7a8d4c Respond with 404 when topic inside hidden category
barisusakli 1b7ca555e0 closes
Julian Lam 65ce8a50b3 Removed cant-vote-self-post
As suggested in , a positive
action has been applied when a user attempts to upvote
their own post. It will now open the upvoters modal
instead of throwing an alertError.

Closes 
Barış Soner Uşaklı c55abdd095 closes
barisusakli 23e57a8001 closes
Julian Lam 440bd5c37c fixed crash on empty aboutme
Julian Lam 34725ec3e5 Fixes
Added meta data to user profile pages, and also added noEscape
option to meta tag input. If set, validator escaping won't be
run on that value.
Julian Lam dbe5b963bd fixes :trollface:
barisusakli 872e00849a moved deleteVotes into deleteAccount
barisusakli ec3ae307e9 closes
Julian Lam 96afd13155 Removed mmmagic from dependencies, closes
Julian Lam 277a3ba2af Updated guest user icon and bgColor
Due to the label for guests being translatable, the
first character for guests was actually "[", causing
their user icon to be "[" with a colour.

This commit changes it to be a hardcoded question mark
and with a grey background colour.
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 3acf2e0812 pruned upgrade script
barisusakli 6f864a6354 joindate iso
Julian Lam efe0726f9b removing unused plaintext templates, closes
Julian Lam 9a17e2a3e9 Merge branch 'auto-plaintext-email'
Julian Lam e37709ad8b something..
Julian Lam 8304740bd5 fixing crash on settings save
Julian Lam 948c98b668 adding plaintext email via html-to-text module
barisusakli 27f77bf832 show proper error if user is not logged in
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 35eb0faac8 closes
Julian Lam ad5ddcbb73 whitespace fixes
Julian Lam 3a34901cdb on settingsv2 save, reload should be required
Julian Lam 90c0a06fd4 removed some commented out code
Barış Soner Uşaklı f145356914
psychobunny 3564d581ad Merge branch 'master' of https://github.com/NodeBB/NodeBB
barisusakli 356f1d38cb fix image upload for other users
psychobunny df7e6be905 console.log
barisusakli 016aef1716 too busy check on prod
barisusakli 522e67d742 closes
Julian Lam 48b5bab849 closes
barisusakli 90c2a16b94 closes
Julian Lam 2830538835 Cover photo removal for groups,
barisusakli 04894b549a closes
barisusakli d69d0c6614 dont send undefined for tos
barisusakli 670ed38d75 missing semicolons
barisusakli 4fe4d71604 added port
barisusakli 1be178f2a5 sync ACP stats over pubsub
barisusakli 5e257107cd fix status on following/followers etc.
barisusakli 0d6e1091ba async get users
Julian Lam f1412b6e9b Fixed cover loading for subdirs and added removal
re: 
barisusakli 8ccfd235ad changed deprecated method
barisusakli 60e1831152 check online from users:online zset
barisusakli baa813a4cb Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize
Julian Lam de9f196c75 Merge branch 'userhomepage' of https://github.com/yariplus/NodeBB into yariplus-userhomepage
barisusakli 9125e778a1 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize
barisusakli 364260fa37 fix lastonline iso
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
barisusakli 7ed378b367 removed override no longer needed
barisusakli 46c2563164 removed rooms.js removed browsing users, removed chat syncing across sockets
use lastonline for online detection
barisusakli 1ecf27417a removed commented out stuff removed topics.enter
barisusakli 491a6d0234 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize
barisusakli 0d23c56281 removed event:disconnect
barisusakli bac2a0d959 removed event:connect use socket.io connect event duh
barisusakli 5879185ebc single proc stats
barisusakli be6fc72994 Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize
barisusakli 0199ed27a6 disable user_leave for topic
barisusakli be86c74c91 disabled browsing users and global rooms syncing
yariplus f815f2d981 Fix userhomepage derps
yariplus 853aa37cd2 Add user home pages.
Julian Lam ceaa3a334d Squashed commit of the following:
commit 3a39e5e6bd3c357d78d8ec1dad6e3a64c18ee3ab
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:15:10 2015 -0500

    minor tweak

commit ed3c25ba8b431a2b730aae78a43cfa934521a5d4
Merge: d9cde96 d7a0adc
Author: Julian Lam <julian@designcreateplay.com>
Date:   Tue Nov 3 20:12:32 2015 -0500

    Merge branch 'master' of https://github.com/acardinale/NodeBB into acardinale-master

commit d7a0adc5c883c5fa3207f3adcd0661246221e7c9
Author: Andrea Cardinale <a.cardinale@webandtech.it>
Date:   Wed Sep 30 10:32:25 2015 +0200

    Get registry (if it's set) from config.json in suggest method (client-side)
psychobunny 281f377fde Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 726c3802e1 isMainPost for post summary
barisusakli c3369964eb closes
barisusakli fb7f10d63d closes
Julian Lam 3314ab4b83 fixes
Julian Lam dc916c5e3c closes
barisusakli 8d0cb18b74 display git hash/branch
psychobunny 8cf6fe3aa1 closes
barisusakli 2fef7acf4b closes
barisusakli ca4440b8af closes
psychobunny 003631df79 isFollowing: send false if user is anon
psychobunny ead377e0ca user.isFollowing socket call
psychobunny 3305256575 add fullname to user return as well
psychobunny 0588a59c0c normalize user data between topic.user and post.user
barisusakli c2ca093569 check username
barisusakli c39aa07d6f moved colors out, only create icon if picture is requested
barisusakli f4bfcc7351 removed icon:bgColor and icon:text from db calls
calculates from username on the fly
psychobunny d8e50f931e material user icon bgs
Julian Lam 8d4209d42c Merge remote-tracking branch 'origin/master' into user-icons
Julian Lam 9f6dc63fed updated to no longer use user.icons.generate, and removed an unneeded upgrade script! :)
psychobunny 12d2abff44 missed some other profile pages
psychobunny f17391e6a2 fix default cover image on all profile pages
psychobunny c697785270 console.log
psychobunny 9bef54b5ed fix title for dashboard
nodebb-misty 4ec57d4110 Merge branch 'master' into user-icons
psychobunny aa3fa477e3 Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny f385e13531 fix default cover on groups/list page
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
Julian Lam 098111ba5b Fixes bug where if post edit was called without a title, NodeBB would crash
psychobunny 8787f04757 Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 07c50cba7d titles for ACP routes
barisusakli ee71f982b7 added missing filter:post.tools
psychobunny a5b754eac3 add profile cover/position + profile picture on every account page
psychobunny f19043d046 profile cover photos
psychobunny 02d1304185 removing groups.cover.get, seemingly it doesn't do anything
psychobunny ef20141e8f jshint
psychobunny 7a6d6c2bd6 Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 61b1f5fe32 allow regular uploading (modal) of cover photo
barisusakli 47c71b5a37 closes https://github.com/NodeBB/nodebb-theme-persona/issues/181
psychobunny 4baeda7c09 navigation acp styling / checkboxes
Julian Lam 7580cfb235 fixed double-definition of hashPassword method that was causing new registrations to fail
Julian Lam defceb6271 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	src/controllers/index.js
	src/topics/tags.js
barisusakli 290686a194 modifyCategory is no longer async
barisusakli 353ebb71d2 removed unnecessary if
barisusakli efef0af6fa tag fix
barisusakli 4ef2ae7ba2 update count even if its 0
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 488f147bef closes
barisusakli 5e1bd58a02 closes
barisusakli 57d3980267 closes
barisusakli 555c5b82da check user settings
barisusakli 5454862c1c wait for all callbacks when creating tags
Christian Nolte e0e04ef892 Fixed wrong method name in socket.io/groups.js from isAdmin to isAdministrator
barisusakli 839fd935ad add back thread tools filter
barisusakli 5820a193f6 closes
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 0ff5c65f43 removed rel path, its in templates
barisusakli 5c2e78b1a6 parse topic tools on demand
barisusakli 6c9de29326 load post tools menu on demand
barisusakli 2d46d07f4f return selectedGroup
barisusakli c100764915 fix t.js syntax
barisusakli 751a6c6839 got rid of extra call to user.getSettings
barisusakli 0e057a3d92 dont render 404 page for favicon
barisusakli 531eaa6411 cache navigation data
barisusakli 98e659188b removed console. log
barisusakli 28ae101d90 allow changing username if user has no password set, ie sso login
barisusakli 0210c033ee closes
barisusakli 07e7498f45 use sortedSetsRemove
barisusakli 8e80eca449 removed double escape
barisusakli 9040a1a063 concat minimize most common routes
barisusakli 85d09ce2e4 removed unsused require
barisusakli 5e5cafafd0 make one socket call to load unread counts
barisusakli 8630196a2d up composer
barisusakli edf545cd2c dont load sound data on cold load
barisusakli d146bff2a1 send less data when leaving rooms
barisusakli 36e89ae15a closes
barisusakli 09747251d8 added hostname
barisusakli 7f66494a57 closes
barisusakli f17ba88c0f closes
barisusakli 7f72d80292 fix require
barisusakli 53d29e29af performance improvements
store parsed category description
removed mongo _key from returns
dont get category teaser for parent
barisusakli e2f590e0b4 only return id
barisusakli a1dca63914 fileSize fix
barisusakli a9fae94e5a switch to dbStats, only display fileSize if it exists
barisusakli 5fda800f2b filter info
barisusakli 3b9fdcaa2b more mongodb info
barisusakli f2d6f931af closes
barisusakli e60c1d8736 added process info
barisusakli c2b29ff4c4 add page to canonical link
barisusakli b556652582 fix chat redirect
barisusakli 94a0c9aa9f closes
barisusakli c3b8d0b328 check err first
barisusakli fc4e7c0fff navigation cleanup
barisusakli 16a65c8ffc closes
barisusakli e2a5440ae8 closes
barisusakli 47e2dd9478 closes
psychobunny 8ef46ebc7d found some other places with the same problem
psychobunny bc2bf6ef37 fix list of allowed filetypes
barisusakli de4d747e63 closes
barisusakli f5e7d1ce01 private uploads
barisusakli 3a3c5486b7 expose method
barisusakli 94129287d0 moved non-async code
barisusakli 17dd1ff485 fix next
barisusakli da4034a10a middleware refactor
barisusakli 9ac4704848 more search cleanup
barisusakli c8fb68c2d5 shorter sort methods
barisusakli 1ceb1c6d5f fix dismissAllFlags
barisusakli 7854e67b7b closes
barisusakli 36bfe30425 closes
barisusakli 1ddcb3f11c closes
barisusakli 1dcdba9b2a moved api route to api.js
psychobunny 78fe1da00c don't mark all chats as read when just reading the list from dropdown/slidemenu/chats page
strangely enough it was doing it twice
barisusakli 0ce1e666e7 disabling/enabling parent will disable/enable children
barisusakli fa4875d78d category teaser
barisusakli ff7b6e4e91 added search title
barisusakli 2d96cdba1c closes
Julian Lam 5c71bb5923 fixed user avatar modal again
Julian Lam 4c96f95330 Merge remote-tracking branch 'origin/master' into user-icons
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
barisusakli 7fd1940939 take out of async
barisusakli 2d01fe78d0 removed privileges.posts.get from addPostData
privilege data is already available higher up
barisusakli 40e26d3b9d removed unused requires
barisusakli 7e2fbfe3f4 modify topic isn't async
Julian Lam 99e5015083 closes
Julian Lam 95129a1b40 closes
barisusakli 4d87890942 closes
barisusakli 12da13acc5 closes
barisusakli 313a465a4c notification exists check
barisusakli 5cf983dcee check if user exists
barisusakli 8e06ff49f3 check user exists before chat
barisusakli ca15b85db9 check group exists before joining
barisusakli c5e8339abb check if category exists
barisusakli 872080d832 dont mark read if topic is not in topics:recent
barisusakli c1093bdeb7 topic exists checks
barisusakli b301daf126 check post exists before delete restore
barisusakli f88d822fe2 make sure post exists before edit
barisusakli b616e69070 User.exists change
barisusakli a054353b6c category purge fix
barisusakli 902f529d53 closes
barisusakli 3a6d5948ba filter invalid categories
Julian Lam 896abb59d3 Update default gravatar admin option to defaultAvatar
Julian Lam 97dd5500a1 Merge remote-tracking branch 'origin/master' into user-icons
Julian Lam 00079ce158 default user icon for anons
barisusakli df95d47c4c ocd
barisusakli 5a3a627fcd fix rel tag urls
barisusakli 22d6742422 closes
barisusakli ca294fc6ec closes
barisusakli 75e2228989 closes
barisusakli 00bc9f51c9 dont display post just scroll
barisusakli b7ce4312a9 show toPid inline
Julian Lam 018af5fa22 accidentally used deprecated method, heh
Julian Lam 09d23c3dd0 Added support for a theme to generate a link back to a parent post
barisusakli bcd8bdf0df closes
barisusakli e7f87f4ffd closes
Julian Lam a43d40fbc7 upgrade script, and fixed client-side generation of user icon
Julian Lam 9120cb8e82 missing values for teaser user icons
Julian Lam 730a62519f Merge remote-tracking branch 'origin/master' into user-icons
Julian Lam 68b252f202 notifications dropdown
Julian Lam f4ee7f5cf8 votes modal
Julian Lam a4c2626bdc mobile menu header
Julian Lam 097ee5d2a2 user icons in chat modal and page
barisusakli fec3877e51 fix tests
barisusakli 8c17de4221 remove dupe
barisusakli c22d018617 shorter sort
Julian Lam f6d5b52a8b WIP user-icons
barisusakli 4e32751819 added back canEdit
barisusakli 41fb4fe6b5 remove IS topics on category
ability to specify a container for IS, instead of always assuming
$(document)
barisusakli 1dc93f2446 closes
barisusakli 5e0a7d7dac some more acp/nav fixes
barisusakli ec32e4ea4b small tweak
barisusakli e4f0cd856a prettier admin navigation page
Julian Lam 839edc80b1 updated action:settings.set hook
barisusakli fffca0e425 fix topic follow
barisusakli 3cdc0c6890 missing return
barisusakli d490ed30d1 check err
barisusakli 5950f97f96 more refactors
barisusakli 1f4857585d user refactor
barisusakli 853aeb1b8c update profile
barisusakli 4a06750ae2 io.in logger
barisusakli e0c6acd163 socket.io/user.js refactor
barisusakli 53411f809b follow command
barisusakli f2f9000b70 fix vote progress
barisusakli e2896ef6b9 socketio/posts socketio/topics refactor
Julian Lam 04db07ed33 seems legit, tjs not even used in this file
barisusakli e5e41e85f2 accounts refactor
and various 404 fixes
barisusakli 3bb5d2aa86 accounts refactor part
barisusakli c0c38437a0 isAdminOrMod
barisusakli de2f336d53 data uid check
barisusakli b618f67a00 fix tab
barisusakli c617a3f008 inf scroll changes
dont load main post if start > 0
Julian Lam 137f2097db fixes
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.
barisusakli 3d73fbf74a only pass pack err
barisusakli f005231996 closes
barisusakli 8fb24f26e3 fix edit post
barisusakli 6f046af34b fix callback
barisusakli cdd5bb5a6e fix acp high presence topics
barisusakli 96364935e9 removed deprecated methods
barisusakli 459c20a2e2 closes
barisusakli 4e2318fa1e fix title in acp removed extra |
barisusakli 933a89d2ae closes removed double escape
barisusakli 3416f600c5
barisusakli 80701f44d6 fix syntax
barisusakli b3cbb46010
include add post index
barisusakli fb6abd32c4 closes
psychobunny 5f9eafcccb potential fix for acp rash
barisusakli 13508ca7f9 closes
barisusakli 87a194a4bd allow array of nids to be passed to notifs.get
barisusakli dbf0f279a2 closes
barisusakli 75af978145 closes
Julian Lam 78863a438f Firing new hook `filter:auth.list`
This new plugins allows SSO services to list whether a
user has authenticated via that service, and will display
as such in the user's profile editing screen.
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 47fb8e8125 closes
psychobunny 109fe895b3 ability to edit and save custom email templates
psychobunny 46d6be57a8 hint
psychobunny 55748ac3f5 ability to select what kind of test email to send
psychobunny fa8a2c5c1b render email footer partial
psychobunny 4855e69498 email partials for footer
Julian Lam bac04d7ee6 Replace lwip library with jimp native lib for image manipulation
barisusakli 4419eb2aff removed require
barisusakli f3b6a5fbb9 generic getObject
barisusakli 1dd706d0b2 crash fix, res.locals.config can be undefined
barisusakli 1e44cab79e filter:group.build
barisusakli 070fe01463 use unescaped tag to get data
barisusakli d96073dbbf closes
barisusakli c139dfa843 closes
barisusakli f9c8b1acf8 if a parent category is deleted add its children to root
barisusakli 32041d50f7 prevent crash if children are falsy
barisusakli 69ebe7679d removed console .log
barisusakli c98bd87334 better checks for file extensions
jpg allows jpeg
dots dont break extensions
barisusakli fbfb39f967 moved socket connection out of app.js
barisusakli a14810a2e0 wrap lwip.open in try catch, it throws on unknow types, closes
barisusakli 9ff3be67db generic check length method
barisusakli 35a2141da6 reset changes
barisusakli 6363bbc2ba moved reset out
barisusakli 1182237f3d isInvited
barisusakli e1dc161119 added isOwner
barisusakli c4b258c747 added .before to socket.io/groups.js
barisusakli be7c2cc88a closes
psychobunny 26aa9a6251 Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny a8d44758cb acp remove logo fix
barisusakli 31ddb8a0e0 uid can be group names :dull:
barisusakli 5555b9256d Merge remote-tracking branch 'origin/master'
barisusakli 6e66b32fe1 dont escape the query that is send to search escape on the way out
psychobunny 8403b010a5 fixes theme screenshots in acp
psychobunny 4dcba62e95 cleanup
barisusakli 244c75f809 admin controllers
barisusakli 3858f6777d check groupName and uid on groups.join
barisusakli d7f82f96b1 remove threadTools require
barisusakli 777157c0d6 remove old postTools requires
barisusakli 0c6495de72 moved postTools and threadTools into posts/ and topics/
barisusakli 8af64ba984 closes
barisusakli 8c2fdcc77c group escape fixes
Barış Soner Uşaklı 2e1661a5e8 Merge pull request from jongarrison/master
Revised: Added req and res objects to the widget rendering process
barisusakli 9cef1ffe99 forgot parseInt
Julian Lam 2e3eef136f Update chat frontend to better handle incoming messages
When an incoming message occurs from somebody who is new,
a new chat contact is spawned and put into the contact list.
barisusakli da09ce3e06 optimize getParents
when loading the root categories listing all categories have a parentCid
of 0 so return early instead of calling the database with
['category:0','category:0','category:0''category:0' ...]
barisusakli 04be0411e7 build search categories server side
Julian Lam 34a6275b85 sanitise chat teaser
barisusakli 70b8d546b3 fix breadcrumb
barisusakli 4826883484 up themes, 404 non existing popular pages
barisusakli ade9a44b11 closes
barisusakli 09927915ab fix cb
barisusakli 11c70f3a28 closes
Jon Garrison 47714151b1 fixed one tab character
Jon Garrison 44c4925ceb Added req and res objects to the widget rendering process before callback in src/controllers/api.js
barisusakli 3fff334de2 some priv cleanup
psychobunny ae1043543d closes
barisusakli faae98892d privilege fixes
barisusakli 51cdd0800c simplified calculatePostIndices
Barış Soner Uşaklı 76178e3232 move admin categories controller
Barış Soner Uşaklı e62bd2ab9e fix chat status unread etc.
Barış Soner Uşaklı 5b08538264 closes
Julian Lam 4acb31839e
Barış Soner Uşaklı 6d8134618f fix chats
Barış Soner Uşaklı e9692a3e1f fix emailer
Barış Soner Uşaklı 3a6871fd65 display all categories in custom home
barisusakli 6fc267858e fix missing callback
barisusakli d01736a726 cleanup
barisusakli a5e9394d93 closes
barisusakli b17feb3b6c nested categories on search
barisusakli bb47761f6a moved disable chat button
barisusakli 501bfbfc47 closes
barisusakli b099aaf61f fix typo in emailer
barisusakli 22d6ceab59 closes
barisusakli 15b667850e closes
barisusakli 4aad5b8689 moving chat settings out of post
Julian Lam 8070de7962 closes
barisusakli 5388ddf791 removed posttools edit
barisusakli 45c446dac0 new hook filter:email.send
psychobunny e90ee46cd1 closes
barisusakli 30d087cbd3 closes
psychobunny b660eec67f closes
inb4 all admin routes are publically visible
psychobunny ed358f4bf7 closes
psychobunny 2516be620b Groups.getGroupsAndMembers
barisusakli 5ff2eccbd2
psychobunny ff83305c6a closes
Barış Soner Uşaklı bcb3b55ab0 Merge pull request from yariplus/homepages
Add Custom and Category homepages.
barisusakli 9787e6c3df dont download images to local, pass to upload plugin
yariplus 08e4f14971 fix unneeded async
yariplus 0c1c42d362 parallel not needed
barisusakli a469ca2972 notification id change
yariplus beb2b38cb7 mistake
yariplus d998fe2dd5 Add Custom and Category homepages.
barisusakli e3ca91e325 fixes item 1
barisusakli 915a992448 closes
barisusakli 240a619a72 pretty group breadcrumbs
barisusakli cb9b51e8a5 closes
barisusakli bf70f3764e
barisusakli 6c40d2e424
barisusakli 734a45ae03 dont log error if its redirect
barisusakli 9361ff0772 closes
barisusakli dd5a8e8a88 closes
barisusakli a6c8cd50e9 fix group creation regression
barisusakli 929091d4d3 default theme
barisusakli 3ea8d092aa check for defaultTheme on install
Julian Lam 6334e1ae6c updated theme minvers, and generating cache buster on reload too
barisusakli a64cbbc6df
Julian Lam 160cf93802 Fix regression caused by 4f766ac
Julian Lam 4f766ac7b5 Updated cache buster logic
Removed css and script busters in favour of a uuid/guid cache
buster that is generated when the app starts.

This change means that in the event your NodeBB crashes often,
users will not be able to rely on their browser cache to serve
an unchanged style/js file, but if that's the case, you've
got bigger problems anyway.

re: 
barisusakli e6755d0adc closes
barisusakli a4d7022e68 closes
barisusakli f7aef56e66 closes
barisusakli 19eaa051c2 closes
barisusakli 0bfc568ac3 closes
barisusakli 442c4be4ec closes
psychobunny 265a16af1a some old left over branding code
barisusakli 2c6f93efbd closes
psychobunny edbe8b2e04 typo in ACP
Julian Lam 3baad54223 Close
This commit introduces notification creation if a user requests
membership to a group (in which case notifications are sent to
all group owners), and user invites to a group (in which case
a notification is sent to the invitee).
barisusakli b4d465223a if there is no description tag add one, fix missing winston
barisusakli 7c319c9b20 fix browser title on home page
barisusakli cf193581e4 check and log all fs.unlink errors
barisusakli 54f9a09e6a some more logging
Julian Lam 8621023452 Removed surrounding panel from privileges table
Julian Lam c3821c2070 Close
barisusakli ffff8093ba make sure user is admin/mod before forking
Julian Lam 394440e597 Fix upgrade crash if groups have 0 users
@barisusakli
psychobunny b5c7473c95 get teasers: probably faster, hopefully
psychobunny 08137c5c1e fixed issue where teasers were being assigned to the wrong chat
psychobunny 1d53f365dd closes
Julian Lam cf679f0c5e Fix
barisusakli e0101fcd24 fix crash on follow/edit
barisusakli d23d814154 fix topic_count on topic move
barisusakli 5009e80122 fix typo
barisusakli 9f74450196 log unlink error
psychobunny 891a611714 contacts vs recent: makes more sense the other way around
well, it does make sense on the older UX anyways, but I'm not going to
go there :P
psychobunny 6aa6510ef6 teasers instead of chatTeasers
barisusakli c3719ea5b5 closes
barisusakli 93e6916fe6 moved maintenace mode middleware
barisusakli 6d930d0d1a fix indents
barisusakli 25502f0687 closes
Julian Lam f21325a91b add back missing ENDIF to complete admin header conditional
This fixes 
barisusakli f4bf82a349 closes increase email confirm reset to 24 hours
barisusakli a0cd4b49f5 when a category is deleted, set the children's parent to 0
barisusakli 9d4d904479 404 fix
Julian Lam ba39a432e7 fixed