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

4065 commits

This branch
This branch
All branches
Author SHA1 Message Date
Darredevil
3b704330d6 Documentation tab for Level Editor 2014-07-25 23:06:04 +03:00
Darredevil
b77b796cef Merge branch 'codecombat-master' 
Conflicts:
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 22:48:13 +03:00
Darredevil
e3a0ea400c Docs tab v2 2014-07-25 22:33:55 +03:00
Darredevil
f78c48c893 Docs tab v2 2014-07-25 01:26:34 +03:00
Michael Schmatz
d773c301fb Add message if no player code in profile 2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b Add login link to profile login prompt 2014-07-24 10:16:43 -07:00
Michael Schmatz
e0d7392c1f Merge pull request #1386 from codecombat/pr/1376 
Pr/1376
 2014-07-23 15:27:13 -07:00
Michael Schmatz
be28f3e6a0 Uncommented some commented translated lines 2014-07-23 15:23:53 -07:00
Michael Schmatz
7910c5d9cc Implement #1370 2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d Merge branch 'pr/1383' 
Conflicts:
	app/views/play/level/tome/SpellListTabEntryView.coffee
 2014-07-23 14:44:15 -07:00
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -07:00
Dominik Kundel
5477a5b84a fixed broken build from #1380 2014-07-23 17:52:15 +02:00
Dominik Kundel
5279b01483 fixed showing pinned popover 2014-07-23 17:39:16 +02:00
Scott Erickson
beef508e76 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 07:09:12 -07:00
Scott Erickson
65375aa5fc Renamed problem and spell to their new, capitalized names. 2014-07-23 07:09:05 -07:00
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Dominik Kundel
4f6ca5335f fixed spell palette sliding behind HUD 2014-07-23 15:50:47 +02:00
Dominik Kundel
72c1bb28b3 fixed artefact 2014-07-23 15:26:22 +02:00
Dominik Kundel
9cb704a843 last fix for dimming the editor 2014-07-23 15:09:15 +02:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Michael Schmatz
572a3bf37e Merge pull request #1380 from dkundel/master 
updated zatanna version
 2014-07-22 14:43:14 -07:00
Dominik Kundel
5db634d6a8 fullscreen on keyboard shortcut 2014-07-22 21:47:36 +02:00
Dominik Kundel
a377e6c05d updated zatanna version 2014-07-22 21:20:59 +02:00
George Saines
8982c7ea5b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-22 09:11:30 -07:00
George Saines
574252df32 subbing in Pavel's better tiny programming language icons 2014-07-22 09:11:25 -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
Michael Schmatz
283108da1e Added login message for anonymous users on job profile 2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Michael Schmatz
e8ffb8980f Removed filterActive from filter alerts 2014-07-21 14:47:44 -07:00
Michael Schmatz
735a7082ee Correction to filter schema 2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2 Added saved employer filter alerts to schema 2014-07-21 09:44:40 -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
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
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