Commit Graph

872 Commits (1660d75205f172e610fda45f5bdb43b40ad1acdf)

Author SHA1 Message Date
Julian Lam 0159a43a20 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	public/src/forum/topic.js
Julian Lam 86b019ec89 paginator progress bar
psychobunny 30a7f1a816 removed .main-post from follow class (now using conditionals to show/hide)
Baris Usakli 6ca3d0c4af Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli b2074c6dda fixes to infinite load and paginator
Julian Lam 56ef05a0bf putting category options behind a dropdown, and fixing category enable/disable
Baris Usakli 293c176053 added first to follow button in topic.tpl
Baris Soner Usakli 2a46ead29f removed container div, removed second if first, it breaks templates
Julian Lam 707179edf3 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 53164e96ab removed non-functional save button from category whitelist modal
Baris Soner Usakli fa56eca962 fixed fave stars, removed the watch button from normal posts
psychobunny 48e36e3c31 templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3
Baris Usakli a87ebb64d8 clean up of posts and some template additions
Baris Usakli 7198110b57 closes
psychobunny c16f04bbcf plugins - filter:admin.header.build (pre-existing hook) now allows you to add menu items to the social authentication panel as well
Julian Lam 69427fa10e tweaks to make the ACP work better on tablets, some work on hidden groups
psychobunny 89c5d01efa modularized SSO, paving the way for potential plugins. cleaned up associated templates/js
Julian Lam 0a06f1ac7d Merge remote-tracking branch 'origin/master' into category-whitelisting
Julian Lam df2e9b4b47 admin panel integration for category whitelisting
Baris Soner Usakli 2d05a06e37 fixed template var, oops
Baris Soner Usakli e3da005780 grouped the social buttons
psychobunny 62e2aa67d7 topics - added back social sharing buttons to OP
Baris Soner Usakli a0c3de0273 display signature block only if user has signature
Julian Lam 633be7ff3c Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 6b3863bfbf updated category manager in admin panel
psychobunny 8f80733563 fixing overflows properly
Julian Lam 34459e7cf1 fixing category admin panel integration
Baris Usakli 798e17a954 change loading text to inline
Baris Usakli 541993c80a fontawesome 4 migration, closes
Baris Usakli a5e78aab08 closes
Baris Soner Usakli 1d4ae8fe4d changed the paginator icons to chevron
psychobunny 4be5ac2c23 removed mobile overlay for topics - will reimplement as a plugin
psychobunny 8d12ecb758 moved pagination into header
psychobunny 905e451455 closes
psychobunny 7fb0a616a1 refactored topic.tpl and merged main_posts and sub_posts
psychobunny 181c6eb2e6 removed main_posts from noscript
psychobunny b90eef6d19 use icon-search instead of icon-circle-blank on /users/search
Baris Soner Usakli ff50917c29 show no replies in recent and unread
Baris Soner Usakli 48835d8c44 used ELSE in template
Baris Soner Usakli 23eb7824ac closes
Baris Soner Usakli 494b9d23ac Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 64ae9ac033 cant delete or restore posts twice, post count goes up or down when posts are deleted or restored in a topic, fixed the post insertion when there is only 1 post in topic
Julian Lam a72fc69997 added link to RSS for /recent, fixed RSS generation error for /recent
Baris Soner Usakli a16f93cbd5 loading indicator starts off hidden
psychobunny 46bad118de if a thread is unreplied, don't show the OP as the last person to reply
psychobunny a1839d90fd prevent admin group from being deleted, closes
Julian Lam cd1e26418d making the loading indicator less obtrusive (and smaller, to boot)
Baris Usakli 501dc56fd3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 253271127d infinite loader will insert posts in correct order
Julian Lam 6dd72f480c Merge pull request from draco2003/add_fav_context
add breadcrumb like context to favorites