codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9377 commits 27 branches 0 tags 134 MiB
Commit graph

9377 commits

This branch
This branch
All branches
Author SHA1 Message Date
Imperadeiro98
a8e59c5302 Updated 'Generate Terrain' strings 2015-07-08 23:20:32 +01:00
Imperadeiro98
ad25f66db0 Update pt-PT.coffee 2015-07-08 22:22:56 +01:00
Nick Winter
be19edb7a1 Merge pull request #2881 from Vikasgupta09/master 
fix #2867 added i18n to some words of lvl save form
 2015-07-07 16:09:53 -07:00
Nick Winter
2f1fb921fe Merge branch 'j8r-patch-1' 2015-07-07 16:07:52 -07:00
Nick Winter
16407a8ca0 Merged fr.coffee. 2015-07-07 16:07:42 -07:00
Nick Winter
45c249ac27 Not asking for resubscription in buy gems modal if already subscribed. 2015-07-07 11:50:55 -07:00
Nick Winter
51c08eff3b Propagated i18n. 2015-07-07 11:45:41 -07:00
Nick Winter
07f81755b0 Added deprecation message to old arenas, highlighting new hero arenas instead. 2015-07-07 11:43:38 -07:00
Matt Lott
853f2baf61 Merge branch 'master' into production 2015-07-07 08:21:23 -07:00
Julien Reichardt
9748c80cae Translation of "concepts" section 2015-07-06 23:57:19 +00:00
Cat Sync
5ab7fd7840 Added 'arguments' to the concepts list, and renamed while loops to just 'Loops', for now 2015-07-06 15:46:18 -04:00
Matt Lott
0c427ff440 Update teachers and sales copy with latest level and hour counts 2015-07-03 13:07:25 -07:00
Matt Lott
f50840a11d Add headers to campaign level counts script 2015-07-03 13:00:36 -07:00
Matt Lott
ff953dbd5a Merge branch 'master' into production 2015-07-02 20:04:27 -07:00
Matt Lott
8d258c6943 Update private clans preview image and copy 2015-07-02 18:44:13 -07:00
Matt Lott
6a53237e65 Add member sorting to premium clan dashboard 2015-07-02 15:17:34 -07:00
Imperadeiro98
8a4645ebc6 Updated i18n of 'Status' in clan-details.jade 2015-07-02 21:50:28 +01:00
Matt Lott
a316924576 Add member concept maps to private clans 2015-07-02 13:23:26 -07:00
Matt Lott
a62e0a8fe6 👕Fix linter warning in mock course details view 
warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee:
warn: ensure_comprehensions at line 50.
 2015-07-02 10:54:22 -07:00
Imperadeiro98
ede3b35368 Fixes to previous merge 2015-07-02 12:47:20 +01:00
Imperadeiro98
74cdc1c3ea Merge pull request #2882 from Ikuyadeu/patch-1 
Update ja.coffee
 2015-07-02 12:46:17 +01:00
Imperadeiro98
41f2eacff9 Some fixes to previous merge 2015-07-02 12:44:30 +01:00
Imperadeiro98
2f8b0d0b49 Merge pull request #2879 from FedericoTomas/patch-10 
Update es-419.coffee
 2015-07-02 12:43:13 +01:00
Ikuyadeu
8a9ea09eca Update ja.coffee 2015-07-02 19:20:25 +09:00
Vikas Gupta
4776ff8325 fix #2867 added i18n to some words of lvl save form 2015-07-02 11:40:37 +05:30
Federico Tomas
7e0c5490e0 Update es-419.coffee 
up guys!.
 2015-07-01 23:06:20 -03:00
Matt Lott
af612afcdd Mock course UI show last expanded complete level 2015-07-01 15:36:33 -07:00
Matt Lott
bee5d53457 Fix clan details html indentation 
And reorder progress key.
 2015-07-01 15:16:21 -07:00
Matt Lott
254d6a9d6b Add course mock UI for student level progress 2015-07-01 15:16:20 -07:00
Matt Lott
93b41285eb Merge pull request #2877 from tahmidshahriar/master 
Add close button to payment methods
Fixes #2694
 2015-07-01 13:42:25 -07:00
tahmidshahriar
62b050f6d8 Merge remote-tracking branch 'upstream/master' 2015-07-01 10:54:37 -07:00
tahmidshahriar
f6dd3ce0c8 minimize changes 2015-07-01 10:22:25 -07:00
tahmidshahriar
60e27d386f add close buttonn to payment methods 2015-07-01 10:20:14 -07:00
Nick Winter
c7dcc1cf9f Merge branch 'master' into production 2015-06-30 20:52:23 -07:00
Nick Winter
1c5f176c3c Added recursion to concepts list. 2015-06-30 20:52:10 -07:00
Matt Lott
71fd13276f Update mock course details page 
Add individual course session selection, call them classes.
Edit buttons for class name and description.
Rearrange layout.
Update course concept lists to use real values.
Also add class name field to course enrollment page.
 2015-06-30 16:53:37 -07:00
Imperadeiro98
90e02cba48 Updated i18n 2015-06-30 20:33:05 +01:00
Imperadeiro98
0ef6dfcc30 Updated i18n in add-thangs-view.jade 2015-06-30 20:33:03 +01:00
Imperadeiro98
92052ceb5b Update pt-PT.coffee 2015-06-30 19:59:50 +01:00
Nick Winter
4742b23854 Propagated i18n. 2015-06-30 11:29:18 -07:00
Nick Winter
40e1e6b2ac Merge branch 'master' into production 2015-06-30 11:28:11 -07:00
Nick Winter
b0c7b50761 Added programming concept tags to campaign and level editor. 2015-06-30 11:27:58 -07:00
Nick Winter
8df32b47d0 Some tweaks to #2876. 2015-06-30 10:31:52 -07:00
Nick Winter
1d6f777b58 Merge pull request #2876 from tahmidshahriar/master 
Fixed email requirement
 2015-06-30 10:13:50 -07:00
tahmidshahriar
259c91b62d fix unneeded changes 2015-06-30 09:37:39 -07:00
tahmidshahriar
56b81f175e Fix email 2015-06-30 09:35:45 -07:00
Nick Winter
8155d6fba0 Merge pull request #2873 from UltCombo/gh-2740 
updateLevelRequiredItems: special-case rings, fixes #2740
 2015-06-29 19:46:55 -07:00
Nick Winter
be2f47c79a Merge pull request #2857 from laituan245/for2806_teacher_survey 
Fixes #2806 (radio buttons of teacher survey page)
 2015-06-29 19:37:06 -07:00
UltCombo
7d7d2d5f0e updateLevelRequiredItems: special-case rings, fixes #2740 
Rings often have unique effects instead of progressively enhancing another ring's effect, hence let's make rings required even if there's already non-restricted rings equipped.
If, by any chance, there's ever a new ring which enhances the effect of a ring which is required for some level, then it should be easy enough to whitelist it in the given ring slot's allowed items array.
 2015-06-29 21:25:43 -03:00
Imperadeiro98
e1e1328906 Updated i18n in account-settings-root-view.jade 2015-06-29 20:26:45 +01:00