Commit graph

4511 commits

Author SHA1 Message Date
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
17c516654f Merge branch 'master' into production 2014-07-17 15:58:05 -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
0c7fca8ea7 Merge pull request #1348 from codecombat/master
Restored legacy candidates view
2014-07-17 13:17:20 -07:00
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Michael Schmatz
10d58e965f Merge pull request #1346 from codecombat/master
Have no emails send to employers who haven't logged in
2014-07-17 09:51:40 -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
a8f4fc7951 Merge pull request #1345 from codecombat/master
Minor fixes to email system
2014-07-17 09:29:18 -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
2df9c96c45 Merge pull request #1343 from codecombat/master
Master into production (includes email system launch)
2014-07-17 08:57:04 -07: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
Imperadeiro98
991ef61d62 Update pt-PT.coffee 2014-07-17 13:44:14 +01:00
Imperadeiro98
1b6fc95d77 Update pt-PT.coffee 2014-07-17 13:25:25 +01:00
Alan Shen
c56be02222 Fixed typo: Chose -> Choose
It may be late to describe incoming targets with past tense.
2014-07-17 01:16:08 -06:00
Michael Schmatz
2a865a0ca0 Remove testing conditions 2014-07-16 19:49:48 -07:00
Michael Schmatz
c717e609ea Initialize value of this.redisNotAvailable 2014-07-16 19:46:30 -07:00
Michael Schmatz
d821e459d1 Encode/decode emails as URIs
This helps to handle special characters like plusses.
2014-07-16 19:46:06 -07:00
Nick Winter
c6656f1a2d Merge pull request #1338 from Darredevil/master
language sensitive docs added
2014-07-16 17:35:17 -07:00
Darredevil
83177c5f00 language sensitive docs added 2014-07-17 03:19:09 +03:00
Darredevil
8da06f6c6b language sensitive docs added 2014-07-17 03:18:06 +03:00
Darredevil
5f3503d16c Merge pull request #8 from codecombat/master
update from codecombat
2014-07-17 03:04:44 +03:00
Michael Schmatz
fc4568a100 Fixed misc bugs 2014-07-16 17:02:40 -07:00
Michael Schmatz
ae23679a26 Hard code mail tasks and add unsubscribe 2014-07-16 16:37:06 -07:00
Nick Winter
933fb6866c Uncommented ellipse test cases. 2014-07-16 16:31:21 -07:00
Nick Winter
727638b090 Merge branch 'master' into production 2014-07-16 16:15:46 -07:00
Nick Winter
781e1da93e Fixed typo: massword -> password. 2014-07-16 16:14:48 -07:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
Nick Winter
855461a67e Don't let test view interfere with normal body styles. 2014-07-16 16:01:37 -07:00