Commit graph

6872 commits

Author SHA1 Message Date
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
Imperadeiro98
3d9c7927ea Update pt-PT.coffee 2015-07-23 17:37:49 +01:00
Imperadeiro98
015ed33dbe Updated i18n of delta.jade 2015-07-23 17:35:22 +01:00
Matheus Marques
24d599dcdd Translated some descriptions 2015-07-23 01:50:13 -03:00
bileuze
c88d8f1666 Update pt-BR.coffee 2015-07-22 14:16:35 -03:00
Imperadeiro98
1b077b2456 Fixed previous merge 2015-07-22 17:59:29 +01:00
Shady Kamal
10afbebe70 Update he.coffee
+I'm back
+add tips translation
+add partial "clans" new feature localization (see notes in code)
2015-07-22 17:21:28 +03:00
Cat Sync
11aeb05e66 Limit to showing 6 concepts. For now, show the last 6 in the array. 2015-07-21 13:28:13 -04:00
Imperadeiro98
b6cbf84f48 Some fixes to last merge 2015-07-20 16:53:28 +01:00
Imperadeiro98
3d105f51ce Merge pull request #2892 from Abdel-Malik13/patch-2
Traduction de l'anglais vers l'arabe
2015-07-20 16:51:29 +01:00
Imperadeiro98
08409f3a3b Merge pull request #2896 from itcbx/master
i18n for zh-HANS
2015-07-20 11:37:19 +01:00
Imperadeiro98
8b31415c9b Merge pull request #2894 from sake12/master
Updated polish translation
2015-07-19 19:53:49 +01:00
Imperadeiro98
1961d786cc Fixed last merge 2015-07-19 19:50:24 +01:00
Imperadeiro98
41a00d0090 Merge pull request #2893 from Abdel-Malik13/patch-1
Traduction d'une ligne non traduite.
2015-07-19 19:48:43 +01:00
itcbx
478efd82d7 I18n for zh-HANS
I18n for zh-HANS
2015-07-19 23:44:36 +08:00
itcbx
eea2f511ba i18n for zh-HANS
i18n for zh-HANS
2015-07-19 09:54:21 +08:00
Christelle
0e8c578562 Update fr.coffee 2015-07-18 05:11:03 -04:00
sake12
6c66c782e4 pl.coffee: Translation update 2015-07-18 00:27:22 +02:00
sake12
6e6fda889f Updated polish translation 2015-07-16 01:40:12 +02:00
Abdel-Malik
f5ec107fb0 Traduction de l'anglais vers l'arabe 0.5
Traduction supplémentaire, il reste quelques erreurs de traduction, je les modifierai plus tard si personne ne le fait :)
2015-07-15 12:43:28 +02:00
Abdel-Malik
5e5d4d6445 Traduction de l'anglais vers l'arabe 0.4 2015-07-15 12:26:06 +02:00
Abdel-Malik
901c1e4c56 Traduction de l'anglais vers l'arabe 0.3
Ajout de traducton
2015-07-15 11:58:53 +02:00
Abdel-Malik
b177f63b4e Traduction de l'anglais vers l'arabe 0.2 2015-07-15 11:43:34 +02:00
Abdel-Malik
69d21e279e Traduction de l'anglais vers l'arabe
Si il y a des problèmes au niveau de la traduction, n'hésitez pas à modifier :)
2015-07-15 11:33:48 +02:00
Abdel-Malik
50e4eb5769 Update fr.coffee 2015-07-15 11:23:14 +02:00
Matt Lott
e70b8b8652 Add sorting to course details mock UI 2015-07-10 17:11:16 -07:00
Matt Lott
49a75d2d42 Update course info mock UI 2015-07-10 17:11:16 -07:00
Nick Winter
899aae5798 Consolidated extra resources. 2015-07-10 14:20:25 -07:00
Nick Winter
bcbffd1f65 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-07-10 12:54:25 -07:00
Nick Winter
929455b234 Fixed bug with heroes not loading the proper amount of gems. 2015-07-10 11:13:31 -07:00
Matt Lott
0b714e98d1 Update course info mock UI 2015-07-10 11:04:52 -07:00
Matt Lott
57f869379d Add student view to course details mock UI 2015-07-10 10:37:41 -07:00
Nick Winter
7173fd367f Re-enabled gutter highlights for executing code. 2015-07-10 09:39:08 -07:00
Matt Lott
0a2248393d Update course details mock UI
Add student concepts progress.
Add level status and concepts covered.
Add mostly working level Play button.
2015-07-09 17:53:35 -07:00
Nick Winter
36d3b8e910 Highlighting entry points is working pretty well, at least in Python through the forest. 2015-07-09 15:05:35 -07:00
Nick Winter
4f443efd8b First draft of logic to work out where the code entry points should be. 2015-07-09 12:47:07 -07:00
Nick Winter
dfa0de7521 Bad testing version of code entry point arrow numbering. 2015-07-09 11:45:11 -07:00
Matt Lott
6831355649 🐛Fix subs dashboard monthly churn and perf
Use Stripe events API to calculate monthly churn.
Move Stripe API page handling to the client.
2015-07-08 17:34:34 -07:00
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
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
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
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
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
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
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
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
Matt Lott
e36cf0ca3f Initial courses mock UI
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07:00
Imperadeiro98
e932d27242 Merge pull request #2871 from SuperPranx/patch-1
Added new translations and modified existing ones
2015-06-29 20:05:49 +01:00
Matt Lott
8c6fd49f43 Clans view class name typo 2015-06-29 11:51:38 -07:00
Nick Winter
11d69880f7 Merge pull request #2868 from UltCombo/required-rings
Improved `updateLevelRequiredItems` logic regarding rings, fixes #2740
2015-06-29 11:19:04 -07:00
Nick Winter
ba3a1dd3df Merge pull request #2869 from UltCombo/2828
fix #2828
2015-06-29 11:14:09 -07:00
Nick Winter
39f8a8a8af Fixed #2870. 2015-06-29 11:13:15 -07:00
Nick Winter
d7f88c3d95 Merge pull request #2856 from laituan245/for2854
Fixes #2854
2015-06-29 11:03:47 -07:00
tahmidshahriar
4d8c539b2c Merge remote-tracking branch 'upstream/master' 2015-06-29 09:51:26 -07:00
Ivan Milanov
c7dc30ea64 Added new translations and modified existing ones 2015-06-29 17:23:13 +02:00
Imperadeiro98
d4f1fcaaed Added i18n 2015-06-28 11:43:56 +01:00
Imperadeiro98
f4e54d4f54 Updated i18n in add system 2015-06-28 11:43:53 +01:00
UltCombo
cc8b8fa8be fix #2828 2015-06-28 00:32:08 -03:00
UltCombo
63299c4d80 Improved updateLevelRequiredItems logic regarding rings, fixes #2740
This fixes the main issue of #2740, allowing the player to play the level if the required ring is equipped on either ring slot.

There's still a small problem: if the player already had a ring equipped in the `right-ring` slot, the Ring of flowers will not display as required due to this [line](0df6da7efa/app/views/play/menu/InventoryModal.coffee (L436)). This seems to be a different issue though, probably related to the `unequipLevelRestrictedItems` logic.
2015-06-27 22:22:37 -03:00
Imperadeiro98
5eed3361f3 Updated i18n 2015-06-27 12:40:48 +01:00
Imperadeiro98
737dd56754 Updated i18n in save-version-modal.jade 2015-06-27 12:40:41 +01:00
Imperadeiro98
d868894845 Updated i18n in play-account-modal.jade 2015-06-27 12:39:42 +01:00