Commit graph

12485 commits

Author SHA1 Message Date
Scott Erickson
79032b1c35 Couple remaining fixes. 2014-01-24 12:54:15 -08:00
Scott Erickson
4450747671 Finished setting up the mailchimp webhook. 2014-01-24 12:53:41 -08:00
Scott Erickson
df0d2e54ee Merge branch 'master' into production 2014-01-24 12:39:18 -08:00
Scott Erickson
a71b688a15 Fixed the mailchimp webhook. 2014-01-24 12:39:05 -08:00
Scott Erickson
fb59521748 Merge branch 'master' into production 2014-01-24 12:25:43 -08:00
Scott Erickson
95186cc5ae Much improved the mailchimp webhook. 2014-01-24 12:23:14 -08:00
Scott Erickson
b2366c50af Came up with a better hacky logging system. 2014-01-24 11:55:44 -08:00
Scott Erickson
c59b9d904b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-24 11:48:55 -08:00
Scott Erickson
62770c35df Added a test webhook for MailChimp. 2014-01-24 11:48:00 -08:00
Scott Erickson
004e7cc79e Refactored some mail functions and constants to a new common module. 2014-01-24 11:47:14 -08:00
Michael Schmatz
750a2f6d0d Rewriting mongo queue 2014-01-24 11:20:44 -08:00
Nick Winter
9b9df12ea0 Huge Aether performance fix; spells now scroll while debugging. 2014-01-24 08:01:00 -08:00
DanielRodriguezRivero
2acd67f658 Update es-ES.coffee 2014-01-24 13:15:17 +01:00
Scott Erickson
0727e11669 Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3
Conflicts:
	app/templates/play/level/playback.jade
2014-01-23 20:15:36 -08:00
Scott Erickson
9740fe0700 Reworked how sprites flip when rotated. 2014-01-23 20:08:35 -08:00
Scott Erickson
ac72aa9305 Merge branch 'feature/server-refactor' 2014-01-23 18:57:47 -08:00
Paul Buser
e958c1293d Fixing my actual regexp checker 2014-01-23 21:57:12 -05:00
Paul Buser
30d8eb8256 Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-23 21:56:23 -05:00
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
Scott Erickson
dceb48ab04 Merge branch 'packagebyfeature' of https://github.com/smoratinos/codecombat into feature/server-refactor 2014-01-23 18:30:49 -08:00
Scott Erickson
70d301d1b6 How did this bug not break everything always? 2014-01-23 18:14:25 -08:00
Sébastien Moratinos
bbfc0eff69 server db route (handlers and schemas)
- use associative arrays to store path/filename
- add more test for schemas
2014-01-23 23:06:12 +01:00
Michael Schmatz
7c6974955a Ditching mubsub, moving to a slower yet more extensible method of local queueing 2014-01-23 12:37:18 -08:00
Michael Schmatz
1c2eeff399 Unifying SQS with mubsub interface 2014-01-23 10:52:43 -08:00
Scott Erickson
e66dbf6273 Merge branch 'master' into production 2014-01-23 09:34:29 -08:00
Scott Erickson
72360be965 MailChimp tweak. 2014-01-23 09:28:21 -08:00
Michael Schmatz
671f6d6ffd Refactored and simplified 2014-01-22 23:48:47 -08:00
Michael Schmatz
d9b2a36875 More refactoring, added message loop example 2014-01-22 23:41:26 -08:00
Michael Schmatz
ccd94f0f1f Refactored and added more functionality to remote queue class 2014-01-22 23:13:14 -08:00
Michael Schmatz
9157bd150d Starting to receive messages from SQS! 2014-01-22 21:41:29 -08:00
Scott Erickson
0fb5b1c2ea Merge branch 'master' into production 2014-01-22 20:49:18 -08:00
Scott Erickson
0a34bfc7a8 Fixed a couple things with the component versions view. 2014-01-22 18:54:20 -08:00
Michael Schmatz
3df58843c6 Updated environment variable names 2014-01-22 18:41:14 -08:00
Michael Schmatz
2373d97137 Put in configuration, aws-sdk, subclassing Queue 2014-01-22 18:29:02 -08:00
Michael Schmatz
a62427fe34 Added aws-sdk and created queue file 2014-01-22 17:48:11 -08:00
Scott Erickson
dcaa24ffa9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 17:38:31 -08:00
Scott Erickson
4ff2abc4b0 Refactored a collection into its own file. 2014-01-22 17:38:22 -08:00
Sébastien Moratinos
e7ca7c4c1a remove unused modules 2014-01-23 01:01:45 +01:00
Sébastien Moratinos
729cd300b7 server reorganize files and folder by features
- move and rename files
- use associative arrays which store handlers for 'dynamically'
  load module from de db route
- store models_path in test/server/common,
  a global model variable has the same name that the filename of the model
2014-01-23 01:01:40 +01:00
Sébastien Moratinos
771099d43e server : move routes files (HTTP endpoint) in a new "routes" folder 2014-01-23 01:01:30 +01:00
Nick Winter
8733b1e0b0 Merge branch 'master' into production 2014-01-22 10:57:11 -08:00
Nick Winter
af6abda7cd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-22 10:56:54 -08:00
Nick Winter
3b7a908dcd Handled a couple errors. 2014-01-22 10:56:49 -08:00
Michael Schmatz
c21f304954 Merge pull request #269 from codecombat/master
Merged progress into production
2014-01-21 19:17:36 -08:00
Paul Buser
2b7d18bbfa Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-21 21:32:17 -05:00
Scott Erickson
00a7de12c9 Fixed a selection bug. 2014-01-21 10:54:59 -08:00
Scott Erickson
01a43bb3d7 Added filters to the extant thangs column. 2014-01-21 10:42:09 -08:00
GlenDC
c771936f45 Merge branch 'master' of https://github.com/ReiDuKuduro/codecombat 2014-01-21 18:07:02 +01:00
GlenDC
b2ddde96cd Merge https://github.com/codecombat/codecombat 2014-01-21 18:05:14 +01:00
Nick Winter
24c4051442 Merge branch 'feature/time-travel-debugger' 2014-01-21 09:04:09 -08:00