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

7058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
fbd0585379 Merge pull request #1861 from Imperadeiro98/master 
Removed more wizard i18n stuff
 2014-12-06 18:10:15 -08:00
Nick Winter
d53d1d5ace Merginated. 2014-12-06 17:28:11 -08:00
Nick Winter
9bde375dcc Implemented new AuthModal design (sans green button for signup/login). 2014-12-06 17:27:02 -08:00
Diego Reinoso
01b11027d6 Update es-ES.coffee 2014-12-06 17:49:20 -05:00
Scott Erickson
83e1fe8bfe InventoryModal loads item portraits when they are visible, getting rid of dozens of unnecessary web requests. 2014-12-06 14:21:56 -08:00
Scott Erickson
b976a11d65 Removed the module loader modal, replaced with a simple progress bar at the top of the screen. 2014-12-06 13:11:47 -08:00
Imperadeiro98
43c0b399ed Update keyboard_shortcuts.jade 2014-12-06 20:52:30 +00:00
Imperadeiro98
9813e7584f Removed more wizard i18n stuff 
I am not sure about line 278.
 2014-12-06 20:41:01 +00:00
Scott Erickson
aac1aa379e Set up stubs for future subscription sales. 2014-12-06 12:38:06 -08:00
Nick Winter
9e9c0e6fee Merge pull request #1860 from probil/patch-1 
Update and fix Ukrainian translation
 2014-12-06 12:05:26 -08:00
Maks Lyashuk
bc4acde60f Update and fix Ukrainian translation 2014-12-06 22:03:29 +02:00
Nick Winter
491a7ef456 Handling another error noted with Errorception. Updated minimum Firefox version to 25 based on seeing many (possibly non-critical) errors with it. 2014-12-06 12:02:48 -08:00
Nick Winter
708f0e543c Fixed some issues I saw in Errorception. Stopped saving the session when the play state or frame changes. 2014-12-06 11:33:57 -08:00
Nick Winter
4348450a88 Removed old wizard_settings i18n keys. Propagated i18n. 2014-12-06 11:07:28 -08:00
Nick Winter
477ebb3c48 Fixed an error I saw in Errorception, and a Sass problem I saw in Webkit. 2014-12-06 11:05:52 -08:00
Nick Winter
bba78970ea Deleted WizardSettingsView. 2014-12-06 10:23:26 -08:00
Scott Erickson
62cab1e76b Admins can now give users discounts and free accounts from the MainAdminView view. 2014-12-06 10:05:52 -08:00
Nick Winter
f189eafe0c Activated a few more Czech translations. 2014-12-06 09:51:05 -08:00
Nick Winter
dd0d58dcb5 Merge pull request #1855 from Martin005/patch-1 
Update cs.coffee
 2014-12-06 09:49:53 -08:00
Nick Winter
00e6ce5f45 Couldn't reproduce #1851, but this should work around the error if it happens again. 2014-12-06 09:46:37 -08:00
Nick Winter
175cdb5151 Now showing SubscribeModal before AuthModal for players who need to sign up before subscribing. 2014-12-06 09:35:13 -08:00
Nick Winter
e9ab0c1f4d Merge pull request #1859 from dmreinoso/patch-1 
Update es-ES.coffee
 2014-12-06 09:09:24 -08:00
Nick Winter
7d2d2776c8 Restricted crude-glasses in more later levels so it'd be less likely to get them equipped after the wooden ones should be on your face. 2014-12-06 08:37:13 -08:00
Scott Erickson
31327e4089 Updated soundjs to their classRearchitecture branch. Gotta have the latest! 2014-12-06 08:13:42 -08:00
dmreinoso
30d6db8ca4 Update es-ES.coffee 2014-12-06 10:31:00 -05:00
Nick Winter
061e52e181 Merge pull request #1858 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-06 07:21:08 -08:00
Nick Winter
560a8c7b72 Merge pull request #1856 from Lirai/patch-3 
Update de-DE.coffee
 2014-12-06 07:20:21 -08:00
Nick Winter
f652a3c491 Merge pull request #1854 from nixel2007/master 
Update ru
 2014-12-06 07:18:10 -08:00
Imperadeiro98
1a8bf81258 Update pt-PT.coffee 2014-12-06 12:55:07 +00:00
Anders Bernard
ac9d173201 Update de-DE.coffee 2014-12-06 12:35:44 +01:00
Anders Bernard
dbaffde2a0 Update de-DE.coffee 2014-12-06 12:16:10 +01:00
Martin005
56e243a656 Update cs.coffee 2014-12-06 12:07:23 +01:00
nixel2007
8619f43801 Update ru. 
Sync lines to en.coffee a bit
 2014-12-06 13:16:58 +03:00
nixel2007
2e6ada0935 Update ru. 
Today subscription update and small fixes.
 2014-12-06 13:07:25 +03:00
Nick Winter
6a26681fec Minor level progression tweak. 2014-12-05 18:30:31 -08:00
Nick Winter
bbc25a0877 Updated next level links. 2014-12-05 18:29:15 -08:00
Nick Winter
c7e2398f7c Fixed some bugs with hero doll placement and dungeon unlocks. 2014-12-05 18:16:58 -08:00
Nick Winter
07f7e7473d Merged. 2014-12-05 17:27:33 -08:00
Nick Winter
6596bde758 Right, don't need that in there. 2014-12-05 17:25:20 -08:00
Scott Erickson
836d2905b9 Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties. 2014-12-05 17:19:52 -08:00
Scott Erickson
f4e3416918 Set up an endpoint for fetching Stripe info. 2014-12-05 17:19:52 -08:00
George Saines
640b841306 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-05 16:57:44 -08:00
George Saines
04a6ab3734 resizing large img files, adding buttons for victory modal 2014-12-05 16:57:39 -08:00
Scott Erickson
e8bb5b824d Tweaked the subscription handler to modify the actual target user, not necessarily the user that is making the changes. 2014-12-05 15:49:46 -08:00
Nick Winter
6344b0c1a3 Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only. 2014-12-05 15:46:15 -08:00
Nick Winter
8932cef46d Merge pull request #1850 from Lirai/patch-1 
Update de-DE.coffee
 2014-12-05 15:46:09 -08:00
Matt Lott
d6265a4065 Fix default locked code css 
Couldn’t get multiple ranges to highlight ranges correctly, so leaving
it on for python and coffeescript only.
 2014-12-05 14:15:43 -08:00
Scott Erickson
209836c172 Fixed user patching to not also unsubscribe subscribers. 2014-12-05 14:11:38 -08:00
Anders Bernard
3304fedb16 Update de-DE.coffee 2014-12-05 22:16:48 +01:00
Nick Winter
fd88056123 Merge pull request #1849 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-05 12:54:38 -08:00