Ruben Vereecken 3fd396974d Merge branch 'master' into achievements ... Conflicts: app/views/DemoView.coffee app/views/docs/ComponentDocumentationView.coffee app/views/editor/level/LevelEditView.coffee server/users/User.coffee		2014-08-13 10:43:42 +02:00
..
achievements	Added achievement deleting and automatic achievement filling	2014-08-08 17:20:07 +02:00
articles	All edits are now tracked	2014-07-04 19:27:38 +02:00
commons	Merge branch 'master' into achievements	2014-08-13 10:43:42 +02:00
levels	Merge remote-tracking branch 'upstream/master' into achievements_progress	2014-08-05 11:55:46 +02:00
mail/sent	Hard code mail tasks and add unsubscribe	2014-07-16 16:37:06 -07:00
patches	Worked in a lot of changes Scott proposed	2014-08-08 11:54:53 +02:00
plugins	User page now uses the supermodel for user loading	2014-08-08 19:26:24 +02:00
queues	Fixed #1372. Minor fixes.	2014-07-23 08:59:42 -07:00
routes	Added achievement deleting and automatic achievement filling	2014-08-08 17:20:07 +02:00
users	Merge branch 'master' into achievements	2014-08-13 10:43:42 +02:00
delighted.coffee	Adding some options to the game menu options tab.	2014-08-10 15:56:45 -07:00
sendwithus.coffee	Exposing Vector z property. Getting ready to use new builtin property documentation.	2014-06-27 00:36:18 -07:00