Commit Graph

3384 Commits (869f9e0d86a25d7f125f59eddbf0177fd41caf55)
 

Author SHA1 Message Date
MrWaffle 869f9e0d86 Add custom templates to /api/get_templates_listing
Baris Soner Usakli 2e786cc4d1 closes , removed global translator, templates and server objects
Baris Soner Usakli 393bb7245c closes
Baris Soner Usakli d718eca935 fixes global meta leak, and categories meta require,
psychobunny 46e29dfb2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny d67ae5c2be changing undetected minified JS file warning to info message instead
Julian Lam 1cce38cae6 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam d5534cf545 fixing upgrade script on edge builds
psychobunny 0a749023cb fixing if statements inside a @first / @last block
Julian Lam e09132350d re-adding conditional to hide quote/reply block if no write perm
psychobunny 503e59b12b clean up conditionals only at the very end of parsing
Julian Lam 26848641cd restoring post/quote buttons pending template system fix for IFs
Julian Lam a3fe390810 reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry!
Julian Lam be86f84ef8 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam ab85ef6b7b fixed issue where back button stopped ajaxifying internally.
Baris Soner Usakli 620ff65cbe Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 7f23f848fe fix for mismatch between favourite count and number of people in favourited seT
Julian Lam 459d5ddccd fixed - added proper detection so that onpopstate would not react if it was a proper page load
Julian Lam 43808c01ec reduced the number of 'ajaxify.go' calls to one, in /src
Julian Lam b587d7b5ad fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack.
Julian Lam ef450edfea Revert "possible fix to #840", please see
This reverts commit 1d666bf7f0.
Julian Lam dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB
Barış Soner Uşaklı c91ae0c4c4 Update categories.js
Baris Soner Usakli f3bdc55348 little tweak to user search show timing and 10 users, sort after slicing
Baris Soner Usakli 1d666bf7f0 possible fix to
Baris Soner Usakli 3ea7d4d217 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 3793ddc2e8 fixes user tooltips on infinit load
Julian Lam 3fa9e3f31b Merge pull request from akhoury/master
removed use_proxy config, cleaned-up some comments
akhoury dcc6ec797e removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820
Baris Soner Usakli b0ef974590 lots of cleanup and refactor
Baris Soner Usakli f62c82c797 send app to action:app.load
Baris Soner Usakli 6da12d1a39 and for andrew
Baris Soner Usakli bc1cde38da added getObjectKeys for julian :)
Julian Lam 2af14e47b1 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam d380f69310 support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden
Baris Soner Usakli 824c5072e8 topics should be marked read correctly if you are already in it
Julian Lam a0e9e52e70 adding xregexp to ACP header
Baris Soner Usakli 47c32738a6 removed tests from acp
Julian Lam f02cd9df82 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
	src/user.js
Matti Leppänen 4cfd970d5f Added Finnish language translation
Aziz Khoury 659817b4f1 Update comment
Aziz Khoury 7e3d8d65f5 Update login.js
Baris Soner Usakli b717c74a81 closes
Baris Soner Usakli 042174290f removed console.log
Baris Soner Usakli 8aebb7f84d Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli b325212182 crash fix for admin verify email, temp fix
Julian Lam 1e99945515 Merge branch 'yangwao-master'
Julian Lam f0e47e43bc fb and tw strings for traditional chinese
wao 7b150ab407 added Slovak language translation
Baris Soner Usakli 044382047d removed commented out section