Commit Graph

  • 9702e28a07 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Soner Usakli 2013-11-28 17:45:17 -05:00
  • fa56eca962 fixed fave stars, removed the watch button from normal posts Baris Soner Usakli 2013-11-28 17:45:04 -05:00
  • 684839f04a Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-28 17:37:41 -05:00
  • 0188ea9a3b setting cache headers to 0 on development mode Julian Lam 2013-11-28 17:37:17 -05:00
  • 85aa587749 merge conflicts psychobunny 2013-11-28 17:16:27 -05:00
  • 48e36e3c31 templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3 psychobunny 2013-11-28 17:14:04 -05:00
  • 0b6d018f8d oops removed by mistage Baris Usakli 2013-11-28 16:20:05 -05:00
  • f2bf65252d removed the fields Baris Usakli 2013-11-28 16:15:18 -05:00
  • 4335f8c5c6 fixed date in upgrade Baris Usakli 2013-11-28 15:57:00 -05:00
  • ae82f57c67 added upgrade script to delete removed keys from posts Baris Usakli 2013-11-28 15:55:40 -05:00
  • 168052bf45 added back feeds, removed duplicate post var in feed Baris Usakli 2013-11-28 15:33:26 -05:00
  • a87ebb64d8 clean up of posts and some template additions Baris Usakli 2013-11-28 15:18:19 -05:00
  • 38da65ee58 tweaks to category permission modal Julian Lam 2013-11-28 14:27:19 -05:00
  • e3e1a556cd groups pruning method Julian Lam 2013-11-28 12:55:05 -05:00
  • 56b618c915 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-28 11:17:01 -05:00
  • 7198110b57 closes #573 Baris Usakli 2013-11-28 11:16:52 -05:00
  • b7aea63c53 create auth routes only after plugin system is enabled and auth.init hook is fired psychobunny 2013-11-28 11:13:03 -05:00
  • 78b65c0b12 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-28 10:58:24 -05:00
  • 0742590c0c added pid to share links, removed unused vars Baris Usakli 2013-11-28 10:58:14 -05:00
  • c16f04bbcf plugins - filter:admin.header.build (pre-existing hook) now allows you to add menu items to the social authentication panel as well psychobunny 2013-11-28 10:42:25 -05:00
  • 51b38c4c55 plugins - added filter:auth.init hook to add additional login strategies; fixed callbackURL psychobunny 2013-11-28 10:30:29 -05:00
  • 79eddc9b06 Merge pull request #570 from draco2003/patch-2 Julian Lam 2013-11-27 20:07:36 -08:00
  • 21f63ac17f Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Soner Usakli 2013-11-27 22:02:57 -05:00
  • fdf5227c35 closes #572 Baris Soner Usakli 2013-11-27 22:02:50 -05:00
  • 98f03a723e upping mentions minver Julian Lam 2013-11-27 21:30:26 -05:00
  • 69427fa10e tweaks to make the ACP work better on tablets, some work on hidden groups Julian Lam 2013-11-27 20:20:08 -05:00
  • 670986f7ef Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-27 20:07:37 -05:00
  • 8b62041d28 refactored groups and categories, groups no longer explodes when attempting to add members to a whitelist that doesn't exist, isEmpty checks (new methods!) and such... Julian Lam 2013-11-27 20:07:04 -05:00
  • 89c5d01efa modularized SSO, paving the way for potential plugins. cleaned up associated templates/js psychobunny 2013-11-27 16:47:40 -05:00
  • 0a06f1ac7d Merge remote-tracking branch 'origin/master' into category-whitelisting Julian Lam 2013-11-27 16:23:48 -05:00
  • df2e9b4b47 admin panel integration for category whitelisting Julian Lam 2013-11-27 16:23:30 -05:00
  • aed4e2792d Minify socket.io js Dan Rowe 2013-11-27 15:57:29 -05:00
  • c860df7975 more #559 Baris Soner Usakli 2013-11-27 15:03:36 -05:00
  • 2148f6ff95 closes #559 Baris Soner Usakli 2013-11-27 15:02:09 -05:00
  • 2d05a06e37 fixed template var, oops Baris Soner Usakli 2013-11-27 14:25:58 -05:00
  • e3da005780 grouped the social buttons Baris Soner Usakli 2013-11-27 14:25:01 -05:00
  • f0e8633dcc category whitelisting for posting messages, isAdmin now error-first Julian Lam 2013-11-27 12:47:00 -05:00
  • 590208f0c7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-27 12:39:15 -05:00
  • 7d7ead3f47 fixed js error in recent.js, remove content assignment Baris Usakli 2013-11-27 12:39:07 -05:00
  • 974629ce85 hahah, bad paste, missing a bunch of line endings Julian Lam 2013-11-27 11:48:18 -05:00
  • 72ef8c839f Merge remote-tracking branch 'origin/master' into category-whitelisting Julian Lam 2013-11-27 11:34:52 -05:00
  • 5ee5c8179a category whitelist for replying to posts, lots of refactoring, too Julian Lam 2013-11-27 11:27:20 -05:00
  • 46d6d7637e potentially fixes ubbmigrator issue https://github.com/akhoury/nodebb-plugin-ubbmigrator/issues/2 psychobunny 2013-11-27 11:21:16 -05:00
  • 62e2aa67d7 topics - added back social sharing buttons to OP psychobunny 2013-11-27 10:58:37 -05:00
  • 182659d0e1 removing extra .js suffix from required files and physically separating nodebb libs from deps Julian Lam 2013-11-27 08:55:02 -05:00
  • 4855131652 category read restrictions Julian Lam 2013-11-27 08:49:12 -05:00
  • 4d2469b4ce tweaks to whitelist (interim commit) Julian Lam 2013-11-27 08:34:25 -05:00
  • 4e2326fc84 Merge remote-tracking branch 'origin' into category-whitelisting Julian Lam 2013-11-27 08:17:23 -05:00
  • 3a8dca6fb9 closes #560 Baris Soner Usakli 2013-11-26 23:55:55 -05:00
  • 31635b92f3 closes #561 Baris Soner Usakli 2013-11-26 23:19:21 -05:00
  • a0c3de0273 display signature block only if user has signature Baris Soner Usakli 2013-11-26 19:22:02 -05:00
  • 32b191fa62 removed global.io Baris Soner Usakli 2013-11-26 19:09:32 -05:00
  • f616125d02 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-26 16:30:19 -05:00
  • e1f6e064a9 removed io from user.js, figure out why notifications are breaking when websockets.js is required from it Baris Usakli 2013-11-26 16:30:10 -05:00
  • 633be7ff3c Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-26 15:50:37 -05:00
  • 6b3863bfbf updated category manager in admin panel Julian Lam 2013-11-26 15:50:33 -05:00
  • b66ca703b8 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-26 15:28:55 -05:00
  • 48a7f9058f closes #558 Baris Usakli 2013-11-26 15:28:45 -05:00
  • 8f80733563 fixing #552 overflows properly psychobunny 2013-11-26 15:19:30 -05:00
  • aa1451cfbc Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-26 15:15:31 -05:00
  • 13ef28118d closes #557 Baris Usakli 2013-11-26 15:15:23 -05:00
  • 34459e7cf1 fixing category admin panel integration Julian Lam 2013-11-26 15:14:12 -05:00
  • 798e17a954 change loading text to inline Baris Usakli 2013-11-26 14:48:55 -05:00
  • 5ad80218a2 upping cerulean minver Julian Lam 2013-11-26 14:45:12 -05:00
  • e90e54cec1 fixed icons in topic move Baris Usakli 2013-11-26 14:37:27 -05:00
  • bca1fde69c updated schema date Baris Usakli 2013-11-26 14:33:18 -05:00
  • d70c688b65 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-26 14:26:01 -05:00
  • 541993c80a fontawesome 4 migration, closes #473 Baris Usakli 2013-11-26 14:25:46 -05:00
  • 529c8acf6c app.js: added --install alias for --setup psychobunny 2013-11-26 14:15:40 -05:00
  • e98d05b1a5 closes #556, also removes the newline that was previously inserted psychobunny 2013-11-26 13:18:41 -05:00
  • 0afc7c9761 Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-26 12:25:24 -05:00
  • e5c1edd5f5 using ajaxifying class for content and footer instead of jquery fadein/out Julian Lam 2013-11-26 12:25:19 -05:00
  • a5e78aab08 closes #554 Baris Usakli 2013-11-26 11:59:54 -05:00
  • cec69c2be0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Usakli 2013-11-26 11:43:35 -05:00
  • bc8815cb94 closes #555 Baris Usakli 2013-11-26 11:43:25 -05:00
  • efac6272bb default link tag (apple-touch-icon) added Julian Lam 2013-11-26 11:34:38 -05:00
  • bdb30976b5 adding maxAge headers for statically served files (eep!) - issue #552 Julian Lam 2013-11-26 11:17:34 -05:00
  • 1d4ae8fe4d changed the paginator icons to chevron Baris Soner Usakli 2013-11-25 21:38:04 -05:00
  • abdb4c34ef tweaks to topic locking Julian Lam 2013-11-25 17:49:17 -05:00
  • 08d130893c fixing dropdown support in Settings.prepare Julian Lam 2013-11-25 17:48:55 -05:00
  • b2fb9aa99f refactored topic locking pinning and deleting (and its inverses) so that the privilege check is done not in the method, but in the socket call Julian Lam 2013-11-25 17:20:44 -05:00
  • 561ee9e4f1 closes #519 psychobunny 2013-11-25 17:00:37 -05:00
  • 3f70d45f3d Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-25 17:00:06 -05:00
  • c07783fa2c ... Julian Lam 2013-11-25 17:00:01 -05:00
  • d4d0e8cd9b set unreplied flag to new topics sent via websocket psychobunny 2013-11-25 16:51:52 -05:00
  • 4be5ac2c23 removed mobile overlay for topics - will reimplement as a plugin psychobunny 2013-11-25 16:47:06 -05:00
  • 070c95d8de fixed regression from main_posts deprecation - bottom post bar restored psychobunny 2013-11-25 16:38:45 -05:00
  • 8d12ecb758 moved pagination into header psychobunny 2013-11-25 16:37:23 -05:00
  • 81560c4698 Merge branch 'master' of https://github.com/designcreateplay/NodeBB Baris Soner Usakli 2013-11-25 16:29:37 -05:00
  • 390937a20b added err to getAllTopics Baris Soner Usakli 2013-11-25 16:29:28 -05:00
  • 2a8a38b742 Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-25 16:28:14 -05:00
  • 5a5c3c8c60 added app.load action hook Julian Lam 2013-11-25 16:28:07 -05:00
  • 905e451455 closes #549 psychobunny 2013-11-25 16:16:18 -05:00
  • 69b8b47b15 updated cerulean dep to 0.0.9 psychobunny 2013-11-25 15:56:50 -05:00
  • b16e1a0113 Merge branch 'master' of github.com:designcreateplay/NodeBB Julian Lam 2013-11-25 15:56:22 -05:00
  • 0b39968a9c fixing back button behaviour and playing nice with History API Julian Lam 2013-11-25 15:56:16 -05:00
  • d8b3abb611 updating cerulean dep to 0.0.8 psychobunny 2013-11-25 15:46:32 -05:00
  • 7fb0a616a1 refactored topic.tpl and merged main_posts and sub_posts psychobunny 2013-11-25 15:46:24 -05:00
  • d987e51a8b removed references to main_posts in forum/topic.js psychobunny 2013-11-25 15:46:03 -05:00
  • 0f7f6cd0a3 templates.js added IF !value psychobunny 2013-11-25 13:59:07 -05:00