25747 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tyler Renelle	a930d536f6	[#1465] add in some more missing member modal info.. still feel like i'm missing something..	2013-09-07 12:55:15 -04:00
Tyler Renelle	91d1cdf361	[#1465] add member modals back in. Not all info is present, just a bit more ... work. Can now click guild & tavern members! does lazy-loading of members so we don't have to load all their information at once	2013-09-07 12:45:39 -04:00
Matteo Pagliazzi	dfa8dcba57	fix	2013-09-07 18:10:24 +02:00
Tyler Renelle	28e2cb32f2	update procfile for heroku. @paglias this is the heroku script-runner btw	2013-09-07 10:54:03 -04:00
Tyler Renelle	796f29e014	Merge pull request #1462 from lefnire/paglias/grunt2 ... Grunt v2	2013-09-07 07:51:39 -07:00
Matteo Pagliazzi	d30d20d987	add margin to chat-btn	2013-09-07 15:16:49 +02:00
Matteo Pagliazzi	4f9cf94574	fix #1438	2013-09-07 13:56:33 +02:00
Matteo Pagliazzi	40d6df1776	grunt v2	2013-09-07 12:47:44 +02:00
Matteo Pagliazzi	4e10fc65cf	remove old comment	2013-09-07 10:37:47 +02:00
Tyler Renelle	f1dc9e7f90	disable calendar for now	2013-09-06 22:59:36 -04:00
Tyler Renelle	6b960fba6a	edit procfile (heroku Foreman) to run grunt start:production	2013-09-06 22:51:47 -04:00
Tyler Renelle	e23acc4c0a	Merge branch 'paglias/grunt' into develop	2013-09-06 22:23:02 -04:00
Tyler Renelle	de0cdda833	remove extra "npc" from chat message	2013-09-06 21:18:41 -04:00
Tyler Renelle	5113ed192a	add GET /groups/:gid, champ/elite/master tiers, chat sync button	2013-09-06 21:03:44 -04:00
Matteo Pagliazzi	b0bf1d4c58	finish	2013-09-06 22:33:00 +02:00
Matteo Pagliazzi	9046bd5041	css	2013-09-06 21:39:18 +02:00
Tyler Renelle	479cd16835	[#1448] add resting flag to users	2013-09-06 15:10:47 -04:00
Tyler Renelle	e10735d38e	[#1448] add resting flag to users	2013-09-06 15:07:08 -04:00
Matteo Pagliazzi	07ddd39856	fix for static pages	2013-09-06 19:50:14 +02:00
Matteo Pagliazzi	7cd075d787	initial grunt support, gzip enabled	2013-09-06 19:19:43 +02:00
Tyler Renelle	997b2b8ae4	Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite	2013-09-06 09:55:36 -04:00
Tyler Renelle	e6d61d1145	[#1446] add change-password back in	2013-09-06 09:55:24 -04:00
Tyler Renelle	c12de954a4	[#1446] add password-reset (still need change password for this to be useful)	2013-09-06 09:33:23 -04:00
Matteo Pagliazzi	b477b0768a	add space between user, message and data in tavern	2013-09-06 09:58:18 +02:00
Tyler Renelle	883d63aaaf	[#1426] final touches to bailey notifs.	2013-09-06 01:05:23 -04:00
Tyler Renelle	4ea6a8e57f	[#1439] target='_blank' on links	2013-09-06 00:39:29 -04:00
Tyler Renelle	56d44887d4	[#1439] add highlight back in for chat. use ngSanitize linky to add links in chat	2013-09-06 00:36:05 -04:00
Tyler Renelle	ef69309b0c	[#1431] add temporary server-based pet-purchasing mechanism. Lotsa cleanup / ... refactoring to be had here	2013-09-06 00:28:18 -04:00
Tyler Renelle	812ba3a339	[#1430] fix guild gems (math error)	2013-09-05 23:28:30 -04:00
Tyler Renelle	9da6ddc7c7	Merge pull request #1431 from lefnire/paglias/market ... Market (not working)	2013-09-05 20:18:57 -07:00
Tyler Renelle	1359de0a90	[#1398] add facebook registration	2013-09-05 23:14:25 -04:00
Tyler Renelle	ab756a8634	#1422 force ssl	2013-09-05 22:53:35 -04:00
Tyler Renelle	86552c9296	Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite	2013-09-05 22:33:41 -04:00
Tyler Renelle	336c147dcb	#1398 some more hackery to handling facebook auth. I really don't like ... this client-side return approach, but it's probably the only thing we can do sans a stateful server, which we're trying to avoi	2013-09-05 22:33:31 -04:00
Tyler Renelle	d1aec6636d	Merge pull request #1435 from Shaners/patch-1 ... Update game-pane.styl	2013-09-05 09:19:44 -07:00
Shane Lister	66182d9cdc	Update game-pane.styl ... This had been bugging me... Adds a 5px space between chat labels and chat text. Untested so probably should double check it first.	2013-09-05 09:17:41 -07:00
Matteo Pagliazzi	9c6d4deb85	minor fix	2013-09-05 16:07:19 +02:00
Matteo Pagliazzi	bb4c0d2d69	non working market	2013-09-05 15:35:34 +02:00
Matteo Pagliazzi	f7d1159e06	fix inventory bugs	2013-09-05 14:26:35 +02:00
Tyler Renelle	512e891dc3	add cerberus to pets	2013-09-04 23:03:20 -04:00
Tyler Renelle	9a99cd430d	rewrite: save task.tags	2013-09-04 17:54:07 -04:00
Tyler Renelle	2f3da075f8	revive button name conflict! We gotta do somethign about shared/helpers ... exposed to the view	2013-09-04 15:50:26 -04:00
Tyler Renelle	1e9ef6d2e2	re-build. was getting revive errors for some reason	2013-09-04 15:49:39 -04:00
Tyler Renelle	7c6174e218	Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite	2013-09-04 13:23:58 -04:00
Tyler Renelle	30da33d2f0	Merge pull request #1424 from lefnire/paglias/inventory ... Inventory (no market)	2013-09-04 10:23:36 -07:00
Tyler Renelle	2d53844984	add note about populate + match in chatc	2013-09-04 13:22:22 -04:00
Tyler Renelle	6b338da1f9	Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite	2013-09-04 13:14:05 -04:00
Tyler Renelle	41255dcc20	groups: return group members on chat	2013-09-04 13:13:43 -04:00
Tyler Renelle	d7c6c15592	some more bailey updates	2013-09-04 13:13:23 -04:00
Matteo Pagliazzi	6b4d3db6bb	delete old pets.html	2013-09-04 19:09:48 +02:00