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

3005 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/views/editor/components/main.coffee
 2014-04-25 14:31:58 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Nick Winter
ef30498985 Improved bad sendwithus error logging. 2014-04-25 11:12:52 -07:00
Nick Winter
2ff97c3bcd I guess emails might not be there. 2014-04-25 10:55:37 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
abe07e6395 Potential popup blocker fix 2014-04-25 09:17:04 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
61458c97d6 Fixed jqxhr error display 2014-04-25 07:50:29 -07:00
Michael Schmatz
0dbcc861bf Various tweaks to employer signup 2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
dpen2000
a37c45e8b0 Fix #916 2014-04-25 00:56:34 +01:00
dpen2000
69b3fe4b8c Hide Create New System/Create New Component links in menus from non-admins 2014-04-24 19:24:08 -04:00
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -07:00
Nick Winter
0975a86345 Propagated i18n. 2014-04-24 14:32:56 -07:00
Nick Winter
8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 14:31:54 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Scott Erickson
2d43b36022 Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText 2014-04-24 13:29:24 -07:00
Scott Erickson
e2c2657f34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 13:23:40 -07:00
Scott Erickson
472f8899dd Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master 
Conflicts:
	app/views/editor/level/edit.coffee
 2014-04-24 13:17:43 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
Scott Erickson
0a313a110c Removed a piece of logging. 2014-04-24 12:07:11 -07:00
Scott Erickson
cfbd7b9b12 Fixed #911 2014-04-24 11:51:00 -07:00
Scott Erickson
8ab50205aa Fixed more buttons in treema. 2014-04-24 11:50:49 -07:00
Scott Erickson
84d21490ab Fixed some treema styling. 2014-04-24 11:38:30 -07:00
Scott Erickson
1eb2adbc61 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 11:22:50 -07:00
Scott Erickson
76f36294b0 Fixed #908, while keeping things like opening revert or contact modals in the level editor from breaking. 2014-04-24 11:22:43 -07:00
Nick Winter
bc244fc53a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 11:09:18 -07:00
Nick Winter
73f39095e6 Upgraded table sorter. 2014-04-24 11:09:01 -07:00
Scott Erickson
42fb19fe3a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 10:46:10 -07:00
Scott Erickson
767af42c3f Fixed #905. 2014-04-24 10:45:52 -07:00
Michael Schmatz
b0865ce3d1 Hotfix for CLA submissions permissions 2014-04-24 08:45:42 -07:00
lordbam
8b9bc0c504 Update uk.coffee 
I have translated part of it. please check it for mistakes and add it to your page if all is alright. in few days i‘ll try to translate to the end
 2014-04-24 17:25:11 +03:00
tmrdja
14ebc957de Changed responsive view for LevelEditor 2014-04-24 11:51:16 +02:00
Michael Schmatz
c408196814 Fix for runtime errors 2014-04-23 16:44:31 -07:00
Nick Winter
86aa4cd0fe Updated janky include_flow skip levels. 2014-04-23 16:11:47 -07:00
Nick Winter
10e91f4250 Merge pull request #902 from Darredevil/patch-7 
Added Gold Rush level
 2014-04-23 16:08:33 -07:00
Darredevil
47eef39bc7 Added Gold Rush level 2014-04-24 02:07:59 +03:00
Nick Winter
68f3eeb770 Two tiny profile improvements. 2014-04-23 11:26:20 -07:00
Michael Schmatz
628a784ac4 Progress towards LinkedIn integration 2014-04-23 11:25:36 -07:00
Nick Winter
d1ceec16bb Propagated i18n tags, as reminded by #884. 2014-04-23 10:48:31 -07:00
Nick Winter
d4cf31c8fe Improved admin view of pending candidates. 2014-04-23 10:21:58 -07:00
Scott Erickson
20541f5520 Added another check to the recruit unsubscribe test, to make sure it doesn't affect other subscriptions. 2014-04-23 09:53:46 -07:00
marianoluzza
0db33213f3 Update es-419.coffee 
Various sections translated
 2014-04-23 13:44:13 -03:00
Scott Erickson
b3197c36b0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-23 09:19:39 -07:00
Scott Erickson
b390b38054 Fixed a couple bugs and tests. 2014-04-23 09:19:07 -07:00
Glen De Cauwsemaecker
eb7fd03dc0 Merged conflict 2014-04-23 18:01:55 +02:00
林鑫
de1eb3860a Translate items under multiplayer_launch 2014-04-23 17:26:39 +08:00
Scott Erickson
f7035d4220 Added an unsubscribe url for recruit notifications. 2014-04-22 19:27:39 -07:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00