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
|
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
|
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
|
321bce121c
|
Edited task schema
|
2014-07-18 14:50:31 -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
|
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
|
a9d664b8ec
|
Restored legacy candidates view
|
2014-07-17 13:16:17 -07:00 |
|
Michael Schmatz
|
0561235da2
|
Have no emails send to employers who haven't logged in
|
2014-07-17 09:50:18 -07:00 |
|
Scott Erickson
|
88da89433e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-07-17 09:30:35 -07:00 |
|
Scott Erickson
|
590626d5f8
|
Centered social link icons.
|
2014-07-17 09:30:27 -07:00 |
|
Michael Schmatz
|
e4d4c973da
|
Minor fixes to email system
|
2014-07-17 09:28:34 -07:00 |
|
Scott Erickson
|
6f09e95d68
|
Removed background from job profile view.
|
2014-07-17 09:22:52 -07:00 |
|
Darredevil
|
b6469ff45b
|
fix for no user logged
|
2014-07-17 19:12:26 +03:00 |
|
Scott Erickson
|
7454c051f0
|
Added a job profile view demo.
|
2014-07-17 09:12:21 -07:00 |
|
Scott Erickson
|
c145f8088c
|
Fixed the avatar endpoint handling when the user object DNE.
|
2014-07-17 09:12:12 -07:00 |
|
Darredevil
|
80b420ebbf
|
fix for no user logged
|
2014-07-17 19:11:23 +03:00 |
|
Michael Schmatz
|
ccb2ad67ac
|
Merge pull request #1342 from codecombat/feature/mail-system
Feature/mail system
|
2014-07-17 07:18:39 -07:00 |
|
Michael Schmatz
|
58a80f2512
|
Removed old comment
|
2014-07-17 07:17:25 -07:00 |
|
Michael Schmatz
|
337de506dd
|
Removed mail task from server mapping
|
2014-07-17 07:15:14 -07:00 |
|
Imperadeiro98
|
17a4a689e4
|
Update pt-PT.coffee
|
2014-07-17 14:18:29 +01:00 |
|