244 Commits

Author	SHA1	Message	Date
Julian Lam	4f2c7382c5	passing in the column count so a message can be displayed to users when no users have privs in a category, #2887	2015-03-25 17:34:16 -04:00
Julian Lam	9dece4a1db	added some missing files from previous commits, fixed setParent mechanic which broke after I refactored, #2463	2015-03-25 17:21:38 -04:00
Julian Lam	9b84a887d3	a huge frickin' number of changes for #2887. This is part of #2463	2015-03-25 15:43:57 -04:00
Julian Lam	815ea88fa5	readded some missing classes, fixed some styling on category.tpl, fixed image uploading code	2015-03-25 11:58:21 -04:00
Julian Lam	765f15096b	removed wrapping .row around tables in acp/manage/categories	2015-03-25 11:35:38 -04:00
Julian Lam	a1621145d5	Merge branch 'master' into categories_revamp ... Conflicts: public/less/admin/admin.less public/src/admin/manage/categories.js src/controllers/admin.js src/views/admin/manage/categories.tpl src/views/config.json	2015-03-25 11:16:37 -04:00
barisusakli	9754dc8be0	open user link in new tab	2015-03-21 15:32:11 -04:00
barisusakli	f8f4a6e844	removed footer class	2015-03-13 17:59:37 -04:00
Julian Lam	2a80140e70	fixed issue where socket.io would no longer reconnect perpetually, new behaviour waits 10x the reconnect delay, and then starts over. Also upped the reconnection delay default to 1.5s.	2015-03-10 11:52:32 -04:00
Julian Lam	bbbb362125	not referencing parent scope when inside BEGIN in widgets tpl	2015-03-09 16:15:06 -04:00
Julian Lam	e71ef216f2	hiding the right sidebar in ACP dash temporarily	2015-03-09 10:50:03 -04:00
barisusakli	dc94fe2b6c	move admin upload routes to api namespace ... move usrrs/csv to api namespace	2015-03-07 20:19:00 -05:00
barisusakli	c15a289d2a	fix check	2015-03-06 19:05:51 -05:00
psychobunny	80945eff7e	closes #2819	2015-03-03 14:19:18 -05:00
psychobunny	fa607132be	closes #2782	2015-02-27 18:07:29 -05:00
psychobunny	0fadaf037a	filter:homepage.get for populating available routes on ACP	2015-02-27 15:09:09 -05:00
psychobunny	3cc3e2f306	moved homepage configuration to its own acp page	2015-02-26 14:10:41 -05:00
Julian Lam	72e9a6caa8	tweaks to ACP plugins page	2015-02-26 09:26:38 -05:00
psychobunny	59d176fa7b	closes #2779	2015-02-25 18:29:23 -05:00
psychobunny	b1f835b053	Merge remote-tracking branch 'origin/master' into sortable-menu	2015-02-25 17:44:02 -05:00
psychobunny	b788e134d1	added compatibility for deprecated filter:header.build ... remove after 0.7.x	2015-02-25 17:43:31 -05:00
psychobunny	809ed255d1	drag & drop routes	2015-02-25 16:19:14 -05:00
Barış Soner Uşaklı	73505e9bd0	closes #2247	2015-02-25 15:37:33 -05:00
psychobunny	a2e3179ea4	nav - enable / disable	2015-02-25 15:16:51 -05:00
psychobunny	c3701bcea7	loading and saving navigation	2015-02-25 15:01:28 -05:00
psychobunny	fbc0a11c87	nav - basic ACP setup	2015-02-25 14:50:45 -05:00
Julian Lam	912de27c9d	fixed indentation issues	2015-02-24 14:43:19 -05:00
Barış Soner Uşaklı	66d6c49ed4	closes #2749	2015-02-23 15:55:45 -05:00
Barış Soner Uşaklı	89f2520eba	#2560 fix user link pic	2015-02-23 14:07:51 -05:00
psychobunny	cb7c318377	closes #2751	2015-02-20 19:31:33 -05:00
psychobunny	bb35950a5a	rewards acp - ability to set amount of times a user can claim reward	2015-02-20 17:19:39 -05:00
psychobunny	1998f102d6	using tjs to load new lines instead of cloning	2015-02-20 00:26:19 -05:00
psychobunny	e5115c0cf2	differentiate between rid and id	2015-02-19 23:15:37 -05:00
psychobunny	67b693cd3a	pass in expected format of active rewards	2015-02-19 23:02:52 -05:00
psychobunny	cd26f5d06d	passing in values for saving rewards	2015-02-19 22:44:23 -05:00
psychobunny	91c02d4e29	ditching rewardID in favour of verbose id's	2015-02-19 22:19:04 -05:00
psychobunny	2cc6f0c507	fixed disable logic	2015-02-19 21:56:50 -05:00
psychobunny	4acf8cafee	rewards: adding new rows	2015-02-19 21:51:32 -05:00
psychobunny	3ca11c1947	rewards: disable / delete	2015-02-19 18:51:42 -05:00
psychobunny	4145046e02	rewards: got everything loading	2015-02-19 18:46:36 -05:00
psychobunny	b1c37775c5	more styling	2015-02-19 18:22:21 -05:00
psychobunny	9291ec64f9	styling	2015-02-19 17:47:47 -05:00
psychobunny	4f53bd59be	rewards - got custom inputs loading	2015-02-19 17:24:58 -05:00
psychobunny	94c1c2d547	fixed loading mock data	2015-02-19 16:57:32 -05:00
psychobunny	2bebac964e	loading mock data	2015-02-19 16:09:58 -05:00
Barış Soner Uşaklı	743cd20441	closes #2267	2015-02-19 15:56:12 -05:00
Julian Lam	4ba6d44858	Merge pull request #2739 from yariplus/mobifix ... Fix #2684 ACP navbar on mobile.	2015-02-19 15:53:38 -05:00
psychobunny	0e7c3be9d3	made some progress with mock api + acp	2015-02-19 15:04:13 -05:00
psychobunny	bdcf090aaa	init rewards system	2015-02-19 14:20:13 -05:00
Barış Soner Uşaklı	da305210e2	closes #2618	2015-02-19 13:24:06 -05:00