Scott Erickson
ebc4985d30
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-02 16:58:57 -08:00
Scott Erickson
09bb669439
Fixed #300
2014-02-02 16:51:22 -08:00
Michael Schmatz
06667436e1
Merge pull request #323 from smoratinos/master
...
server auth reset password fix + test
2014-02-02 16:41:10 -08:00
Scott Erickson
d09de8b746
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-02 16:31:26 -08:00
Scott Erickson
4b3bfbb7e2
Fixed #317
2014-02-02 16:31:06 -08:00
GlenDC
08993aec59
Merge https://www.github.com/codecombat/codecombat
2014-02-03 01:02:13 +01:00
GlenDC
8ee70e530c
Added to do list for the upcomming days
2014-02-03 01:01:42 +01:00
GlenDC
e6672972b3
All software installation is now optional and fixed bug in platform specific installation code
2014-02-03 00:55:10 +01:00
GlenDC
fc40fdebb7
User can now choose to not install the git app, and (after installation) he'll has to specify the path of the git app
2014-02-03 00:37:15 +01:00
Sébastien Moratinos
f27db34976
add server auth test (reset password)
2014-02-03 00:08:52 +01:00
Sébastien Moratinos
8895f12aff
Fix error 500 when resetting password if bad input.
2014-02-03 00:08:07 +01:00
GlenDC
1020a97fa1
fixed bug in the install_software function and using now the newest version of nodejs currently available
2014-02-03 00:01:41 +01:00
GlenDC
9912039a1b
update curl
2014-02-02 23:53:30 +01:00
GlenDC
8b5e2176bb
Download URLs are now saved in config files for maintainability reasons
2014-02-02 23:40:58 +01:00
GlenDC
fdddd2d998
added localisation to the automated windows dev setup
2014-02-02 22:51:03 +01:00
Nick Winter
3b16145d39
Merge pull request #322 from smoratinos/master
...
fix app crash because of bad escape in ES translation
2014-02-02 13:21:50 -08:00
Sébastien Moratinos
c55a54fc4b
fix app crash because of bad escape in ES translation
2014-02-02 21:45:14 +01:00
Einar Rasmussen
666a85e986
Update da.coffee
...
Finished 'classes' + other minor edits.
2014-02-02 20:33:54 +00:00
Nick Winter
a5065d273d
More for #133 .
2014-02-02 10:42:18 -08:00
Nick Winter
068f798d58
Fixed bugs in Tome spell views swapping.
2014-02-02 10:26:42 -08:00
Nick Winter
a28ce55793
Localization quote escape typo.
2014-02-02 10:17:23 -08:00
Einar Rasmussen
415b49b661
Update da.coffee
2014-02-02 12:49:24 +00:00
GlenDC
eade3809df
cleaned up batch file. TODO: Solve bug related to install file of node-js and start using config files for a more dynamic approach
2014-02-02 03:46:45 +01:00
GlenDC
55dc6666cd
pumped new life in the bash way of life
2014-02-02 02:55:42 +01:00
GlenDC
2a8d0dd26d
3rd party software download test
2014-02-02 02:21:54 +01:00
Nick Winter
04adc29bb2
Merge pull request #321 from DanielRodriguezRivero/patch-3
...
Update es-ES.coffee
2014-02-01 16:23:27 -08:00
GlenDC
83b7ac35aa
Initial setup of the new windows development approach.
2014-02-02 00:47:10 +01:00
Daniel
517adc9314
Update es-ES.coffee
...
Hi!
I have translated the remaining lines and I also have modified a few lines that had some minor grammar mistakes. All the text is translated.
Cheers!
2014-02-02 00:31:09 +01:00
Nick Winter
f8f3bdd1e3
Improved error alert space usage.
2014-02-01 13:56:55 -08:00
Einar Rasmussen
b602691748
Merged mine and sorsjens versions.
2014-02-01 22:21:15 +01:00
Nick Winter
546914052d
A few tweaks to wizard floating.
2014-02-01 11:02:20 -08:00
Nick Winter
9a1afd6772
Merge pull request #320 from vanous/cz-translation
...
raw translation to czech finished
2014-02-01 10:57:10 -08:00
vanous
d2fb1cfa11
raw translation to czech finished
...
it will need fine tuning, checking within context and more
2014-02-01 19:38:47 +01:00
Nick Winter
663c48c814
Merge pull request #319 from sorsjen/patch-1
...
Update da.coffee
2014-02-01 08:41:44 -08:00
Nick Winter
33bdce8a63
Merge branch 'locale' of git://github.com/HiroP0/codecombat into HiroP0-locale
2014-02-01 08:35:52 -08:00
Einar Rasmussen
582bb15862
Update da.coffee
...
Line 173-181
2014-02-01 16:25:50 +00:00
Nick Winter
b502c24ece
A few updates to the contributors lists.
2014-02-01 08:22:26 -08:00
sorsjen
a2e64860dd
Update da.coffee
...
Added translated strings
2014-02-01 16:32:55 +01:00
Nick Winter
7ba6e5d0f2
Fixed #316 .
2014-01-31 16:32:46 -08:00
Nick Winter
ee7d8a06fe
A few SpellView / debugger fixes.
2014-01-31 16:16:59 -08:00
Nick Winter
632316314e
Don't include flow for invisible methods, don't include protectAPI for non-writable methods.
2014-01-31 14:51:06 -08:00
Nick Winter
4d891ee7fa
Fixed sprite offset positioning bug.
2014-01-31 13:28:42 -08:00
Michael Glass
1df1a2499d
Extended German translation (about, minor fixes)
2014-01-31 13:16:58 -08:00
Michael Schmatz
563c442e81
Added tests, moved some functions into module.exports
2014-01-31 11:09:15 -08:00
Nick Winter
8d81d75d2b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-31 10:50:22 -08:00
Nick Winter
2e9386ab70
Fix for fix for #133 .
2014-01-31 10:50:15 -08:00
Michael Schmatz
ce48411ddb
Added worker_world.coffee
2014-01-31 10:40:01 -08:00
Nick Winter
cba7807053
Possibly handling #133 .
2014-01-31 10:26:24 -08:00
Nick Winter
72a3e82404
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-01-31 10:21:35 -08:00
Nick Winter
6303d28554
Refactored bobbing.
2014-01-31 10:21:32 -08:00