Commit graph

141 commits

Author SHA1 Message Date
Scott Erickson
5a700c14df Stab at fixing the client tests on travis. 2014-08-14 11:00:42 -07:00
Nick Winter
18b0208aac Updated i18n. 2014-08-14 10:57:57 -07:00
Jayant Jain
eece235337 Adds preset images 2014-08-12 20:42:42 +05:30
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Nick Winter
6b2c079ff5 More work on game menu skeleton. 2014-08-08 15:57:20 -07:00
Scott Erickson
cc025942f8 Extended the LevelLoader to load thang types and components dynamically for hero levels. 2014-08-07 18:27:47 -07:00
George Saines
0549273d14 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-06 17:42:33 -07:00
George Saines
b8ea89b4a8 community page redesign 2014-08-06 17:42:19 -07:00
Jayant Jain
86cf344f28 Adds preset images to preview the generated terrain 2014-07-25 17:50:02 +05:30
George Saines
574252df32 subbing in Pavel's better tiny programming language icons 2014-07-22 09:11:25 -07:00
Nick Winter
d45c2d31de New language icons. 2014-07-18 20:14:41 -07:00
George Saines
18631ec5b1 upgrading our level icons 2014-07-18 15:42:53 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -07:00
Nick Winter
42af807e5c Merged in geometry work from #51. 2014-07-16 16:01:37 -07:00
Nick Winter
bd47b3bc83 Fixed #1210 based on #1313. 2014-07-13 18:53:01 -07:00
Nick Winter
45545796a0 Fixes, tweaks, and i18n for the employers page. 2014-07-10 19:17:51 -07:00
Scott Erickson
850712442d Added underscore.string to the worker. 2014-07-06 15:01:20 -07:00
George Saines
88b0a0a97b making changes to the employer page icon dimensions 2014-07-03 15:17:38 -07:00
Michael Schmatz
ebc79668ef Added image assets for recruitment page 2014-07-02 11:42:02 -07:00
George Saines
a94053fd1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-26 10:38:18 -07:00
George Saines
e294133bcf adding the files I forgot 2014-06-26 10:38:13 -07:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
81f8334f37 Some fixes for CocoSprite alphas. 2014-06-21 22:31:10 -07:00
Nick Winter
1e9b403ce5 More zazz for home page code language selection. 2014-06-19 14:55:16 -07:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Michael Schmatz
2559a73244 Merge pull request #1186 from dkundel/master
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Michael Schmatz
a1b7025730 Emergency linkedin hot fix 2014-06-19 08:36:22 -07:00
Nick Winter
2e850dba78 Working on home language selection. 2014-06-19 08:06:34 -07:00
Dominik Kundel
7e8845332e updated Ace minified 2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05 updated Ace 2014-06-18 23:18:58 +02:00
Dominik Kundel
33d68fab6e Merge remote-tracking branch 'upstream/master' 2014-06-18 21:50:55 +02:00
Scott Erickson
50fea7e937 Added a method for returning all requests in mock-ajax. 2014-06-18 12:04:39 -04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Scott Erickson
3e24b2f86e Fixed tests running in karma. 2014-06-16 11:40:09 -07:00
Scott Erickson
d6bb7ffe81 Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why. 2014-06-16 11:40:09 -07:00
Ruben Vereecken
1c671a3c25 Refactored vendor loading 2014-06-16 11:40:09 -07:00
Ruben Vereecken
2e40a53674 Extracting third party scripts out of main 2014-06-16 11:40:08 -07:00
Dominik Kundel
e756c83d9e preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5 preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:12:55 +01:00
George Saines
fb7b3f8580 adding a top info arena on top of the employers page 2014-06-12 16:01:34 -07:00
Scott Erickson
01c20f4065 Fixed karma tests. 2014-06-07 18:15:57 -07:00
Scott Erickson
5104f0a1e7 Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842 2014-06-07 16:41:19 -07:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Scott Erickson
49c9c6bfc9 Built the client test view (rebased from feature/testclient). 2014-06-05 16:56:29 -07:00
Nick Winter
0b2d5c251d A bit more Worker hardening. 2014-06-04 15:47:09 -06:00
Nick Winter
f3adc216ed Protecting our replacement of Math.random via Aether. 2014-05-29 12:26:08 -07:00
Nick Winter
c01bd69625 Better recoverability for non-UserCodeProblem errors during world generation. 2014-05-26 18:45:00 -07:00
Nick Winter
26d2816071 Fixed some more memory leaks. 2014-05-22 19:05:11 -07:00
George Saines
a2fbe5865a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-22 09:55:34 -07:00
George Saines
4ffbdf004c modifying oreilly logo size 2014-05-22 09:55:30 -07:00