Michael Schmatz
f1aec102e9
Merge pull request #1378 from codecombat/master
...
Increased scoring task timeout to 10 minutes
2014-07-22 07:00:18 -07:00
Michael Schmatz
22fabe13ea
Increased scoring task timeout to 10 minutes
...
Temporary increase until we can increase it only for Brawlwood
2014-07-22 06:59:47 -07:00
greyhusky
a313c3ab27
More translations
...
Translated the "about" page and parts of "legal" page as well as some other stuff
2014-07-22 15:01:47 +02:00
Melondonut
8476aa33f9
Update ko.coffee
2014-07-22 18:21:00 +09:00
Melondonut
e266f403ff
Update ko.coffee
2014-07-22 10:13:24 +09:00
Michael Schmatz
bb2dd32cd0
Merge branch 'master' into production
2014-07-21 17:00:01 -07:00
Michael Schmatz
283108da1e
Added login message for anonymous users on job profile
2014-07-21 16:59:42 -07:00
Michael Schmatz
a1e6cf1d65
Merge pull request #1369 from codecombat/master
...
Add filter alerts to employer page
2014-07-21 16:11:09 -07:00
Michael Schmatz
f100c4ebbe
Add filter alerts to employer page
2014-07-21 16:10:02 -07:00
Michael Schmatz
a596f766ee
Merge branch 'master' into production
2014-07-21 14:48:53 -07:00
Michael Schmatz
e8ffb8980f
Removed filterActive from filter alerts
2014-07-21 14:47:44 -07:00
Michael Schmatz
6b96722854
Merge pull request #1366 from codecombat/master
...
Correction to filter schema
2014-07-21 10:04:02 -07:00
Michael Schmatz
735a7082ee
Correction to filter schema
2014-07-21 10:01:49 -07:00
Michael Schmatz
bd1cd35e9d
Merge pull request #1365 from codecombat/master
...
Added saved employer filter alerts to schema
2014-07-21 09:48:21 -07:00
Michael Schmatz
6bc436aec2
Added saved employer filter alerts to schema
2014-07-21 09:44:40 -07:00
Michael Schmatz
3dc44da820
Merge pull request #1362 from codecombat/master
...
Changes to employer email
2014-07-21 08:34:38 -07:00
Michael Schmatz
984be9980e
Put minimum candidates available before employer email
2014-07-21 08:32:44 -07:00
Michael Schmatz
ab4424c7ac
Changed employer reminder to send every 14 days
2014-07-21 08:13:09 -07:00
Michael Schmatz
5cb7cc0ed9
Merge pull request #1361 from codecombat/master
...
Master into production
2014-07-21 08:04:35 -07:00
Michael Schmatz
37b8790b58
Added task text and candidate name to task emails
2014-07-21 08:02:53 -07:00
Nick Winter
ac7e663418
Merge pull request #1359 from Melondonut/patch-2
...
translation Update ko.coffee
2014-07-20 22:44:05 -07:00
Melondonut
fed5f3bce0
uncommented line 485
2014-07-21 14:11:17 +09:00
Darredevil
61ebc4d15b
Docs tab
2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe
Merge pull request #1360 from Darredevil/master
...
Docs page enhancement
2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9
Docs page enhancement
2014-07-21 02:23:01 +03:00
Nick Winter
3a92ced00f
Merge branch 'master' into production
2014-07-20 16:06:58 -07:00
Nick Winter
99e1a8b30a
Merge pull request #1357 from TheSecretSquad/issue#1213crosshair
...
Changed point marker to crosshair, made it bigger, and changed color to white
2014-07-20 16:04:29 -07:00
Nick Winter
a7905db316
Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible.
2014-07-20 15:51:48 -07:00
Melondonut
f5ac5423f8
Update ko.coffee
...
I translated a bit more. I corrected some of word spacing, too. Please let me know if there is anything wrong.
2014-07-21 06:03:53 +09:00
Darredevil
f8cc64dc4c
fix for no user logged
2014-07-20 22:14:33 +03:00
Darredevil
4de920eaa4
Merge pull request #9 from codecombat/master
...
update
2014-07-20 22:14:19 +03:00
Nick Winter
b301ab1c3b
Merge pull request #1358 from Melondonut/patch-1
...
Update ko.coffee
2014-07-20 09:41:24 -07:00
Melondonut
9724c4f218
Update ko.coffee
...
Hi there.
I'm not sure that if it is okay to to this .. but anyway I thought there were a lot of thing that I could help so I did translate a bit. I checked out the code combat website but they just says "go to github, and translate."
thank you,
Melondonut.
안녕하세요. 제가 이래도 되는 건지는 모르겠지만, 제가 도움이 될 수 있을 것 같아 시험삼아 조금 번역해보았습니다. 코드 컴뱃 사이트를 확인했는데, 깃헙에 가서 번역한 다음 리퀘스트하라는 말만 있더라구요; 확인해주시면 감사하겠습니다.
2014-07-20 23:19:41 +09:00
Nick Winter
1537754a16
A few bugfixes, plus gigantic child window convenience for me editing levels.
2014-07-19 20:26:13 -07:00
Pete DiSalvo
9ca3563eed
Changed point marker to crosshair, and changed color to white
2014-07-19 20:12:56 -04:00
Nick Winter
d45c2d31de
New language icons.
2014-07-18 20:14:41 -07:00
Michael Schmatz
f00ddbcd44
Merge branch 'production' of https://github.com/codecombat/codecombat into production
2014-07-18 19:23:20 -07:00
Michael Schmatz
1d5078ad10
Changed https to http in curation email
2014-07-18 19:22:01 -07:00
Scott Erickson
e7a70bbd0b
Merge conflict handling.
2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853
More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.
2014-07-18 17:06:20 -07:00
Scott Erickson
574e9e7804
Removed the deprecated ErrorView.
2014-07-18 16:56:08 -07:00
Scott Erickson
41329f26fe
Merge branch 'master' into production
2014-07-18 16:48:58 -07:00
Scott Erickson
00c11fd70e
Minor defensive bug handling for the LevelSessionCodeView for when teamSpells has invalid, old data.
2014-07-18 16:46:28 -07:00
Michael Schmatz
836802962f
Merge pull request #1354 from codecombat/master
...
Master into production
2014-07-18 16:28:55 -07:00
Michael Schmatz
cd0d81438d
Add recruitment task reminder emails
2014-07-18 16:26:55 -07:00
Scott Erickson
9ad166048d
Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code.
2014-07-18 16:12:28 -07:00
Scott Erickson
74425103d1
Fixed some DemoView issues, mainly clicking links from one demo to another.
2014-07-18 16:12:27 -07:00
Scott Erickson
4658c3000f
Extended getLatestVersion for Handler to also be able to accept project parameters.
2014-07-18 16:12:27 -07:00
Scott Erickson
52447f9e22
Fixed the avatar endpoint handling when the user object DNE.
2014-07-18 16:12:27 -07:00
Scott Erickson
90a4a1b635
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-18 16:12:27 -07:00
