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

7068 commits

Author SHA1 Message Date
Nick Winter
fbc70435fb Merge pull request #2971 from AkaKaras/translation 
Translation
 2015-09-03 04:39:42 -07:00
Eero Penttilä
bbfa9a1c17 fi.coffee translated: account settings 
Some new, some fixed
 2015-09-03 14:31:57 +03:00
Nick Winter
1a6c3ad8c0 Updated level counts in en.coffee. 2015-09-03 04:27:36 -07:00
Eero Penttilä
b5573169b5 fi.coffee translated: contact 2015-09-03 14:10:24 +03:00
Eero Penttilä
4413c0d859 fi.coffee translated: teachers_survey 2015-09-03 13:52:12 +03:00
Eero Penttilä
0f1a854750 fi.coffee translated: teachers 2015-09-03 11:08:45 +03:00
Eero Penttilä
25863b729d fi.coffee translated: options 
Some new, some fixes
 2015-09-03 09:54:50 +03:00
Nick Winter
e6f61b545e ControlBarView handling playing non-latest versions of levels. 2015-09-02 14:54:44 -07:00
Imperadeiro98
bb119541da Merge pull request #2987 from sake12/master 
pl.coffee - another update
 2015-09-02 21:11:43 +01:00
sake12
0b5c3ad3d0 pl.coffee - update 2015-09-02 21:29:24 +02:00
Dmitry Suprun
d85b656b24 add some translation 2015-09-02 19:39:55 +03:00
Eero Penttilä
592bb6b472 fi.coffee translated: choose_hero, skill_docs 
Some new translations and some fluency modifications.
There is some word placement problems in these sections:
-in lines 495 - 500 the words added between the texts 1,2 and 3 won't fit in Finnish. Could this be replaced with one sentence where the added words would be described like '__nAttackDamage__' etc.?
-in line 510 there is word 'Action' added in front of this word, and I didn't find it in the translation document.
I'll try to make some kind of bug repot of these things also...
 2015-09-02 18:58:21 +03:00
Nick Winter
6463b04c5c Not trying to play a certain sound we don't have yet. 2015-09-02 05:32:45 -07:00
Eero Penttilä
8328a62409 fi.coffee translated: subscribe 2015-09-02 15:12:27 +03:00
Eero Penttilä
f1224c7107 fi.coffee translated: buy_gems 2015-09-02 14:00:10 +03:00
Matt Lott
aa16348ded Remove target subs line from subs dashboard 2015-08-31 05:46:13 -07:00
Matt Lott
ad079f1ff9 🐛Fix trial requests approval page width overflow 2015-08-31 05:40:07 -07:00
Eero Penttilä
98273a5520 Some new translations 
Translated: Clans, user.
and some fixes for fluency
 2015-08-31 15:24:30 +03:00
sake12
eb50a2f761 pl.coffee - another update 2015-08-31 12:05:21 +02:00
sake12
b5311c4589 pl.coffee - update 2015-08-30 23:29:22 +02:00
Nick Winter
b383c6ac00 Updated inventory for Ace of Coders. 2015-08-30 07:28:35 -07:00
Nick Winter
635dcf22ae Fixed typo for Okar session check. Not showing some common sub-skills as skills on hero picker. 2015-08-29 10:01:53 -07:00
Nick Winter
88f6e528b1 Implementing goliath. Configuring goliath for Ace of Coders. 2015-08-29 08:02:20 -07:00
Matt Lott
8de00767b3 Initial courses object model 2015-08-29 07:15:39 -07:00
Imperadeiro98
10e33dab4a Uncommented an header from ja.coffee 2015-08-29 09:49:23 +01:00
Imperadeiro98
8333e57ce2 Merge pull request #2977 from Ikuyadeu/patch-1 
Update ja.coffee
 2015-08-29 09:48:33 +01:00
Imperadeiro98
11564571d3 Merge pull request #2972 from sodaorange/patch-1 
Update ja.coffee
 2015-08-29 09:47:39 +01:00
Ikuyadeu
5d49e1cb9a Update ja.coffee 2015-08-29 16:22:41 +09:00
Imperadeiro98
0357a59cb9 Uncommented some headers from nl-BE.coffee 2015-08-28 22:21:54 +01:00
Imperadeiro98
d415ee25cd Merge pull request #2973 from WardLanssens/patch-1 
Update nl-BE.coffee
 2015-08-28 22:18:18 +01:00
Matt Lott
545567a24b Courses UI: Add teachers mode button to landing page 2015-08-28 11:33:37 -07:00
Matt Lott
a1927bf8cc Courses UI: Update tabs on details page 2015-08-28 10:53:24 -07:00
Nick Winter
d412a7d5ee Fixed blank duel stats bar in single player, oops. Handling getTwoGames from non-logged-in users. 2015-08-28 10:45:07 -07:00
WardLanssens
bfe061dc2b Update nl-BE.coffee 2015-08-28 10:38:14 +02:00
sodaorange
1aa93fbd8a Update ja.coffee 2015-08-27 22:20:02 -04:00
Matt Lott
066d6e7fc1 Courses UI: Add FAQ popup to landing page 2015-08-27 16:52:02 -07:00
Matt Lott
a27c17ef0a Courses UI: Add image to sales blurb and quote 2015-08-27 16:19:37 -07:00
Matt Lott
24fb52a8d9 Update year sub sale copy 2015-08-27 10:54:52 -07:00
Matt Lott
e10c5d9646 Allow year sub purchases on top of monthly subs 
Monthly sub is cancelled, terminal sub of 1 year + remaining month is
added.
 2015-08-27 09:45:10 -07:00
Matt Lott
5faeb82d17 Extend terminal sub with year sub purchase 2015-08-27 09:45:10 -07:00
Imperadeiro98
2ad285093a Merge pull request #2962 from nantoniazzi/patch-1 
Update fr.coffee
 2015-08-27 11:29:08 +01:00
Imperadeiro98
78b136d69c Fixed {changed} in english file 2015-08-27 10:41:13 +01:00
Matt Lott
b6ddb41df6 Add sale end date to year sub page 2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3 Add new heroes to year sub sale page 2015-08-26 14:49:35 -07:00
Matt Lott
66c864bca5 Add feature list to year sub sale landing page 2015-08-26 11:16:25 -07:00
AkaKaras
dafc5fc32f final check and now zh-HANT is done too 
finally finished the translation, but there only has one sentence is translated
 2015-08-25 22:13:22 -04:00
AkaKaras
f6a1d06c13 done the zh-HANS translation 
only one sentence is translated, and thanks again for @lazydogP helping the zh-HANS translation
 2015-08-25 21:55:36 -04:00
AkaKaras
358db97345 a minor fix 2015-08-25 21:15:19 -04:00
AkaKaras
d530cb5841 a new file 
replace the dmg
 2015-08-25 20:47:54 -04:00
Matt Lott
4392da1c20 Redirect to world selector after year sub purchase 2015-08-25 10:59:06 -07:00
Matt Lott
c601652d0b Add teacher banner image to year sub sale page 
Also updating sale copy.
 2015-08-25 10:38:12 -07:00
Matt Lott
58ff820d7d Prompt for login on year subscription sale page 2015-08-25 10:12:11 -07:00
Matt Lott
7d419c1615 Courses UI: add screenshot to landing page course blocks 2015-08-24 06:11:11 -07:00
Matt Lott
f42f34c96f 🐛Fix subs dashboard 30 day churn 2015-08-23 20:54:39 -07:00
AkaKaras
a28484dba8 something wrong 
can't delete the zh-HANS, need to upload a new file or replace the whole thing
 2015-08-23 19:33:29 -04:00
Matt Lott
b171a55876 Use real cancellations for 1st month on subs dashboard 
We have the data now, so no need to approximate anymore.
 2015-08-23 15:32:44 -07:00
Matt Lott
e8a4fd9336 Courses UI: update purchase/continue flow 
Don’t show unlock code entry to teachers
Don’t show existing class selection or purchase course to students
Update copy to make it clearer what’s going on
 2015-08-23 14:33:07 -07:00
Matt Lott
69f874a31d Courses UI: Add student option to courses landing page 2015-08-23 13:48:52 -07:00
AkaKaras
74365c873c another fixing 
justing find something wording and wrong commit……
 2015-08-23 10:47:58 -04:00
AkaKaras
00c0136542 Merge branch 'master' into for-fixing-translation-bug 2015-08-22 18:43:31 -04:00
AkaKaras
ae3fcce0f0 Finished zh-HANS and zh-HANT translation 
finally i finished it!!!!!!!!
 2015-08-22 18:08:27 -04:00
AkaKaras
542f70f7b9 TRANSLATION！！！！ 
that is for morning, gonna work on the rest at afternoon
 2015-08-22 12:11:11 -04:00
jpss256
de2a071bcd minor fix 2015-08-22 12:56:42 +03:00
jpss256
89c9841fbf Fixes 2015-08-22 12:53:42 +03:00
jpss256
7a9d640f0e Translation 2015-08-22 12:45:02 +03:00
AkaKaras
f23a39d71b TRANSLATION！！！ 
gonna finish it in few days
 2015-08-21 21:57:53 -04:00
Matt Lott
f966b8a2fc Courses UI: Add course details condensed progress view 
Defaulting to condensed view, with checkbox to expand details.
 2015-08-21 17:00:44 -07:00
Imperadeiro98
cf720ce270 Fixed 'changed' in english file 2015-08-21 21:42:02 +01:00
Matt Lott
e85d5eac6f Courses UI: Add student summary stats 2015-08-21 12:37:54 -07:00
Matt Lott
5961f14d2c Courses UI: Update details page copy 2015-08-21 12:18:05 -07:00
Matt Lott
9e222d0873 Add subscription sale 
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
 2015-08-21 11:19:39 -07:00
nantoniazzi
5e4b968658 Update fr.coffee 2015-08-21 19:35:48 +02:00
Imperadeiro98
a7074b11ca Merge pull request #2960 from AkaKaras/revert-2950-patch-2 
Revert "there has a typos at #963"
 2015-08-21 14:32:18 +01:00
Imperadeiro98
a9213f51c5 Merge pull request #2959 from AkaKaras/patch-5 
fixed few things
 2015-08-21 14:31:52 +01:00
AkaKaras
ec73c6852f Revert "there has a typos at #963" 2015-08-21 09:27:28 -04:00
AkaKaras
23a1a238b2 fixed few things 
fixed some wordings and sentences
 2015-08-21 09:23:04 -04:00
AkaKaras
85f95212cd just translate few sentences 
just translated few sentences
 2015-08-21 09:22:04 -04:00
Nick Winter
256b19d331 More improvements and fixes for league ladder pages. 2015-08-21 03:28:25 -07:00
Nick Winter
20c6248dba Added rough army power indicator to DuelStatsView. 2015-08-20 15:21:05 -07:00
jpss256
2220cbed8e Fixes 2015-08-21 00:28:11 +03:00
jpss256
14e4f0758a Another portion of the translation 2015-08-21 00:15:36 +03:00
Imperadeiro98
9cf4c06301 Added menu opening sound to PlayHeroesModal 2015-08-20 20:43:04 +01:00
Imperadeiro98
551b450a68 Merge pull request #2956 from javatlacati/patch-1 
Update es-419.coffee
 2015-08-20 20:28:01 +01:00
Nick Winter
78605ef459 Added DuelStatsView for ladder matches. 2015-08-20 11:57:47 -07:00
RUSLAN LÓPEZ CARRO
4bb7b544bd Update es-419.coffee 2015-08-20 09:35:14 -05:00
Nick Winter
da0b7d3e64 Merge pull request #2955 from codecombat/leagues 
Leagues!
 2015-08-19 15:34:54 -07:00
Nick Winter
f4d796a717 More ladder page support for leagues. Linking to clan league pages from clans pages. 2015-08-19 15:30:37 -07:00
Nick Winter
11f9238a91 Added Robot Ragnarok limited time challenge. 2015-08-19 12:16:48 -07:00
Nick Winter
3cfabf8122 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-08-19 12:16:23 -07:00
Imperadeiro98
c701976e65 Merge pull request #2951 from teresacream/patch-1 
Update zh-HANT.coffee
 2015-08-19 11:39:38 +01:00
AkaKaras
896f11c621 add few translations 
just translate few words
 2015-08-18 22:03:24 -04:00
Nick Winter
36494acc5a Merge pull request #2949 from trotod/fix-interface-audio 
Fix some campaign interface audio
 2015-08-18 16:19:38 -07:00
Imperadeiro98
557d4ceb42 Uncommented some headers 2015-08-18 22:38:30 +01:00
RUSLAN LÓPEZ CARRO
4aa0c61a74 Update it.coffee 2015-08-18 16:29:43 -05:00
Imperadeiro98
d5398f1376 Merge pull request #2950 from AkaKaras/patch-2 
there has a typos at #963
 2015-08-18 22:28:43 +01:00
Imperadeiro98
de98d865c2 Uncommented a couple headers 2015-08-18 21:00:58 +01:00
Imperadeiro98
3caec5c36a Merge pull request #2952 from javatlacati/patch-6 
Update es-ES.coffee
 2015-08-18 20:59:29 +01:00
Nick Winter
e041c288cc Merge pull request #2948 from Imperadeiro98/master 
Use playSound in PlayItemsModal.coffee
 2015-08-18 12:40:36 -07:00
RUSLAN LÓPEZ CARRO
bec730741c Update es-ES.coffee 2015-08-18 12:16:04 -05:00
teresacream
1607cbdfeb Update zh-HANT.coffee 2015-08-18 22:27:20 +08:00
AkaKaras
2fa01b660a there has a typos at #963 
the word 吧is misused, should use 把 instead
 2015-08-18 10:23:40 -04:00
Imperadeiro98
56291fc417 Use playSound in PlayItemsModal.coffee 2015-08-17 20:34:34 +01:00
David Liu
a242c41557 Play sound on Buy Gems press 
Partial solution to #2916.
 2015-08-16 18:59:21 -07:00
David Liu
18ac0e06a2 Cut out extra sound on Items/Achievements press 
Removes event listener on supermodel 'loaded-all' event.

Fixes #2915
 2015-08-16 18:59:21 -07:00
jpss256
4120a31890 Translate a part of the Bulgarian file 2015-08-16 11:49:02 +03:00
Nick Winter
32ca453dec Added /play/ladder/levelID/clan/clanID clan-specific ladder pages. 2015-08-15 06:45:38 -07:00
Nick Winter
bda2483738 Added league-based ladder game simulation. 2015-08-15 05:38:47 -07:00
Ikuyadeu
d5cd08108a Update ja.coffee 2015-08-15 18:57:20 +09:00
Matt Lott
978f0df7d3 🐛Fix InspectletJS script loading 
Original embed code was not correct for delayed script loading.
 2015-08-14 14:02:19 -07:00
Lai Tuan
5795399aaa Fixed #2729 2015-08-15 04:04:00 +09:00
Jhoon Saravia
e69bd91afe Add translations up teacher's section 2015-08-13 23:34:24 -05:00
Nick Winter
f757f220be Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods. 2015-08-13 11:17:38 -07:00
Matt Lott
05a9013164 Remove deprecated prepaid schema properties 2015-08-13 11:13:15 -07:00
Nick Winter
621e143544 Fixed bug with game menu not highlighting guide tab. 2015-08-13 11:09:26 -07:00
Matt Lott
4804f3965f 🐛Fix prepaid schema for redeemers property 2015-08-13 10:57:47 -07:00
Nick Winter
52aa877f46 Cleaned up an old file. 2015-08-13 08:30:18 -07:00
Nick Winter
a52e9a3189 Fixed #2939. 2015-08-13 05:58:46 -07:00
Jhoon Saravia
182614400a Add some translations in Spanish 2015-08-12 23:15:03 -05:00
Matt Lott
9c39bf7656 Update prepaids to support multiple redeemers for a single code 
Will remove deprecated properties after updating production.
 2015-08-12 15:51:18 -07:00
Nick Winter
49dc71a157 Added a Bloc coupon code after A Mayhem of Munchkins. 2015-08-12 10:25:56 -07:00
Ikuyadeu
d9cc779261 Update ja.coffee 2015-08-11 20:09:45 +09:00
Imperadeiro98
e205450d79 Fixed some mistakes in last merge 2015-08-11 10:59:05 +01:00
Matheus Marques
cad071f384 Update pt-BR.coffee 2015-08-11 02:05:16 -03:00
Imperadeiro98
bbe6dd7783 Update pt-PT.coffee 2015-08-10 23:11:51 +01:00
Imperadeiro98
e130acb184 Uncommented a translation 2015-08-10 23:08:16 +01:00
Imperadeiro98
0c4cec8a4b Merge pull request #2928 from fabichoi/master 
translate some words
 2015-08-10 23:07:25 +01:00
Nick Winter
7ee155278d Not showing the 'Course: ' in course level names to teachers/players in the obvious places. 2015-08-10 12:01:03 -07:00
Nick Winter
303c19a2dd Pulled in kids coding on homepage image to be visible on screens as small as 1280px wide. 2015-08-10 11:02:19 -07:00
Cat Sync
37fbb07211 Added continue_statements, graphics, and parameters to concepts list 2015-08-10 10:56:21 -04:00
Nick Winter
1d81133f24 Possible solution for #2917, needs testing. Added crossbow bolts to missile orientation display logic. 2015-08-09 14:10:32 -07:00
unknown
07a4cecaaa translate some words 2015-08-08 17:57:14 -04:00
Nick Winter
72199c3548 Propagated i18n. 2015-08-08 11:29:48 -07:00
Nick Winter
79ea3258f1 Added GitHub link to community page. 2015-08-08 10:26:13 -07:00
David Liu
817d790fea Fix poll keys when key is a number 
jQuery converts data strings into a possible JavaScript value, so keys
like '0' and '1' get converted into numbers, which fails the validation
(it expects a string for a key).
 2015-08-08 08:50:18 -07:00
Nick Winter
bb525b0b7f Flags now animate in using the appear action. (Still need to fix it to make it not 'appear' when it's just a cursor change.) 2015-08-08 08:23:02 -07:00
Nick Winter
e9e2866863 Added custom backgrounds for equip buttons. Shrunk equip text to fit for languages where it was overflowing. 2015-08-08 06:31:53 -07:00
Nick Winter
4d697a43ab Added kids coding on homepage. 2015-08-08 05:35:08 -07:00
Nick Winter
859627d232 Fixed cliff sprite scaling. 2015-08-07 19:26:47 -07:00
Imperadeiro98
26c634ab24 Merge pull request #2923 from Zacharias030/master 
Update de-DE.coffee
 2015-08-07 20:08:55 +01:00
Matt Lott
ab9e3d39ee 👕Fix courses view linter warning 
warn: Linting of app/views/courses/mock1/CoursesView.coffee: warn:
ensure_comprehensions at line 72.

May be a linter bug, have filed an issue here:
https://github.com/clutchski/coffeelint/issues/482
 2015-08-07 12:03:09 -07:00
Imperadeiro98
7c92d7cd1c Update pt-PT.coffee 2015-08-07 19:15:46 +01:00
Matt Lott
985cfa2c56 Courses UI - Update free course button copy 2015-08-07 10:12:11 -07:00
Nick Winter
69e7c68784 Hide Kithgard Mastery from slow/young players, and highlight it once for fast/old players. Fix clan button link. 2015-08-07 07:33:30 -07:00
Zacharias Fisches
e1d6641348 Update de-DE.coffee 
small german translation fix
 2015-08-06 16:15:30 +08:00
Nick Winter
66212b0559 Don't show victory text for hero levels. New Clans button. Floor stretching support for firn cliff. 2015-08-05 16:17:27 -07:00
Matt Lott
697b0e9e42 Courses UI - Clean up details page summary 2015-08-05 10:58:12 -07:00
Matt Lott
579f63c059 Courses UI - Clean up course details page titles 2015-08-05 09:53:54 -07:00
Matt Lott
d47f41548c Courses UI - Show progress to students by default 2015-08-05 09:44:19 -07:00
Matt Lott
ea90b93bd2 Courses UI - Consolidate class settings into single modal 2015-08-05 09:35:18 -07:00
Matt Lott
c90fcada7d Update course names 2015-08-04 20:03:30 -07:00
Matt Lott
1b21a677dc Courses UI - Updating copy on landing page 2015-08-04 20:01:13 -07:00
Nick Winter
ae0dc0eb7c Merge pull request #2922 from brian-yang/patch-2 
Added more names for #53
 2015-08-04 17:54:16 -07:00
Nick Winter
7ad16683ce Fixed error for non-course hero victory modals. 2015-08-04 17:41:42 -07:00
Matt Lott
38efeb119c Courses UI - take class size as buy input instead of bucketizing 2015-08-04 15:33:02 -07:00
Matt Lott
60e21600b8 Course details - use given instance 2015-08-04 15:33:02 -07:00
Matt Lott
55a58ef0b3 Courses UI - update button text based on enrolled or not 2015-08-04 15:33:02 -07:00
Matt Lott
36cc9b5f18 Update courses landing page sales copy 2015-08-04 15:33:02 -07:00
Matt Lott
9547bd1021 Add sales copy to beginning of courses landing page 2015-08-04 15:33:02 -07:00
Brian Yang
56ba5e1a32 Added more names for #53 2015-08-04 18:31:46 -04:00
Nick Winter
3f323d27d0 Removed achievement and rewards from course-type level victory screens. Added victory text, return-to-course-button, and level feedback and reviews to course-type levels. 2015-08-04 11:35:10 -07:00
Matt Lott
4ef6d471ee Course UI - bold enrolled marker on course tiles 2015-08-04 11:30:06 -07:00
Matt Lott
b53e4707d8 Update course names 
Trying different formats.
 2015-08-04 11:26:18 -07:00
Matt Lott
bfd4b4f0ca Courses UI - Update landing page flow 
Simplify initial options, add course instance selection.
 2015-08-04 11:21:02 -07:00
Matt Lott
da6cf60381 Target specific levels with InspectletJS 
Currently targeting cupboards-of-kithgard.
 2015-08-03 15:52:52 -07:00
Nick Winter
74b2c5abdb Propagated i18n. 2015-08-02 14:16:26 -07:00
Nick Winter
8d09357a7a Fixed #2914: no disabling spaces for Clojure and other advanced/experimental languages. 2015-08-02 14:12:15 -07:00
Nick Winter
2eb3cfb93a Added Myanmar language (Burmese) stub. 2015-08-02 07:42:27 -07:00
Matt Lott
0768b533e2 Subs dashboard perf 
Caching older (at least 16 days) Stripe invoices in analytics
collection, which will be updated once a day via the analytics server
cron job.
 2015-07-31 16:19:40 -07:00
gnerkus
835074e5e6 chore (coding tips): Add more quotes for #710 2015-07-31 21:58:10 +01:00
Matt Lott
8fe189f915 Course details page student level progress popups 2015-07-30 16:04:13 -07:00
Matt Lott
59c730ef20 Add aggregate student progress to course details page 2015-07-30 15:30:36 -07:00
Matt Lott
14b4b83148 Move course purchase details off buy button 2015-07-30 13:54:02 -07:00
Matt Lott
c3430ff3e1 Add free teacher trial to course purchase page 2015-07-30 13:54:02 -07:00
Matt Lott
260d062014 🐛Fix courses jquery css typo 2015-07-30 13:54:02 -07:00
Imperadeiro98
574a264daf Uncommented some headers from th.coffee 2015-07-30 21:30:59 +01:00
Auratus
1defff99c1 Update th.coffee 2015-07-31 03:17:21 +07:00
Imperadeiro98
36c018ccf9 Uncommented some headers from th.coffee 2015-07-30 19:46:57 +01:00
Auratus
87a838d128 I am native Thai and already translate some of it. 
I would translate more if I have the time.
BTW, How can I translate "Gems Gained" when it would sound awkward in Thai if it is "5 Gems gained"
and most appropriate translation would be "ได้รับเพชร 5 ชิ้น" - "Gained gem 5 pieces"
 2015-07-31 00:55:16 +07:00
Matt Lott
1eb9162463 Add more course info gameplay screenshots 2015-07-29 16:11:06 -07:00
Matt Lott
c5efdb97e1 Course details mock UI edit dialogs 2015-07-29 16:11:06 -07:00
Matt Lott
2baf18ef56 Course mock UI redeem code dialog 2015-07-29 16:11:06 -07:00
Imperadeiro98
78a1e621f1 Merge pull request #2908 from fabichoi/master 
Translated some words and sentences
 2015-07-29 23:08:11 +01:00
Matt Lott
822d25984f Merge pull request #2910 from trotod/fix-clan-details-style 
Fix clan details style
 2015-07-29 10:22:36 -07:00
Matt Lott
30e8fc2397 Courses: Link to campaigns, add intro course instances 
Courses will now use campaign levels instead of mock data if available.
 At the moment only the first intro course has a campaign specified
(‘intro’).
 2015-07-29 09:51:01 -07:00
Matt Lott
48512060d5 🐛Fix subs dashboard fetch state typos 2015-07-28 15:51:09 -07:00
Michael Revell
4d27c8682c Add names for issue #52 2015-07-26 19:44:07 -07:00
David Liu
3bf3321411 Fix weird styling on clans details page 
- add `display: table-cell` on hero portrait cell
- middle align more things
- `Name` should be a table header
 2015-07-26 12:39:43 -07:00
Nick Winter
653dc16207 Merge pull request #2909 from gnerkus/add-thang-names 
chore (names.coffee): Add more Thang names for #53
 2015-07-26 08:23:25 -07:00
gnerkus
037760e230 chore (names.coffee): Add more Thang names for #53 2015-07-26 15:07:02 +01:00
Nick Winter
1dd5d5c109 Merge pull request #2906 from spkane/loading_tips 
Add a tip for the loading screen #710
 2015-07-26 04:00:06 -07:00
fabichoi
788156564f Translated some words and sentences 2015-07-25 23:10:34 -04:00
Sean P. Kane
d5f81b8f51 Move tip into correct language file 2015-07-25 19:29:13 -07:00
Sean P. Kane
6205ff26ae Add a tip for the loading screen #710 2015-07-25 14:05:32 -07:00
Sean P. Kane
758e40c7f6 Added a few more names for issue #53 2015-07-25 13:46:41 -07:00
Imperadeiro98
3c7b79964f Merge pull request #2903 from fabichoi/master 
Translated some words.
 2015-07-25 20:21:48 +01:00
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07:00
Nick Winter
107f94a08b Fixed another cause of the bug fixed in 0d99b07b with modified levels still granting rewards. 2015-07-24 08:56:20 -07:00
unknown
c3d07e950a modified 2015-07-23 22:43:43 -04:00
Imperadeiro98
aeff90cba9 Re-added a missing string from last merge 2015-07-23 22:20:55 +01:00
dolom
35dcdff3ff Update it.coffee 2015-07-23 22:30:06 +02:00