1419 Commits

Author	SHA1	Message	Date
Baris Soner Usakli	dba47e4bef	removed console.log	2013-11-28 18:45:36 -05:00
Baris Soner Usakli	2a46ead29f	removed container div, removed second if first, it breaks templates	2013-11-28 18:44:02 -05:00
Julian Lam	707179edf3	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-11-28 17:51:02 -05:00
Julian Lam	53164e96ab	removed non-functional save button from category whitelist modal	2013-11-28 17:50:40 -05:00
Baris Soner Usakli	9702e28a07	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-28 17:45:17 -05:00
Baris Soner Usakli	fa56eca962	fixed fave stars, removed the watch button from normal posts	2013-11-28 17:45:04 -05:00
Julian Lam	684839f04a	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-11-28 17:37:41 -05:00
Julian Lam	0188ea9a3b	setting cache headers to 0 on development mode	2013-11-28 17:37:17 -05:00
psychobunny	85aa587749	merge conflicts	2013-11-28 17:16:27 -05:00
psychobunny	48e36e3c31	templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3	2013-11-28 17:14:04 -05:00
Baris Usakli	0b6d018f8d	oops removed by mistage	2013-11-28 16:20:05 -05:00
Baris Usakli	f2bf65252d	removed the fields	2013-11-28 16:15:18 -05:00
Baris Usakli	a87ebb64d8	clean up of posts and some template additions	2013-11-28 15:18:19 -05:00
Julian Lam	38da65ee58	tweaks to category permission modal	2013-11-28 14:27:19 -05:00
Baris Usakli	7198110b57	closes #573	2013-11-28 11:16:52 -05:00
Baris Usakli	78b65c0b12	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-28 10:58:24 -05:00
Baris Usakli	0742590c0c	added pid to share links, removed unused vars	2013-11-28 10:58:14 -05:00
psychobunny	c16f04bbcf	plugins - filter:admin.header.build (pre-existing hook) now allows you to add menu items to the social authentication panel as well	2013-11-28 10:42:25 -05:00
Julian Lam	69427fa10e	tweaks to make the ACP work better on tablets, some work on hidden groups	2013-11-27 20:20:08 -05:00
Julian Lam	670986f7ef	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-11-27 20:07:37 -05:00
Julian Lam	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...	2013-11-27 20:07:04 -05:00
psychobunny	89c5d01efa	modularized SSO, paving the way for potential plugins. cleaned up associated templates/js	2013-11-27 16:47:54 -05:00
Julian Lam	0a06f1ac7d	Merge remote-tracking branch 'origin/master' into category-whitelisting	2013-11-27 16:23:48 -05:00
Julian Lam	df2e9b4b47	admin panel integration for category whitelisting	2013-11-27 16:23:30 -05:00
Baris Soner Usakli	2d05a06e37	fixed template var, oops	2013-11-27 14:25:58 -05:00
Baris Soner Usakli	e3da005780	grouped the social buttons	2013-11-27 14:25:01 -05:00
Baris Usakli	590208f0c7	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-27 12:39:15 -05:00
Baris Usakli	7d7ead3f47	fixed js error in recent.js, remove content assignment	2013-11-27 12:39:07 -05:00
Julian Lam	72ef8c839f	Merge remote-tracking branch 'origin/master' into category-whitelisting ... Conflicts: src/groups.js	2013-11-27 11:34:52 -05:00
psychobunny	62e2aa67d7	topics - added back social sharing buttons to OP	2013-11-27 10:58:37 -05:00
Julian Lam	4855131652	category read restrictions	2013-11-27 08:49:23 -05:00
Baris Soner Usakli	3a8dca6fb9	closes #560	2013-11-26 23:55:55 -05:00
Baris Soner Usakli	a0c3de0273	display signature block only if user has signature	2013-11-26 19:22:02 -05:00
Baris Soner Usakli	32b191fa62	removed global.io	2013-11-26 19:09:32 -05:00
Baris Usakli	f616125d02	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-26 16:30:19 -05:00
Baris Usakli	e1f6e064a9	removed io from user.js, figure out why notifications are breaking when websockets.js is required from it	2013-11-26 16:30:10 -05:00
Julian Lam	633be7ff3c	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-11-26 15:50:37 -05:00
Julian Lam	6b3863bfbf	updated category manager in admin panel	2013-11-26 15:50:33 -05:00
Baris Usakli	b66ca703b8	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-26 15:28:55 -05:00
Baris Usakli	48a7f9058f	closes #558	2013-11-26 15:28:45 -05:00
psychobunny	8f80733563	fixing #552 overflows properly	2013-11-26 15:19:30 -05:00
Baris Usakli	aa1451cfbc	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-26 15:15:31 -05:00
Baris Usakli	13ef28118d	closes #557	2013-11-26 15:15:23 -05:00
Julian Lam	34459e7cf1	fixing category admin panel integration	2013-11-26 15:14:12 -05:00
Baris Usakli	798e17a954	change loading text to inline	2013-11-26 14:48:55 -05:00
Baris Usakli	e90e54cec1	fixed icons in topic move	2013-11-26 14:37:27 -05:00
Baris Usakli	d70c688b65	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-26 14:26:01 -05:00
Baris Usakli	541993c80a	fontawesome 4 migration, closes #473	2013-11-26 14:25:46 -05:00
psychobunny	e98d05b1a5	closes #556, also removes the newline that was previously inserted	2013-11-26 13:18:41 -05:00
Julian Lam	0afc7c9761	Merge branch 'master' of github.com:designcreateplay/NodeBB	2013-11-26 12:25:24 -05:00