codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 19:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2700 commits 27 branches 0 tags 134 MiB
Commit graph

2700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
10bb17c38a Added getThangByID method to Thang. Handled a few error corner cases with the time popup. 2014-04-11 14:03:13 -07:00
Scott Erickson
cc0c588eb9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:49:18 -07:00
Scott Erickson
ce84437345 Updated treema version. 2014-04-11 13:49:02 -07:00
Nick Winter
82b47f6c0f Added i18n for #809. 2014-04-11 13:37:39 -07:00
Nick Winter
b330e783bf Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons 2014-04-11 13:28:11 -07:00
Nick Winter
b2da399e29 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:20:14 -07:00
Nick Winter
5ccdf680db Updated all i18n tags. 2014-04-11 13:19:38 -07:00
Scott Erickson
0e26f317b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 13:18:28 -07:00
Scott Erickson
cce2fe3153 Removed an import that no longer exists. 2014-04-11 13:18:05 -07:00
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Scott Erickson
d4abbd8ab3 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:54 -07:00
Scott Erickson
d11b6a5751 Merge branch 'mediator' of https://github.com/rubenvereecken/codecombat into rubenvereecken-mediator 
Conflicts:
	bower.json
 2014-04-11 12:44:29 -07:00
Alexei Nikitin
6d7a819def RU l10n for windows-script-installer 2014-04-11 23:24:25 +04:00
Nick Winter
ca13324e99 Resolved merge conflicts. 2014-04-11 11:32:51 -07:00
Ruben Vereecken
a07457acac Finished minor refactorings 2014-04-11 20:09:50 +02:00
Ruben Vereecken
ba417630dc Validated Backbone Mediator is now a fully functioning bower component 2014-04-11 20:05:48 +02:00
Scott Erickson
2c67df355c Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:33:22 -07:00
Nick Winter
3751bf903e Merge pull request #806 from 1c7/master 
New features: chinese language version use Youku
 2014-04-11 10:33:10 -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
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
Michael Schmatz
80c2d07b72 Fixed mail auth 
Sorry for committing directly to production branch
 2014-04-10 17:40:27 -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