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
George Saines
18631ec5b1
upgrading our level icons
2014-07-18 15:42:53 -07:00
Michael Schmatz
b9e9e6d2e6
Merge pull request #1352 from codecombat/master
...
Edited task schema
2014-07-18 14:51:18 -07:00
Michael Schmatz
321bce121c
Edited task schema
2014-07-18 14:50:31 -07:00
Michael Schmatz
47b76fe4c7
Merge pull request #1351 from codecombat/master
...
Master into production
2014-07-18 11:08:16 -07:00
Michael Schmatz
8c3613dfc7
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
server/routes/mail.coffee
2014-07-18 11:07:11 -07:00
Michael Schmatz
a6ab977034
Add candidate finish reminder email
2014-07-18 11:05:37 -07:00
Nick Winter
caf9016f30
Merge pull request #1350 from Imperadeiro98/master
...
Reverted the last changes
2014-07-18 07:50:43 -07:00
Imperadeiro98
3ac1d6c77c
Update pt-PT.coffee
2014-07-18 15:48:36 +01:00
Nick Winter
e7bf9b2792
Merge pull request #1349 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-18 07:35:53 -07:00
Imperadeiro98
051fd9ecbc
Update pt-PT.coffee
2014-07-18 13:40:05 +01:00
Nick Winter
207f0adf11
Propagated i18n tags for code language blurbs.
2014-07-17 20:13:30 -07:00
Nick Winter
2d7b6eb145
Updated code language logos. Added code language blurb i18n tags.
2014-07-17 20:12:59 -07:00
Scott Erickson
708f67ebd5
Merge branch 'master' into renameViews
2014-07-17 17:24:09 -07:00
Scott Erickson
cdf65d4f42
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 17:23:56 -07:00
Scott Erickson
59b723b890
Refactoring View to ModalView.
2014-07-17 17:22:26 -07:00
Scott Erickson
e18b4de583
Refactoring View to CocoView.
2014-07-17 17:20:11 -07:00
Scott Erickson
0e042ee61c
Refactoring View to RootView. Refactoring some RootViews to be routed manually.
2014-07-17 17:16:32 -07:00
Nick Winter
079d336881
Stopped .nano from overriding Bootstrap's column width for component docs page.
2014-07-17 16:36:59 -07:00
Scott Erickson
2b4b91733c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e
Work on the job profile view, initial work on the code modal.
2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d
Merge pull request #1344 from Darredevil/master
...
fix for no user logged
2014-07-17 16:30:51 -07:00
Scott Erickson
51e63ddbc3
Fixed some DemoView issues, mainly clicking links from one demo to another.
2014-07-17 16:29:26 -07:00
Scott Erickson
1b999a2efe
Extended getLatestVersion for Handler to also be able to accept project parameters.
2014-07-17 16:28:52 -07:00
Scott Erickson
4818a81854
Added setProjection so CocoModels can more easily get subsets of data.
2014-07-17 16:22:06 -07:00
Nick Winter
e412a7b73f
Merge pull request #1341 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-07-17 16:00:54 -07:00
Nick Winter
769c26229e
Merge pull request #1340 from sunzenshen/master
...
Fixed typo: Chose -> Choose
2014-07-17 15:59:08 -07:00
Nick Winter
17c516654f
Merge branch 'master' into production
2014-07-17 15:58:05 -07:00
Nick Winter
8813a7f545
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
2014-07-17 15:50:29 -07:00
Michael Schmatz
0c7fca8ea7
Merge pull request #1348 from codecombat/master
...
Restored legacy candidates view
2014-07-17 13:17:20 -07:00
