Scott Erickson
|
f9e8bfad9f
|
Made some minor changes.
|
2014-08-13 13:45:24 -07:00 |
|
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 |
|
Scott Erickson
|
b3572dfad9
|
Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal.
|
2014-08-11 15:41:08 -07:00 |
|
Ruben Vereecken
|
1c6da9711b
|
Added the Recently Played collection and endpoint
|
2014-07-21 14:36:10 +02:00 |
|
Scott Erickson
|
51e63ddbc3
|
Fixed some DemoView issues, mainly clicking links from one demo to another.
|
2014-07-17 16:29:26 -07:00 |
|
Ruben Vereecken
|
601c4e2731
|
Merged with master
|
2014-07-05 16:47:16 +02:00 |
|
Ruben Vereecken
|
a933f9737d
|
Creating achievement demo
intermediate
|
2014-07-04 19:27:37 +02:00 |
|
Tery Lim
|
618ade4946
|
Clean up mixed quotes
|
2014-07-01 12:23:22 +08:00 |
|
Scott Erickson
|
4932317982
|
Finally got the demo view working (mostly). Need to turn off third party ajax requests.
|
2014-06-16 11:40:08 -07:00 |
|