Commit Graph

2707 Commits (e579db8bf3f55ba9e4ea03ae6b1bba1f95be71f5)

Author SHA1 Message Date
psychobunny 7fc2e627c5 linting templates.js; got rid of some unused server-side code
Julian Lam e611a8174e linting setting.js again and abstracting out saveField
psychobunny 0a293be823 linting categories.js and footer.js
psychobunny d183e58771 linting admin/groups
psychobunny 6ea760d636 linting admin/index; admin/languages
psychobunny 2d65a746e4 linting admin/settings
psychobunny b515995432 removed unnecessary switch case
psychobunny e9fb2f4135 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny 44a91fe9ea linting admin/themes
Julian Lam ca2e9d7d9e linting and moving xregexp back to .js
Julian Lam 738ada9b16 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 816d9e5d12 minifying xregext lib
psychobunny fdb9b889ec Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny fb1ddc3d9b minifying colorpicker.js
Julian Lam b525d95915 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 6aa8df1d24 removed unminified buzz library, keeping minified version
psychobunny da0355ef79 remove async dep for widgets (30kb was overkill for one use of async.each); linting
Julian Lam 2826381b20 draft saving in composer -- resolved
barisusakli c320051a1e chat jshint
Julian Lam e757183cec linting
Julian Lam 89ba0840e6 minor reordering of jslint comment
Julian Lam 0668556d4f Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam c000a8c5ba linting
barisusakli e9ab9dcce2 search cleanup
barisusakli 67f1251ba3 pagination cleanup
Julian Lam 392075eb27 fixing theme previews in subfolder installs
barisusakli d4556d4da3 added minifed js files
replace jquery form and timeago with minified versions
Julian Lam a500899fdf removing unused bootstrap js file
Julian Lam 4343f240d0 moving async back to proper vendor folder
Julian Lam 2f1707e772 Merge branch 'master' of github.com:designcreateplay/NodeBB
barisusakli 813b3d6fcc changes for live streaming of posts
psychobunny 1e9850b6b9 vendor*
psychobunny df29410c08 moving async back to require.js modules/vendor folder
Julian Lam 3dc4fd9fd9 added sounds for incoming and outgoing chat, and new notification
Julian Lam 4cb9f34253 adding buzz and sound assets
Julian Lam f65a7f96ff moving async to proper vendor folder
Julian Lam cb304d7d54 fixed
barisusakli a5f4135c62 added socket listeners to home
psychobunny 29ad8d2582 closes
barisusakli 3d68c7c6b6 added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js
barisusakli 661dff2f9b added jquery css
Julian Lam 19c9f1bb19 backwards compatibility with plugins that are assuming no callback
barisusakli 656ec227e9 merge
barisusakli 78f9c25c9c added autocomplete to jquery fixed search results
psychobunny a68ba044c3 fixed missing topic_name and viewcount when reverse infinite scrolling
psychobunny 857df86726 fixed pagination, and loading of template blocks on cold load (temp solution)
psychobunny 875c8ed66c console.log
psychobunny 62afe65ccf bugfix + deprecated templates.getTemplateNameFromUrl
psychobunny 712c382a28 optimizing ajaxify (still needs work though)
psychobunny 464c2f42c3 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js
psychobunny 68b41083ad removing re-added templates from core
barisusakli 73c89010cb closes
barisusakli 57f9f8bc57 closes
psychobunny 1ef95bd09e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	app.js
	public/templates/category.tpl
	public/templates/popular.tpl
	public/templates/recent.tpl
	public/templates/unread.tpl
	src/routes/plugins.js
	src/webserver.js
barisusakli 6496b91c29 closes
barisusakli b4b9ed1841 optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
Julian Lam 6fb393de78 fixing
Julian Lam 5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
psychobunny e84dd4fd94 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountedit.tpl
	public/templates/header.tpl
	src/routes/meta.js
	src/webserver.js
Baris Soner Usakli 30130b2d62 set back to false when loading indicator fades out
Baris Soner Usakli 6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 7dfdab0a2d search page change
Julian Lam 5880590425 removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes 
psychobunny 7183fda2eb console.log
psychobunny bcd8137d0e console.log
psychobunny 55a7838725 temporary templateMapping fix for admin side; will come back to this after merging this branch
Julian Lam 1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam e9e53ad95e added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)
Baris Soner Usakli 7135e9424c closes
Baris Soner Usakli 3fe9bdc24c removed the postbar selector from activeusers
psychobunny 542f937589 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/api.js
Baris Soner Usakli c028761857 new route to get recent posts
psychobunny 73d637096c Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/account.tpl
	public/templates/accountposts.tpl
	public/templates/favourites.tpl
	public/templates/search.tpl
Julian Lam 6192af18ab Merge pull request from BitBangersCode/settings-callback
Send the callback to the retry
MrWaffle 33a5a2177e Send the callback to the retry
Baris Soner Usakli 976744480f post summary change
psychobunny 3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
psychobunny 552eb78db8 template compiling init; changing themes now finally works on this branch
psychobunny 88e5ddac76 deprecating hook events on body
psychobunny c67182204f clean-up + bugfixes
psychobunny 444956d517 deprecated loadTemplates client-side as well
psychobunny 68d526b762 deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js
psychobunny f73fd1eeae removed an unused hack in utils.js
Baris Soner Usakli 76d8d09f9b closes
psychobunny d4f453cde3 added gitignore to public/templates dir
psychobunny 66ef8c8284 removed vanilla templates from core into nodebb-theme-vanilla :shipit:
Baris Soner Usakli d100a41ce7 fixes topic follow
psychobunny 6e8c618fb1 prevent translator crash if data is undefined; linted/cleanup
psychobunny cd336006fc optimized cold loading
Baris Soner Usakli 8c11299197 template language fix
psychobunny 10f4fa004e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
psychobunny 48df0cf889 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/admin.js
Barış Soner Uşaklı 81378e071b Merge pull request from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
Julian Lam 9b53dd1014 english fallback for 'reset_password' translations
medwards20x6 76b53478ce Don't fire click when closing an alert
Baris Soner Usakli 3c97ef6829 closes
Baris Soner Usakli dbb814fe4e category permission page fixes
Baris Soner Usakli 7bb3766ebd 2 column layout for admin index
Baris Soner Usakli 814db2e1d8 icon first
Baris Soner Usakli 4b64b9dcdc closes
Julian Lam 57d0273c13 dutch translations
Baris Soner Usakli be70b3de57 closes
Baris Soner Usakli 529cd60dd2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 70299ea5c2 better search result page
psychobunny c26af77a24 fixing cold load of admin/index
Julian Lam 64ee792013 fixed
Julian Lam 5a8fa9b1f7 fixed regression in groups management modal
psychobunny 5b25e21606 console.log
psychobunny 8ad24818df fixed FOUS in category sidebar
psychobunny 71675d0aa0 removed required "ajaxifying" class for #content - breaks browsers with noscript turned on.
psychobunny d20501b29d meta.js merge conflict
psychobunny c44934cc0d all JS files properly required on cold load
psychobunny 52a50a80ba templates.parseTemplateVariables, added optional callback
psychobunny b9264dea76 ajaxify.loadScript
Julian Lam 044347ebca hotfix for vanilla missing socket.io lib
Baris Soner Usakli 016642bc16 show 1 ip per line
Baris Soner Usakli 98fa8c419d closes
Baris Soner Usakli 55b5d0c209 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli e4b6d0e1ff closes
psychobunny ee5596fad5 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Julian Lam 14d7453a23 bundling socket.io client library into minfile, minfile always used from this point forward, even in development mode.
Development mode will not compress the scripts, but will just concatenate.
Julian Lam 033c5d5726 es, fr, nb, sv, zh_CN translations
Baris Soner Usakli 5732994097 reset_code click fix
Baris Soner Usakli 1b7f8cc5cb active users fix
Julian Lam 77f5d6ff7d Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 1c324f45cf tried fixing absentee detection in active users
Baris Soner Usakli c6ff8e1042
Julian Lam 2b178ff76d proper tracking of users' reply status when others enter the room
Julian Lam a9b78d2600 minimizing the composer should unregister it
Julian Lam 68fb6ec09a Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam f2ffc2b533 properly referencing the tid of the composer instead of blindly checking templates.get('topic_id')
Baris Soner Usakli 3c6e4ebda1 possible fix to
Julian Lam 7ef84e0daa switched to 'ping active' system
Julian Lam b3d7ae1c86 showing who is replying in the active users block
psychobunny 26853d024e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Baris Soner Usakli 8eca195530 updateHeader once on load
Baris Soner Usakli 84dc012198 closes
Baris Soner Usakli e75c303b89 added unique visitor count to admin dashboard
psychobunny e73f8d6f37 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
psychobunny 0211b4484b on cold load, only display page after widgets are rendered
psychobunny 6f21547a8d ajaxify.fadeIn, ajaxify.fadeOut
Baris Soner Usakli 6bf36a0468 if alert is closed dont fire clickfn
psychobunny 6827dbc9c4 render widgets on cold load
Baris Soner Usakli eea677655f minor clean up to categories.js
psychobunny 23c283f06c ajaxify.getTemplateMapping
psychobunny 49997639e9 moved widget rendering code into ajaxify.renderWidgets
psychobunny 584347848b trigger action:ajaxify.start and action:ajaxify.end on cold load
Baris Soner Usakli eac201cae9 no need to do these on every ajaxify into categories
Baris Soner Usakli 7eae79cee9 anons cant chat
Baris Soner Usakli ccd29bfd61 added callback to category update
psychobunny 607bc8545b Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Baris Soner Usakli 8064f7f0db scroll fix
Baris Soner Usakli 9b4ca12dc1 fixed missing var, posts.js cleanup
Baris Soner Usakli 091723a8c5 closes
Baris Soner Usakli 0682b5c5ea fix admin users link
Baris Soner Usakli 389fc787a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli c49c3e3550 fixed jquery ui package
psychobunny 4435a20d90 fixed merge conflict
psychobunny 4a33b41464 deprecating loadServer in favour of using res.render
Julian Lam e2fb3dacca pushing new language fallbacks
Julian Lam dfd13fac0d Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 44ac7ec262 added new hooks for rendering help messages in composer, removed markdown text from translation
Baris Soner Usakli 30eb85f96e fixed conflicts
Baris Soner Usakli 44d40fba35 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 0ca6c58ded closes
Julian Lam 1a85d45567 portuguese and slovak translations
Baris Soner Usakli dcd3975933 closes
akhoury 2209a55afc - changes per PR conversation
akhoury 0070e1158e removing a boolean left out from the addEventListener definition
Baris Soner Usakli 72aa22d824 removed unused timestamp
akhoury 3f1d5c6656 merge fork with upstream master
Baris Soner Usakli 87ccfdf5eb Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli d87034b131 use alert for bookmark
akhoury 1b207d8276 IE8 support, general cleanups, from native to $ objects ...
akhoury b59c10a1e9 took out some overrides out utils to a new overrides.js
Julian Lam ef2dbe8df6 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 04b2887d88 fixed it language code
Baris Soner Usakli d5268f5497 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 56bbeb9950 use disableSocialButtons from config
psychobunny 2247a8b21f Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny aee2b2ecd0 allow express to serve parsed tpls via res.render
Baris Soner Usakli ea6cf3bbd5 more cleanup and changes to topics
Julian Lam 74d6392bec added Dutch language
Julian Lam c38e328377 language files for fi, it, zh_CN, pl, hu
Baris Soner Usakli 8a2266816d make plugin names strong
Baris Soner Usakli 36bc2967c2 fix highlight on vanilla, dont replaceState if url didnt change
Baris Soner Usakli 1ba3acfd03 display ips to admins/users on profile
Julian Lam 6545357969 fixing admin stylesheet + lavender minver
Julian Lam f5d1ba4231 closed
Baris Soner Usakli 8913de4ea8 dont add post-bar to each post
Baris Soner Usakli 3c53ebb02e better scrolling
Baris Soner Usakli 23c20a2821 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli b658c68736 back doesnt work
Julian Lam 4c21b23ea2 Merge branch 'master' of github.com:designcreateplay/NodeBB
Baris Soner Usakli a3855a47e5 check replaceState
Baris Soner Usakli 5567378234 change hash take 2
Julian Lam 7f11d78b82 Merge branch 'master' into less-is-moar
Julian Lam e3ec4e938a Revert "update post has in address bar, #1126"
This reverts commit 4b1c8150d3.
Baris Soner Usakli 4b1c8150d3 update post has in address bar,
Baris Soner Usakli 14b298eda8 cleaned updateHeader
Baris Soner Usakli f39248c83b closes
Julian Lam 53f1e4d3d4 dedicated stylesheet.css route for LESS compilation, no longer usin less-middleware for base theme...
Baris Soner Usakli 7e5a7c53bd changes to templates
psychobunny 156c0302c9 properly namespacing objects in templates
Baris Soner Usakli 0777c96a55 dont highlight reverse infinite loaded posts
Baris Soner Usakli 0da2839943 added the class for topic delete
Baris Soner Usakli 3ed2d21eb6 fixed flag post, added highlight to scroll post
Baris Soner Usakli 0f8ee3a671 added instructions class
Baris Soner Usakli 7c49c32ad3 scroll fix
Baris Soner Usakli cd9bd91ab2 fixes double hashes in share links
psychobunny acafa9095f added footer widget area to topic.tpl
psychobunny 71ea01edb7 switching topics.thumb conditional back
psychobunny a79ca2b135 clean up ENDIF conditional if object.value is undefined and is used in an ELSE block
Julian Lam 1052165373 updated messages when toggling themes or plugins
Julian Lam 2baa381917 plugins and themes now trigger a restart
Julian Lam 4ef1d83acd Merge branch 'master' into nodebb-loader
Baris Soner Usakli fd41d93bdb took out if from the src
Baris Soner Usakli e3d01df6a2 closes
Baris Soner Usakli b8b83c2ec2 share buttons
Baris Soner Usakli f967407805 follow state clean up
Baris Soner Usakli 649bcf49b4 one liner
Baris Soner Usakli b5c8158ad5 more cleanup
Baris Soner Usakli 403de08d60 cleaned more
Baris Soner Usakli 122d1ad82a less is more
Baris Soner Usakli e35a54bea4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 6c6c57f45f closes
Alejandro Del Rincón a9f20a7791 More translation
Alejandro Del Rincón 8111b9e91f Finally reviewed spanish transalation
I revised the spanish translation to something more serious and complete. There was a lot of wrong spelled words and some untranslated/bad translated words
Alejandro Del Rincón López 8ef59adb4a Actualización lenguaje español
The translation was very faulty with a lack of accents and some words untranslated
Baris Soner Usakli 6e5a6b8784 upgraded categories to sorted set, score is the order set from acp, check if category topic exists before posting
Baris Soner Usakli d6d9776cde added toPid to posts
Julian Lam 7760a6b207 added restart button to ACP (!!)
Baris Soner Usakli a8c7b32a04 moved plugin alert to top
Baris Soner Usakli 3f43ca0925 change on click
Baris Soner Usakli f57e293abb plugin buttons indicate active state
Baris Soner Usakli cfe5b6aa4a check if thumEl exists before trim
Baris Soner Usakli bae76ebd70 fixed the redis error when going to unread/recent if nextStart is missing
Baris Soner Usakli 29ba015d69 fixed topic thumbs
psychobunny f862d856fc alright clearly, regex on fridays just don't happen for me. - fixed
psychobunny 027398f5ba unreverting change
psychobunny 0c54afe576 reverting previous template fix
psychobunny 2ec6dd1d14 added filter:topic.thread_tools for creating custom admin functionality in topics view
psychobunny 6f7243f42f fixed a bug running multiple blocks in one template on an empty array
psychobunny 32ac3d94d2 moved pin and lock out of .topic-title in popular/recent/unread
psychobunny e9c7de951b moved pin and lock out of .topic-title
psychobunny c7fb34c23f new client-side hooks: filter:categories.new_topic, action:categories.new_topic.loaded
psychobunny 15f19653c5 action:categories.loading and action.categories.loaded
psychobunny 7e767da73e closes and
psychobunny 5179fec986 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny a3191227de closes