codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6091 commits 27 branches 0 tags 134 MiB
Commit graph

4797 commits

Author SHA1 Message Date
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
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
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
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
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
Imperadeiro98
074c16733b Update pt-PT.coffee 2014-12-05 20:23:06 +00:00
Imperadeiro98
7a89d30bb6 Update pt-PT.coffee 2014-12-05 20:21:13 +00:00
nixel2007
9a2bc14bad merge remote 2014-12-05 20:15:59 +03:00
nixel2007
793fbfcd18 Merge remote-tracking branch 'upstream/master' 2014-12-05 20:08:29 +03:00
Nick Winter
fb4646b1dd Propagated i18n. 2014-12-05 09:08:26 -08:00
nixel2007
171d862fcf ru 
community block, skill_docs done, small fixes
 2014-12-05 20:07:50 +03:00
Nick Winter
723209642c Merge pull request #1845 from Imperadeiro98/patch-1 
Fixed some i18n
 2014-12-05 08:56:11 -08:00
Nick Winter
b01b74cdc8 Merge pull request #1843 from Lirai/patch-2 
Update de-DE.coffee
 2014-12-05 08:54:57 -08:00
Nick Winter
8b62b6ec44 Temporary workaround for #1842. 2014-12-05 07:55:17 -08:00
Imperadeiro98
bf7872b059 Update legal.jade 2014-12-05 15:54:35 +00:00
Imperadeiro98
f089531aac Update en.coffee 2014-12-05 15:43:54 +00:00
Imperadeiro98
e4be319875 Update legal.jade 2014-12-05 15:43:37 +00:00
Imperadeiro98
afbc669742 Update en.coffee 2014-12-05 15:41:31 +00:00
Imperadeiro98
7cd8a57d1e Update legal.jade 2014-12-05 15:38:42 +00:00
Imperadeiro98
203b407b4b Update en.coffee 2014-12-05 15:38:41 +00:00
Imperadeiro98
ecc94b411c Update en.coffee 2014-12-05 15:29:18 +00:00
nixel2007
ef20e26484 ru 
subscribe block and strings above.
 2014-12-05 18:00:14 +03:00
nixel2007
5703e3eb94 ru 
Play block
 2014-12-05 17:42:19 +03:00
Lirai
e4120ceadf Update de-DE.coffee 
some translations
 2014-12-05 10:43:41 +01:00
Matt Lott
4616df6c23 Add virtual page views for subscribe paths 2014-12-04 21:14:22 -08:00
Scott Erickson
d0ee8cb7c7 Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided. 2014-12-04 17:41:27 -08:00