25741 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philip How	55faeda4e0	Notification changes to .coffees	2013-02-27 23:26:53 -05:00
Philip How	76fd1336da	Notification style sheets	2013-02-27 23:26:51 -05:00
Tyler Renelle	76d84a392e	Merge remote-tracking branch 'ruddfawcett/master' into develop	2013-02-27 22:36:13 -05:00
Tyler Renelle	bc46b9159a	add change password	2013-02-27 22:23:08 -05:00
Rudd Fawcett	48fdcc9edb	icons	2013-02-27 22:21:16 -05:00
Rudd Fawcett	f13e46fb9c	Icons v2	2013-02-27 22:19:10 -05:00
Tyler Renelle	f787df9c19	change default icons for ipods / iphons	2013-02-27 20:53:55 -05:00
Tyler Renelle	e7ddfb8892	move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule)	2013-02-27 20:24:57 -05:00
Tyler Renelle	376d2d88de	Merge branch 'master' into develop	2013-02-27 20:18:17 -05:00
Tyler Renelle	f2cfe2436e	Merge branch 'develop'	2013-02-27 18:11:09 -05:00
Tyler Renelle	a06574e73f	Merge pull request #535 from MrConcept/notifications ... Notifications	2013-02-27 14:52:21 -08:00
Philip How	3982b754d0	Notification changes to .coffees	2013-02-27 22:46:21 +00:00
Philip How	c68b337403	Notification style sheets	2013-02-27 22:41:36 +00:00
Tyler Renelle	18c0d4e6aa	pin coffeescript	2013-02-27 17:11:10 -05:00
Tyler Renelle	9c6e061e8d	return all objects on user API call	2013-02-27 17:10:20 -05:00
Tyler Renelle	4b2b0281ee	add nconf to test	2013-02-27 17:06:47 -05:00
Tyler Renelle	ab52c59ee4	pin coffeescript	2013-02-27 17:06:39 -05:00
Daniel Saewitz	8ba137d3ce	Remove config and scoring	2013-02-27 16:58:57 -05:00
Tyler Renelle	c9a7330002	unlock parties for users who get invited, regardless of level	2013-02-27 16:40:17 -05:00
Tyler Renelle	9a0ac02102	fixes to party bugs	2013-02-27 16:21:06 -05:00
Tyler Renelle	811d6de107	fix to previous - don't do it dynamically, do it on save	2013-02-27 09:15:06 -05:00
Tyler Renelle	01182b377d	add a self-serve restore modal for users who want to restore their stats	2013-02-27 09:07:51 -05:00
Daniel Saewitz	0aedef12e2	More cleanup	2013-02-26 19:30:08 -05:00
Daniel Saewitz	624d3360db	Cleanup pull request diff	2013-02-26 19:27:57 -05:00
Daniel Saewitz	822f779812	Merge and fix tests	2013-02-26 19:17:11 -05:00
Tyler Renelle	203e0a124a	proper stripe ajax formatting	2013-02-26 17:41:51 -05:00
Tyler Renelle	7c0abe4a47	remove "testing party bug"	2013-02-26 16:54:31 -05:00
Tyler Renelle	9b20d8ceba	move scoring to its own class (attempt to remove model from hanging ... around in closure on server, which is what's causing our memory leak - see http://goo.gl/7Gt0M)	2013-02-26 16:51:00 -05:00
Daniel Saewitz	c38f215db5	Add type parameter to /user/tasks	2013-02-26 16:44:26 -05:00
Tyler Renelle	63392d644f	use derby-auth new findOne() motif spec (aka, no more ... res.at(0).get()). Also, try tripple subscription on parties instead of multiple individual subs	2013-02-26 16:37:47 -05:00
Daniel Saewitz	bc5abba179	Add task/:id PUT	2013-02-26 15:21:17 -05:00
Tyler Renelle	0a3fc9f715	instructions on running node-webkit-agent for debugging memory leaks	2013-02-26 12:42:53 -05:00
Tyler Renelle	7c480124cf	show infinite stack trace in development	2013-02-26 12:10:23 -05:00
Daniel Saewitz	07648cd60b	all tests passing - woo	2013-02-26 03:48:10 -05:00
Daniel Saewitz	52c5444453	Remove second store	2013-02-26 02:56:47 -05:00
Daniel Saewitz	17a5040b3b	Server runs inline with tests	2013-02-26 02:55:33 -05:00
Daniel Saewitz	f9f57a6b91	Cleanup and more checks	2013-02-26 02:36:51 -05:00
Tyler Renelle	06da720dfb	return next(err) for errors in subscription callbacks. Also, try ... reloading the page when userObj? is null (bustedSession victims. See the comments)	2013-02-25 18:59:14 -05:00
Tyler Renelle	89e5ec2d10	Merge branch 'develop' of github.com:lefnire/habitrpg into develop	2013-02-25 18:36:07 -05:00
Tyler Renelle	24dbae3a41	update config.json.exampl for default mongo db	2013-02-25 18:34:11 -05:00
Tyler Renelle	c58df43c84	Merge branch 'develop'	2013-02-25 15:30:43 -05:00
Daniel Saewitz	e4f4227072	Cleanup	2013-02-25 14:32:46 -05:00
Daniel Saewitz	7ce7677816	Cleanup	2013-02-25 02:44:57 -05:00
Daniel Saewitz	1be9fb97fe	Use headers instead of auth	2013-02-25 02:43:50 -05:00
Daniel Saewitz	bfd30cd4b7	wip	2013-02-25 00:24:11 -05:00
Daniel Saewitz	faa94b3692	Almost perfect	2013-02-24 23:00:22 -05:00
Tobias Leugger	f154a3ba66	Fixing all casper tests except registration and rest	2013-02-23 19:06:48 +01:00
Daniel Saewitz	bddd0bd148	wip	2013-02-23 04:45:00 -05:00
Daniel Saewitz	177c7e4f17	Working again	2013-02-23 03:20:16 -05:00
Daniel Saewitz	02569c2dfa	Fix errors	2013-02-22 22:30:28 -05:00