Commit graph

2458 commits

Author SHA1 Message Date
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
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Nick Winter
26266963f4 Updated to jQuery 2.1. 2014-04-11 10:12:39 -07:00
Ruben Vereecken
f94dfeae6d Reached a steady state without bower component backbone mediator 2014-04-11 15:00:16 +02:00
Ruben Vereecken
fc8684967d Added initialization of the schema files 2014-04-11 14:37:08 +02:00
Ruben Vereecken
c2c0496883 Added schema stubs for about everything 2014-04-11 14:22:49 +02:00
Jasper D'haene
f2332b0694 Completed + reviewed latest Dutch locale changes 2014-04-11 09:11:12 +02:00
Jasper D'haene
23cb736d71 resolved merge conflicts 2014-04-11 08:05:11 +02:00
Glen De Cauwsemaecker
4776741ea7 Merge https://github.com/codecombat/codecombat 2014-04-11 04:26:47 +02:00
Glen De Cauwsemaecker
f3fbbaf0f8 Version 3.3 of windows installer, ready for release 2014-04-11 04:26:07 +02:00
Glen De Cauwsemaecker
d28f1f46b9 fixed issue related to git configuration in the automatic way 2014-04-11 04:25:34 +02:00
Glen De Cauwsemaecker
71bb8ee77f Deleting lock file to clean up the mess 2014-04-11 04:22:30 +02:00
Glen De Cauwsemaecker
dcbe11d252 New version number for windows 2014-04-11 03:39:25 +02:00
Glen De Cauwsemaecker
c27c18c764 Merge https://github.com/codecombat/codecombat 2014-04-11 03:38:37 +02:00
Glen De Cauwsemaecker
f200576d5a Fixed error related to nodemon 2014-04-11 03:38:03 +02:00
Nick Winter
a68f3efb99 Added specific job profile photo support. Improved right column design a bit. 2014-04-10 17:54:28 -07:00
Michael Schmatz
b182afd413 Fixed cron ladder auth 2014-04-10 17:50:39 -07:00
Glen De Cauwsemaecker
4fb9fb628d Applied version number for windows installer 3.1 2014-04-11 02:33:48 +02:00
Glen De Cauwsemaecker
9705f5f0a5 Applied fix for downloading files via curl 2014-04-11 02:33:13 +02:00
Michael Schmatz
8f47717bd4 Updated MongoDB download links 2014-04-10 17:30:42 -07:00
Glen De Cauwsemaecker
0d2323fce6 Merge https://github.com/codecombat/codecombat 2014-04-11 00:43:15 +02:00
Glen De Cauwsemaecker
2648c7f9aa Set the new version for the windows setup (3.0) 2014-04-11 00:43:05 +02:00
Glen De Cauwsemaecker
a5319b1d81 Generated an exe file for the configuration.batch redirection script 2014-04-11 00:35:45 +02:00
Glen De Cauwsemaecker
8296709555 Writing and reading to cache (variables) implemented 2014-04-11 00:31:05 +02:00
Glen De Cauwsemaecker
5ff4a33798 Seperated intro-github from npm/brunch and removed zh local option 2014-04-11 00:00:23 +02:00
Nick Winter
7a35a6248f Adding contact form for employers to contact candidates. 2014-04-10 14:59:32 -07:00
Michael Schmatz
e17fbdae73 Fixed common programmables not being saved 2014-04-10 14:08:20 -07:00
Scott Erickson
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128 Added some autocompleters for job profile Treema. Projects are now entirely links. 2014-04-10 11:58:51 -07:00
Michael Schmatz
a796d88967 Fixed tutorial modal for nonexistent tutorials 2014-04-10 11:42:22 -07:00
Scott Erickson
3c832d3707 Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks. 2014-04-10 11:13:33 -07:00
Michael Schmatz
42bf2996af Made Aether ignore variable hoisting
See #813
2014-04-10 10:36:32 -07:00
Scott Erickson
5629284c76 Added text diff library to delta view. 2014-04-10 10:24:14 -07:00
Scott Erickson
66d455285e Integrated the delta view into the save view for levels. 2014-04-09 19:07:44 -07:00
Nick Winter
26cebf7e7e Fixing some recruitment profile bugs. 2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
Scott Erickson
b15380047c Tweak to view. 2014-04-09 16:09:53 -07:00
Scott Erickson
f2d21b960f Added a delta subview for displaying deltas of schema'd data. 2014-04-09 16:09:35 -07:00
Nick Winter
f17775cc10 Implemented George's jobs page design. 2014-04-09 13:14:52 -07:00
Aditya Raisinghani
b3804e7445 Minor corrections in format 2014-04-10 01:07:48 +05:30
Aditya Raisinghani
495d1be620 Added social buttons to Sign up modal 2014-04-10 01:01:30 +05:30
Nick Winter
76054345d7 Fixed #805. 2014-04-09 09:04:59 -07:00
Glen De Cauwsemaecker
36ac30e59a Merge pull request #808 from DjBRINE/patch-1
ru.coffee
2014-04-09 13:49:06 +02:00
DjBRINE
7f4c251f43 Update ru.coffee 2014-04-09 03:57:40 -07:00
Glen De Cauwsemaecker
c3c3f2ea1e Merge pull request #807 from ilisyus/patch-2
Update tr.coffee
2014-04-09 11:38:20 +02:00
Alper ALIN
a2ebcc6433 Update tr.coffee
a few changes
2014-04-09 12:31:25 +03:00
1c7
56c18441e4 use youku for Chinese Version 2014-04-09 13:50:13 +08:00
Scott Erickson
721648dadf Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	bower.json
2014-04-08 19:29:43 -07:00
Scott Erickson
315ef7f7b8 Added jsondiffpatch to the client. Bower update everyone! 2014-04-08 19:26:34 -07:00
Scott Erickson
2f988ba485 Made the server side of the patch system. 2014-04-08 19:26:19 -07:00