codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-18 19:42:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10952 commits 27 branches 0 tags 134 MiB
Commit graph

10952 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
130b67d6ce Merge pull request #3273 from codecombat/clean-i18n 
Remove unused i18n strings
 2015-12-23 08:52:47 -08:00
Nick Winter
b42ed395c0 Small fix for #3276 NewLevelComponentModal 2015-12-23 08:41:00 -08:00
Nick Winter
6b02a7a31f Merge pull request #3276 from Imperadeiro98/master 
Use view in template
 2015-12-23 08:29:54 -08:00
Nick Winter
da70980ad5 Merge branch 'Zerrien-master' 2015-12-23 08:23:32 -08:00
Nick Winter
3be6abf2e1 Merge Router.coffee 2015-12-23 08:23:23 -08:00
Nick Winter
08d0440c71 Link to language-specific forum categories when available 2015-12-23 08:22:19 -08:00
Nick Winter
dfc1ef2e89 Add i18n tags for new legal page stuff 2015-12-23 08:21:49 -08:00
Nick Winter
21ae7d47be Don't load extra level completion images unless it's that level 2015-12-23 08:21:11 -08:00
zxcpoiu
d54c2a786c app/locale: translation for ZH_HANT and ZH_HANS 2015-12-23 15:15:11 +08:00
Imperadeiro98
d321bb7a95 Removed spr from spell_list_entry_thangs.jade 2015-12-22 21:41:20 +00:00
Nick Winter
a92ed8fbbe Fix /courses/teachers link to /schools 2015-12-22 06:43:19 -08:00
Imperadeiro98
14fcc1f2ac Merge pull request #3278 from Nainufar/patch-5 
Update ca.coffee
 2015-12-22 13:04:10 +00:00
Matt Lott
68aae0d4e0 Update /courses/teachers active courses styling 2015-12-21 16:18:01 -08:00
Nainufar
59862f666d Update ca.coffee 
some translations more
 2015-12-22 01:12:45 +01:00
Nick Winter
8683a2f27a Merge pull request #3251 from themaka/browserstack-quid-pro-quo 
Adding Browserstack to our web page as we promised
 2015-12-21 15:55:29 -08:00
Nick Winter
848263d8a2 Merge pull request #3231 from weevilgenius/master 
Fix up vagrant config
 2015-12-21 15:54:33 -08:00
Nick Winter
0d958cef06 No longer under high load 2015-12-21 15:54:00 -08:00
Matt Lott
b971ce3492 Enroll single student without modal in classroom view 2015-12-21 15:45:14 -08:00
Josh Callebaut
314f8256ee Improves style further. 2015-12-21 15:42:46 -08:00
Matt Lott
bde8e6721c Add enroll students button to /courses/teachers 2015-12-21 15:04:21 -08:00
Nick Winter
e070c70b9d Put /schools into the main flow in place of anonymous /teachers for now 2015-12-21 15:02:11 -08:00
Matt Lott
b5e7a9694e Remove /courses/teachers concepts 
Also moving enrolled counts around a bit and adding a class count
sentence.
 2015-12-21 14:19:35 -08:00
Matt Lott
d782eb174e Fix /schools big quote location 2015-12-21 14:09:57 -08:00
Nick Winter
2adb255a48 Merge pull request #3275 from taptapdan/fix-issue-3243 
Fix achievements notifications animation
 2015-12-21 13:32:44 -08:00
Matt Lott
11d24e939b Add smooth down arrow navigation to /schools 2015-12-21 13:00:39 -08:00
Josh Callebaut
9ba9d8ab4d Style guide fixes. 2015-12-21 12:51:29 -08:00
Josh Callebaut
79ff058117 Adds the Thang Task View. 2015-12-21 12:44:22 -08:00
Matt Lott
348e0407bc Update /schools copy and fonts 2015-12-21 12:39:59 -08:00
Imperadeiro98
025d2bea2f Couple fixes 2015-12-21 16:03:28 +00:00
Imperadeiro98
e70cbed4e4 Use view in template 2015-12-21 15:51:46 +00:00
Daniel Fiore
25531477c5 Fix achievements notifications animation 
This fixes #3243. Achievement notification animation now slides in from
off-screen left and then hides back to off-screen left.
 2015-12-20 22:28:09 -08:00
Nick Winter
105c2c9497 Get prerenderedSpriteSheetData in level editor 2015-12-20 07:02:15 -08:00
Imperadeiro98
7af7553bff Remove unused i18n strings 2015-12-20 15:00:58 +00:00
Matt Lott
9466cd7f74 🐛Fix level completions analytics string cache 2015-12-19 21:58:20 -08:00
Matt Lott
c721d863f8 Analytics aggregation script perf 
Speeding up db finds.
Reducing memory usage via string caches.
 2015-12-19 21:57:05 -08:00
Matt Lott
352e8283a7 Split analytics aggregation scripts 2015-12-19 15:02:39 -08:00
sasha_bichkov
c9b6832dae refactor 2015-12-19 15:04:42 +03:00
Nick Winter
9ffd0498f2 Merge branch 'production' 2015-12-18 13:32:20 -08:00
Nick Winter
f8091443e9 Lower the number of rerenderings needed when spritesheets get full. Add a jitSpritesheets query variable option for comparing performance of prerendered spritesheets. 2015-12-18 13:26:47 -08:00
Scott Erickson
8ddf36ce3c Reenable prepaid test "bunch of people trying to redeem at once" 2015-12-18 10:45:36 -08:00
Scott Erickson
def3e9a009 Improve travis success rate 
https://travis-ci.org/codecombat/codecombat/builds/96076589

Failures:
1) Recalculate Achievements remove earned achievements
  Message:
    Expected 1 to be 0.
  Stack:
    Error: Expected 1 to be 0.
...

Apparently EarnedAchievement creation from previous tests bleeds into this test case.
Adding a timeout to minimize the race condition problem here.
 2015-12-18 10:40:37 -08:00
Scott Erickson
079109145f Cull recruiting views and translations 2015-12-18 10:34:21 -08:00
Scott Erickson
53f8bca26b Add logoutRedirectURL property to RootView, default to /, add exceptions 2015-12-18 10:02:03 -08:00
Matt Lott
94cf5654ff Update /teachers with post-HoC copy 2015-12-18 05:39:25 -08:00
Matt Lott
43ca30b413 Update /courses/teachers getting started pdf 2015-12-18 05:21:06 -08:00
Matt Lott
28c554295c Remove homepage HoC section 2015-12-18 05:15:04 -08:00
Imperadeiro98
e5e9f3e01d Merge pull request #3272 from VeggieRock/patch-1 
Update es-419.coffee
 2015-12-18 11:35:46 +00:00
Imperadeiro98
526909d362 Merge pull request #3271 from Balrogin/patch-2 
Update Pt-Br -Translation
 2015-12-18 11:33:43 +00:00
VeggieRock
dac2f5917d Update es-419.coffee 
Cambios menores en las paginas de cursos y registro, así como algunas correcciones sustituyendo la palabra "escaleras" por clasificación. ejemplo: 
Partidas de "escaleras" fue cambiado a partidas de "clasificación".
Espero y sean aceptadas pronto. Saludos!
 2015-12-17 23:42:05 -06:00
Lucas P
5f143a276e Update Pt-Br -Transation 
Some translation and fixes .
 2015-12-17 23:38:40 -02:00