codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 03:47:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
4087 commits 27 branches 0 tags 134 MiB
Commit graph

4087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
833d59fb1f Merge pull request #1282 from Alphir/patch-1 
Update fr.coffee
 2014-07-09 14:17:51 -07:00
Nick Winter
4b16e2fc57 Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master 2014-07-09 13:53:58 -07:00
Nick Winter
ca847329b1 Merge branch 'dkundel-feature/fullscreen-editor' 2014-07-09 13:41:57 -07:00
Nick Winter
0ed8d2b371 Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it. 2014-07-09 13:41:42 -07:00
Alphir
0ee0b2d5e3 Update fr.coffee 2014-07-09 22:13:05 +02:00
Darredevil
4309bfbe67 new Documentation page 2014-07-09 23:01:53 +03:00
Darredevil
d0840cc944 Merge branch 'codecombat-master' 2014-07-09 22:42:16 +03:00
Darredevil
910747a023 Merge branch 'master' of https://github.com/codecombat/codecombat into codecombat-master 2014-07-09 22:41:03 +03:00
Darredevil
389f001e22 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/templates/play/level/level_loading.jade
 2014-07-09 22:35:37 +03:00
Ruben Vereecken
a8353cb7ff Anonymous users can have the same name 2014-07-09 21:34:35 +02:00
Ruben Vereecken
ea4523bf6a Test coverage for GETting users by slug 2014-07-09 21:34:35 +02:00
Scott Erickson
d74a778f67 Made creating components open to everyone! 2014-07-09 12:21:32 -07:00
Nick Winter
5e26040c8c Merge branch 'master' into production 2014-07-09 12:10:02 -07:00
Nick Winter
44e5c2826c Proper Treema node behavior for different code languages in default code, property documentation, and snippets. 2014-07-09 11:59:27 -07:00
Ruben Vereecken
ac95d775e6 Users can now be gotten by slug 2014-07-09 20:23:05 +02:00
Scott Erickson
3fbce8334d Fixed #1276 2014-07-09 10:47:02 -07:00
Scott Erickson
a7690f0931 Fixed #1198 2014-07-09 10:10:43 -07:00
Nick Winter
d22e8dbde1 Merge pull request #1277 from gosnat/patch-9 
Update play_view.coffee
 2014-07-09 08:38:00 -07:00
gosnat
4d50a6d76a Update play_view.coffee 
Added "Guide Everyone Home" level
 2014-07-09 08:02:58 -05:00
Nick Winter
928e4362ba Made some style tweaks to the employers page to move the filters into a sidebar when authorized. 2014-07-08 20:47:22 -07:00
Nick Winter
c19a31a58c Fixed some wizard positioning issues in multiplayer. 2014-07-08 18:51:10 -07:00
Nick Winter
31be904b03 Working on flippable tile highlight bounds marks. 2014-07-08 16:43:36 -07:00
Michael Schmatz
02ccade43f Removed extraneous code 2014-07-08 16:28:45 -07:00
Michael Schmatz
3ff66d7807 Removed empty file and unused function 2014-07-08 16:26:51 -07:00
Michael Schmatz
c9e8c55972 Merge branch 'master' into production 2014-07-08 11:19:31 -07:00
Michael Schmatz
21d056ff01 Instant application of filters 2014-07-08 11:19:14 -07:00
Michael Schmatz
e0c215ecad Merge branch 'master' into production 2014-07-08 10:43:47 -07:00
Michael Schmatz
bbc793b003 Fixed modal popping up when logging out sometimes 2014-07-08 10:42:36 -07:00
Michael Schmatz
fa0fe9f871 Merge pull request #1275 from codecombat/master 
Table styling/ copy edit
 2014-07-07 23:25:41 -07:00
Michael Schmatz
aa40257034 Table styling/ copy edit 2014-07-07 23:23:36 -07:00
Michael Schmatz
f704a33ece Table styling/ copy edit 2014-07-07 23:19:07 -07:00
Michael Schmatz
cbd6cacd61 Restyle signup/login modal for employer page 2014-07-07 22:50:14 -07:00
Michael Schmatz
fd532145c1 Merge branch 'master' into production 2014-07-07 21:43:54 -07:00
Michael Schmatz
e71ca28f02 Implement candidate filter counts next to filters 2014-07-07 21:43:30 -07:00
Michael Schmatz
e294f344c4 Move featured candidates to top of sort 2014-07-07 21:29:48 -07:00
Michael Schmatz
f01e3ef3b2 Merge branch 'master' into production 2014-07-07 21:04:25 -07:00
Michael Schmatz
08b9a8fdaa Various changes to education filter 2014-07-07 21:04:12 -07:00
Michael Schmatz
2b4506d080 Merge branch 'master' into production 2014-07-07 20:25:06 -07:00
Michael Schmatz
30745a25ca Consolidated iOS and Android into Mobile 2014-07-07 20:24:29 -07:00
Michael Schmatz
1493da8fad Revert "Consolidated iOS and Android into Mobile Developer" 
This reverts commit eb109156ce.
 2014-07-07 20:23:35 -07:00
Michael Schmatz
eb109156ce Consolidated iOS and Android into Mobile Developer 2014-07-07 20:22:42 -07:00
Nick Winter
18e20f0b00 Merge branch 'a1ip-master' 2014-07-07 20:16:10 -07:00
Nick Winter
9381a4dec6 Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups. 2014-07-07 20:16:00 -07:00
Nick Winter
d414ed64ec Merge pull request #1264 from kinez/patch-12 
Update hu.coffee
 2014-07-07 20:13:36 -07:00
Michael Schmatz
62badeb9d6 Merge branch 'master' into production 2014-07-07 20:06:07 -07:00
Michael Schmatz
285c7ff049 Added school changes to schema 2014-07-07 20:05:28 -07:00
Michael Schmatz
9dee429e21 Merge pull request #1274 from codecombat/master 
Master into production
 2014-07-07 20:03:48 -07:00
Michael Schmatz
cef8fe074a Add mobile developer to the schema 2014-07-07 20:03:02 -07:00
Michael Schmatz
9313541f9f Fixed targeting on employers CSS 2014-07-07 20:02:01 -07:00
Nick Winter
318b72d965 Fixed #1273 with new Aeher version with new Filbert version. 2014-07-07 20:01:05 -07:00