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)
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
Imperadeiro98
2f9e9b1b67
Merge pull request #2818 from Zleep-Dogg/da-translation
...
A bit of Danish translation pt. 2
2015-06-11 11:24:26 +01:00
Esben Madsen
db25007765
A bit of Danish translation pt. 2
2015-06-11 00:35:56 +02:00
Nick Winter
a85d52ebe2
Made a tabbed interface for Programmaticon V's Vector and standard library documentation.
2015-06-10 15:18:37 -07:00
Nick Winter
bb417e9a97
Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812 .
2015-06-09 11:23:05 -07:00
nemoyatpeace
e0e62271b4
Added Ice Level to terrain generator
2015-06-09 18:30:40 +08:00
Nick Winter
4e08d453b7
Added some code for the glacier world.
2015-06-08 13:20:54 -07:00
Matt Lott
021ff541e4
Add separate school field for teacher survey
2015-06-08 06:39:30 -07:00
Matt Lott
9b37c9f18a
🐛 Fix trial request onclick
2015-06-08 06:27:40 -07:00
Nick Winter
0d99b07bc3
Made it so that high scores and level victories are not achieved when playing changed levels from inside the level editor. Some additions for Nalfar.
2015-06-05 17:02:37 -07:00
Nick Winter
ccd96122e1
Tweaked Nalfar's hero modal positioning.
2015-06-05 15:13:22 -07:00
Matt Lott
02095a8ddd
Update teacher survey email validation
...
Removing restrictive regex matching.
2015-06-05 11:47:12 -07:00
Matt Lott
d7cddcb136
Teacher trial subscription form
...
Add a teacher survey form for applying for a free trial subscription
for evaluation purposes.
Add an admin trial requests review page, where admins can approve/deny
requests.
2015-06-05 06:48:19 -07:00
Matt Lott
54623f5e30
🐛 Fix admin dashboard target line
2015-06-02 07:06:31 -07:00
Cat Sync
a3588b2801
Yellow arrow shouldn't point to disabled levels
2015-06-01 17:39:55 -04:00
Nick Winter
86d7b6c625
Added Uzbek (uz) language stub.
2015-05-25 16:00:32 -07:00
Imperadeiro98
1af308424f
Merge pull request #2774 from Atomk/patch-2
...
Added my username in Italian translators
2015-05-24 12:18:02 +01:00
Cat Sync
b38c7b4978
Next Level arrow shouldn't point to Kithgard Mastery
2015-05-21 11:30:37 -04:00
Marco Fras
6db448b6c6
Added my username in Italian translators
...
Just red on the diplomat forum to do this..
2015-05-20 15:15:34 +02:00
Matt Lott
a881443bf2
🐛 Fix admin dashboard typo
2015-05-15 09:56:06 -07:00
Nick Winter
213a66b2ab
Implemented Arryn.
2015-05-12 16:59:30 -07:00
Matt Lott
dd35a1eb76
Include sponsored cancels in dashboard
...
Also includes free teacher sub cancels, which should be an
insignificant number.
2015-05-08 11:34:59 -07:00
