17105 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Julian Lam	df2e9b4b47	admin panel integration for category whitelisting	2013-11-27 16:23:30 -05:00
Dan Rowe	aed4e2792d	Minify socket.io js ... potential solution for issues/569	2013-11-27 15:57:29 -05:00
Baris Soner Usakli	c860df7975	more #559	2013-11-27 15:03:36 -05:00
Baris Soner Usakli	2148f6ff95	closes #559	2013-11-27 15:02:09 -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
Julian Lam	f0e8633dcc	category whitelisting for posting messages, isAdmin now error-first	2013-11-27 12:47:00 -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	974629ce85	hahah, bad paste, missing a bunch of line endings	2013-11-27 11:48:18 -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
Julian Lam	5ee5c8179a	category whitelist for replying to posts, lots of refactoring, too	2013-11-27 11:27:20 -05:00
psychobunny	46d6d7637e	potentially fixes ubbmigrator issue https://github.com/akhoury/nodebb-plugin-ubbmigrator/issues/2	2013-11-27 11:21:16 -05:00
psychobunny	62e2aa67d7	topics - added back social sharing buttons to OP	2013-11-27 10:58:37 -05:00
Julian Lam	182659d0e1	removing extra .js suffix from required files and physically separating ... nodebb libs from deps	2013-11-27 08:55:02 -05:00
Julian Lam	4855131652	category read restrictions	2013-11-27 08:49:23 -05:00
Julian Lam	4d2469b4ce	tweaks to whitelist (interim commit)	2013-11-27 08:34:25 -05:00
Julian Lam	4e2326fc84	Merge remote-tracking branch 'origin' into category-whitelisting	2013-11-27 08:17:23 -05:00
Baris Soner Usakli	3a8dca6fb9	closes #560	2013-11-26 23:55:55 -05:00
Baris Soner Usakli	31635b92f3	closes #561	2013-11-26 23:19:21 -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
Julian Lam	5ad80218a2	upping cerulean minver	2013-11-26 14:45:12 -05:00
Baris Usakli	e90e54cec1	fixed icons in topic move	2013-11-26 14:37:27 -05:00
Baris Usakli	bca1fde69c	updated schema date	2013-11-26 14:33:18 -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	529c8acf6c	app.js: added --install alias for --setup	2013-11-26 14:15:40 -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
Julian Lam	e5c1edd5f5	using ajaxifying class for content and footer instead of jquery fadein/out	2013-11-26 12:25:19 -05:00
Baris Usakli	a5e78aab08	closes #554	2013-11-26 11:59:54 -05:00
Baris Usakli	cec69c2be0	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-11-26 11:43:35 -05:00
Baris Usakli	bc8815cb94	closes #555	2013-11-26 11:43:25 -05:00
Julian Lam	efac6272bb	default link tag (apple-touch-icon) added	2013-11-26 11:34:38 -05:00
Julian Lam	bdb30976b5	adding maxAge headers for statically served files (eep!) - issue #552	2013-11-26 11:17:34 -05:00
Baris Soner Usakli	1d4ae8fe4d	changed the paginator icons to chevron	2013-11-25 21:38:04 -05:00
Julian Lam	abdb4c34ef	tweaks to topic locking	2013-11-25 17:49:17 -05:00
Julian Lam	08d130893c	fixing dropdown support in Settings.prepare	2013-11-25 17:48:55 -05:00