Commit graph

2700 commits

Author SHA1 Message Date
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
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
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
Nick Winter
07f81755b0 Added deprecation message to old arenas, highlighting new hero arenas instead. 2015-07-07 11:43:38 -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
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
Matt Lott
af612afcdd Mock course UI show last expanded complete level 2015-07-01 15:36:33 -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
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
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
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
Matt Lott
e36cf0ca3f Initial courses mock UI
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07: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
39f8a8a8af Fixed #2870. 2015-06-29 11:13:15 -07: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
Lai Tuan
1453c132fe Fixes #2806 2015-06-25 23:58:12 +09:00
tahmidshahriar
f6a35f1fd4 Fixed not found page (got rid of NotFoundView in core) 2015-06-24 14:49:26 -07:00
tahmidshahriar
6ac3ea9f5f Fixed not found page 2015-06-24 14:46:59 -07:00
Lai Tuan
7c680e4efa Removed 'this' and 'tempThis' 2015-06-21 02:09:44 +09:00
Lai Tuan
39fc882303 Require user password for deleting accounts #2842 2015-06-20 23:12:26 +09:00
Matt Lott
d632119a6c Add 6 month graph to admin dashboard 2015-06-19 13:49:19 -07:00
Nick Winter
8ef4a9ddde Merge pull request #2830 from arthurnn/master
i18N press enter on spell view
2015-06-18 18:37:24 -07:00
Nick Winter
6a4efa9a21 Switching to Boom and Bust as first level of the forest. 2015-06-17 18:17:14 -07:00
Matt Lott
5fb8b18a31 🐛Fix managed subs next payment UI 2015-06-17 16:35:30 -07:00
Nick Winter
593f7a9dd7 Some improvements for handling new art. 2015-06-16 13:50:33 -07:00
Arthur Neves
6cb673e228
i18N press enter on spell view 2015-06-14 23:20:49 +02:00
Nick Winter
7d637a0a27 Added a couple levels' next-campaign links. 2015-06-14 11:07:21 -07:00