Commit graph

56 commits

Author SHA1 Message Date
Nick Winter
77cca7189f Updated a bunch of code that got busted with CoffeeScript 1.9.0. 2015-01-30 07:51:57 -08:00
Nick Winter
f66afa1dc0 Trying latest sass-brunch (which happened to alphabetize our devDependencies.) Fixed bug with required/restricted items not showing up properly. Added quick links to open level editors from campaign editor. 2015-01-02 12:40:17 -08:00
Nick Winter
194d3ee647 Worked around unstable Zoho mail dependencies by switching password recovery and contact emails to Sendwithus. 2014-12-11 20:15:24 -08:00
Nick Winter
967e8ac7a4 Use Aether 0.3 on the server, too. 2014-12-01 21:08:15 -08:00
Scott Erickson
95dca575d1 Set up stripe on the server and site to allow purchases through the website. 2014-11-17 15:15:08 -08:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Matt Lott
ce14f92979 Pass problem context to Aether
So Aether can craft better error messages.
Bumping Aether to v0.2.39
2014-10-14 14:02:34 -07:00
Matt Lott
6ee898eaec Bump sass-brunch to 1.7.2, add bless-brunch
Allows css file splitting to support IE9.  Later versions (up to 1.8.4)
of sass-brunch yield intermittent build hangs.
2014-10-02 17:03:53 -07:00
Nick Winter
6e1d048bfd Can't brunch, even in production, with the new sass-brunch. 2014-09-30 19:57:36 -07:00
Matt Lott
c50b443eca IE9 compat: css fixes
Linking to bless-brunch git for fixes that blocked bless from splitting
app.css into multiple files to address IE9 limits.

sass-brunch version update fixes problems during the css file-splitting
that were messing up nested @media queries.
2014-09-25 16:17:35 -07:00
Matt Lott
3209e4f838 Add loop statement to JavaScript and Python 2014-09-18 09:47:29 -07:00
Nick Winter
648e05ee34 Fixed #1124 in Aether 0.2.28. 2014-08-13 16:39:16 -07:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Michael Schmatz
ccb2ad67ac Merge pull request #1342 from codecombat/feature/mail-system
Feature/mail system
2014-07-17 07:18:39 -07:00
Michael Schmatz
3ef5d88e2a Updated sendwithus to fix memory leak 2014-07-16 12:12:25 -07:00
Michael Schmatz
787920edc6 Update bower to fix tmp module issue 2014-07-14 11:10:14 -07:00
Nick Winter
318b72d965 Fixed #1273 with new Aeher version with new Filbert version. 2014-07-07 20:01:05 -07:00
Scott Erickson
ac488eb196 A stab at fixing TravisCI, which choked on npm installing karma 0.10. 2014-06-07 18:27:04 -07:00
Scott Erickson
01c20f4065 Fixed karma tests. 2014-06-07 18:15:57 -07:00
Nick Winter
3dd362c01e Added support for blaming infinite loops. 2014-05-25 12:15:32 -07:00
Nick Winter
26d2816071 Fixed some more memory leaks. 2014-05-22 19:05:11 -07:00
Dominik Maier
a3389de2d1 + deferred actually deferres 2014-05-18 23:23:11 +02:00
Michael Schmatz
035cb7d3f7 Fix simulator jquery when dependency 2014-05-18 12:56:32 -07:00
Nick Winter
cc7808251f Zoom/scroll, ModelModal, and coordinate grabber fixes. 2014-05-14 15:29:55 -07:00
Nick Winter
8df3b01f9e Merged world/lodash/aether breakup for world workers. 2014-05-10 18:52:55 -07:00
Nick Winter
3819778bee Updating everything to Aether 0.2.0. 2014-05-08 11:43:00 -07:00
Dominik Maier
ad85bf5b77 Merge remote-tracking branch 'upstream/master' 2014-05-06 03:12:24 +02:00
Dominik Maier
c9bb488794 Created headless-client and an alternative implementation of god 2014-05-06 02:37:14 +02:00
Aditya Raisinghani
0cd5d0f4af Added jasmine spec reporter and tests for anonymous name collisions. 2014-04-28 15:16:43 +05:30
Nick Winter
eec1888b22 gzipping when in production but not going through Cloudflare. 2014-04-17 10:12:23 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
Conflicts:
	app/initialize.coffee
	bower.json
2014-04-11 10:32:19 -07:00
Scott Erickson
c382889748 Bunch of server changes, mainly adding all the JSON schema validation and fixing tests. 2014-04-08 14:10:50 -07:00
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Nick Winter
8930d79e61 Back to 1.7.0 for sass-brunch. 2014-02-25 12:31:49 -08:00
Nick Winter
a440c4dff0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-25 10:48:33 -08:00
Nick Winter
0380a30522 Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. 2014-02-25 10:48:23 -08:00
Michael Schmatz
f538ff542f Removed hiredis 2014-02-25 09:12:37 -08:00
Scott Erickson
e63763d539 Made the server resistant to req.user being undefined sometimes. 2014-02-24 20:27:38 -08:00
Michael Schmatz
75d8888c92 Refactored scoring 2014-02-17 14:39:21 -08:00
Michael Schmatz
60e0d59a66 Manually specified tv4 version to fix npm checksum error 2014-02-12 15:55:20 -08:00
Michael Schmatz
1a2fa68473 Merge branch 'feature/task-queue'
Conflicts:
	app/views/play/level/tome/spell.coffee
2014-02-11 15:58:38 -08:00
Scott Erickson
1b0c3fb236 Upgraded to CoffeeScript 1.7 2014-02-11 14:23:36 -08:00
Michael Schmatz
b9569a310a Implemented task logging and new score calculations 2014-02-08 10:11:43 -08:00
Michael Schmatz
9401a4370e Merge branch 'feature/task-queue' into feature/level-runner-interface
Conflicts:
	server.coffee
	server/db.coffee
2014-02-04 10:26:16 -08:00
Michael Schmatz
1f7fae4971 Updated mongoose to 3.8 2014-02-03 09:44:33 -08:00
Michael Schmatz
1c2eeff399 Unifying SQS with mubsub interface 2014-01-23 10:52:43 -08:00
Michael Schmatz
a62427fe34 Added aws-sdk and created queue file 2014-01-22 17:48:11 -08:00
Scott Erickson
3dd143b4e3 Added some missing version numbers. 2014-01-20 19:41:03 -08:00
Scott Erickson
6e47a6b8fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus.
Created a 'notification' email subscription.
2014-01-17 09:53:17 -08:00