2690 Commits

Author	SHA1	Message	Date
psychobunny	40008a9e85	Merge remote-tracking branch 'origin/master' into sortable-menu	2015-02-25 13:56:57 -05:00
psychobunny	6cea047518	loading navigation, complete	2015-02-25 13:55:26 -05:00
psychobunny	ecad9d54ed	tjs 0.1.19 for undefined key cleanups	2015-02-25 13:08:55 -05:00
psychobunny	6dacaf6bb5	helpers.displayMenuItem	2015-02-25 12:48:26 -05:00
Julian Lam	29873f1c5c	removed unused .getAll method, and sorting notifications client-side so that unread notifs don't all appear at the top, #2772	2015-02-25 12:26:55 -05:00
Julian Lam	ade12116a1	closed #2766	2015-02-25 10:51:35 -05:00
Julian Lam	948cd22e9c	triggering full-screen composer on short viewports as well as narrow, #2763	2015-02-25 09:49:08 -05:00
barisusakli	9084ee2d7e	cleanup popular.js	2015-02-24 22:24:22 -05:00
Julian Lam	89bf036262	fixing crash when utils.slugify is called with a null value	2015-02-24 21:11:25 -05:00
psychobunny	7fe8180cf4	Merge remote-tracking branch 'origin/master' into grunt-dev	2015-02-24 16:41:07 -05:00
barisusakli	acc3c6a0a5	closes #2762	2015-02-24 15:05:55 -05:00
psychobunny	01c15b8884	Merge remote-tracking branch 'origin/master' into grunt-dev	2015-02-24 12:23:52 -05:00
psychobunny	ab2315f3de	#2751	2015-02-24 11:45:58 -05:00
Julian Lam	3e3fff9fe8	hooking up accept/reject invite, #2758	2015-02-23 16:46:48 -05:00
Julian Lam	03e39f7b9b	isInvited mechanic for #2758	2015-02-23 16:31:23 -05:00
Barış Soner Uşaklı	66d6c49ed4	closes #2749	2015-02-23 15:55:45 -05:00
psychobunny	ee377b160e	#2751 fixes syntax error on acp/ajaxify	2015-02-23 14:55:59 -05:00
Barış Soner Uşaklı	1d5e15eab4	closes #2560	2015-02-23 13:39:29 -05:00
Barış Soner Uşaklı	53db052cca	timeago widgets	2015-02-23 12:55:44 -05:00
psychobunny	cb7c318377	closes #2751	2015-02-20 19:31:33 -05:00
psychobunny	f5eaa08340	fixed complications with deleted id's	2015-02-20 19:29:57 -05:00
psychobunny	def57d2926	don't rely on client side to increment id (duh)	2015-02-20 17:37:34 -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	fbbd405b00	even:alert socket call -> app.alert	2015-02-20 15:07:43 -05:00
psychobunny	332110b8e2	bugfix	2015-02-20 12:16:04 -05:00
psychobunny	5fcbffe652	fixed delegate syntax	2015-02-20 00:29:15 -05:00
psychobunny	1998f102d6	using tjs to load new lines instead of cloning	2015-02-20 00:26:19 -05:00
psychobunny	09086f7d30	deleting rewards	2015-02-19 23:49:36 -05:00
psychobunny	c844400ab9	cleanup and fix for adding new rewards	2015-02-19 23:40:23 -05:00
psychobunny	5f54de3b37	successfully got loading and saving of rewards working	2015-02-19 23:39:39 -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	029ae11ed5	rewards - cleanup	2015-02-19 19:10:01 -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	9291ec64f9	styling	2015-02-19 17:47:47 -05:00
Julian Lam	82543bdeee	fixed #2744	2015-02-19 17:31:05 -05:00
psychobunny	d9bd7a400d	minor styling	2015-02-19 17:29:44 -05:00
psychobunny	4f53bd59be	rewards - got custom inputs loading	2015-02-19 17:24:58 -05:00
Julian Lam	58094d2b3b	removed console logs, and requiring markdown 1.0.0 plugin	2015-02-19 17:07:01 -05:00
psychobunny	94c1c2d547	fixed loading mock data	2015-02-19 16:57:32 -05:00
Julian Lam	ceb18fe73d	added new hook and method for plugins to introduce their own formatting options, #2743	2015-02-19 16:51:15 -05:00
Barış Soner Uşaklı	c3a51033a8	removed utils.getQueryParams() use utils.params()	2015-02-19 16:11:23 -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	350acde379	ability to mark a notification read/unread from dropdown list, made styling less bootstrap-locked, using FA icon in theme instead of hardcoded in template	2015-02-19 12:06:15 -05:00