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

3827 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Michael Schmatz
30671d82f6 Removed PM and Management from filters 2014-07-07 19:52:31 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34:36 -07:00
Scott Erickson
fd564fa2d4 Merge pull request #1261 from Imperadeiro98/master 
Translated some more strings
 2014-07-07 18:50:20 -07:00
Scott Erickson
a70627399c Merge branch 'rubenvereecken-supermodel_patch' 2014-07-07 18:49:05 -07:00
Scott Erickson
c1f77e3f07 Merge branch 'supermodel_patch' of https://github.com/rubenvereecken/codecombat into rubenvereecken-supermodel_patch 2014-07-07 18:48:26 -07:00
Scott Erickson
5d00aedac7 Widened the click area on the wizard settings view for color config. 2014-07-07 18:13:19 -07:00
Scott Erickson
1263d4724a Fixed the title in the gold view to handle when goldEarned isn't available. 2014-07-07 16:56:47 -07:00
Scott Erickson
49c8360d5b Fixed me emitting 'me:synced' and anything listening for that. 2014-07-07 16:53:34 -07:00
Scott Erickson
908772d8fe Fixed an instance where a level loading callback was erroring if called before the surface was built. 2014-07-07 16:44:18 -07:00
Scott Erickson
61e6c8dfc3 Fixed the gold view not showing numbers until the first change. 2014-07-07 16:05:23 -07:00
Scott Erickson
2a309c149c Enabled submitting patches for thangs and articles. 2014-07-07 15:19:22 -07:00
Scott Erickson
02890d5a6d Enabled edits to components by non-admins (creation is still off limits). 2014-07-07 14:22:59 -07:00
Michael Schmatz
b449ca5224 Merge pull request #1272 from codecombat/master 
Various employer page changes
 2014-07-07 10:42:43 -07:00
Michael Schmatz
0305374580 Add featured field to curation 2014-07-07 10:42:16 -07:00
Michael Schmatz
b76239b4e9 Replaced candidate avatars on employer page 2014-07-07 10:29:35 -07:00
Scott Erickson
12543cf4dd Added the foundation of a component docs view. 2014-07-07 10:11:02 -07:00
Scott Erickson
86a3fbacd1 Made the CocoCollection more strict about setting the model property. 2014-07-07 10:11:02 -07:00
Michael Schmatz
3151db6fc5 Hide briefcase when no work history 2014-07-07 09:49:13 -07:00
Imperadeiro98
d9d1d25c3c Update pt-PT.coffee 2014-07-07 13:31:03 +01:00
Scott Erickson
fd4235fc84 Merge branch 'master' into production 2014-07-06 15:06:30 -07:00
Scott Erickson
aea1d0e8f2 Changed the angel logigng to use info instead of log, to more easily differentiate. 2014-07-06 15:01:39 -07:00
Scott Erickson
850712442d Added underscore.string to the worker. 2014-07-06 15:01:20 -07:00
Scott Erickson
a2740279bc Added styling for tables in the guide. 2014-07-06 15:00:51 -07:00
Ruben Vereecken
128008daa1 Hid the progress bar on load failed 2014-07-06 21:48:31 +02:00
Ruben Vereecken
1f02b99942 Refactored showNotFound into notFoundView 2014-07-06 20:01:47 +02:00
Scott Erickson
d640dac33a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-06 09:36:12 -07:00
Scott Erickson
37a28cf826 Tweaked the styling for guides to only center emphasized lines immediately after an image. Made the styling also show up on the level editor. 2014-07-06 09:35:28 -07:00
Imperadeiro98
21c180e206 Update pt-PT.coffee 2014-07-06 11:11:44 +01:00
Imperadeiro98
e3bb93c4f5 Update pt-PT.coffee 2014-07-06 10:01:55 +01:00
Imperadeiro98
183b744d07 Update pt-PT.coffee 2014-07-05 22:10:21 +01:00
Scott Erickson
94a6e3961b Added a button in the level editor to choose which team to play when editing a ladder level. 2014-07-05 13:54:41 -07:00
Imperadeiro98
cc8fec9283 Update pt-PT.coffee 2014-07-05 19:11:58 +01:00
Imperadeiro98
b5ef1742f4 Update pt-PT.coffee 2014-07-05 19:11:06 +01:00
Scott Erickson
7f5a348155 Merge pull request #1257 from kumabotz/minor-cleanup 
Minor cleanup for convention and readability
 2014-07-05 10:29:02 -07:00
Scott Erickson
11a725e992 Merge branch 'master' into production 2014-07-05 10:10:27 -07:00
Tery Lim
a5476f90ed Minor cleanup for convention and readability 2014-07-05 18:48:08 +08:00
Scott Erickson
b635c4cf16 Fixes #1220. Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data. 2014-07-04 20:45:42 -07:00
Scott Erickson
0a139fdbb3 Treema version bump. 2014-07-04 18:27:41 -07:00
Scott Erickson
dc49499679 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-04 18:12:10 -07:00
Scott Erickson
0c3d5c9882 Merge branch 'kumabotz-coffeescript-convention' 2014-07-04 18:11:56 -07:00
Scott Erickson
41a8d21bfe Merged conflicts. 2014-07-04 18:11:50 -07:00
Scott Erickson
c76032b0af Merged conflicts. 2014-07-04 18:11:26 -07:00