phoenixeliot
c191f63c15
Revert all of my sendwithus changes
...
Revert "Fix more sendwithus things"
This reverts commit 9d4215d99d08bc32e005fcb2ce850481d9e19221
2016-06-06 16:54:15 -07:00
phoenixeliot
9d4215d99d
Fix more sendwithus things
2016-06-06 16:48:21 -07:00
phoenixeliot
08bc32e005
Fix some missed sendwithus changes
2016-06-06 16:38:20 -07:00
phoenixeliot
fcb2ce8504
Fix email tests
2016-06-06 16:00:46 -07:00
phoenixeliot
81d9e19221
Use SendWithUs versioning
2016-06-06 15:53:11 -07:00
Scott Erickson
be78f4049c
Fix adding inventory items to hero in level editor
...
Was only happening when HeroPlaceholder had HasPet component.
Presumably because the collection was loaded by HasPet, but the thang node
for the inventory node needed to populate its autocomplete array.
2016-06-06 15:35:10 -07:00
Scott Erickson
53a7510c46
Remove logs
2016-06-06 14:30:58 -07:00
Scott Erickson
891d0fe12f
Fix TeacherClassView sometimes not loading
...
This was a race condition where the view would trigger a render
before courses loaded, and the template required them when it had
some of its other resources.
2016-06-06 13:55:37 -07:00
Matt Lott
33b614911c
Support alternate NL spelling in lead import automation
2016-06-06 13:43:52 -07:00
phoenixeliot
d9959db856
Fix sending invitation emails
2016-06-06 13:43:41 -07:00
phoenixeliot
0d4a88a957
Strip spaces in classCode on fetch and join
2016-06-06 11:30:20 -07:00
Ana
5da85621c6
Update sr.coffee ( #3714 )
...
- translation of contact, acc settings, community and clans sections + some other stuff
2016-06-05 14:47:27 +01:00
JurianLock
189f9fa7af
Update nl-NL.coffee ( #3713 )
...
Some UX updates and some minor spelling checks.
2016-06-05 14:46:19 +01:00
Matt Lott
a6bb706cf2
Update licenses needed form email contacts to include NL
2016-06-03 20:20:19 -07:00
phoenixeliot
0d5ad789e5
Add time played to level progress tooltips
2016-06-03 16:52:59 -07:00
Scott Erickson
7a0fb967f0
Add clearer reports to client TestView
2016-06-03 16:26:03 -07:00
Scott Erickson
3f8272afe9
Switch Promise polyfill to bluebird
2016-06-03 15:57:30 -07:00
Scott Erickson
8e64a3b244
Add Promise polyfill
...
To allow using Promises while still supporting IE11
2016-06-03 14:41:54 -07:00
Rob
2ef10f58b3
Fix bug where visual indents couldn't nest.
2016-06-03 14:01:37 -07:00
Scott Erickson
b3663196d7
Fix CourseVictoryModal.spec
2016-06-03 13:40:41 -07:00
Scott Erickson
705463615b
Fix some intermittent client erroring
...
Some tests are triggering achievement polling. Prevent that from happening.
2016-06-03 13:40:41 -07:00
phoenixeliot
870ae9a8a1
Add hero selector for courses mode
...
Use selected hero in Course mode play
Show selected hero on Courses (in progress)
Add hero select modal
Use short names, only show warriors
Use box-shadow instead of borders
Add tests for HeroSelectModal
Refactor modal opening test
Address code review feedback
2016-06-03 13:40:41 -07:00
Scott Erickson
5e1942c0d3
Fix adding levels to campaigns
2016-06-03 13:30:56 -07:00
Imperadeiro98
e8896e4d49
Uncomment header in de-AT.coffee
2016-06-03 20:03:09 +01:00
Oliver Harald Jessner
6829d60b80
Did more translations ( #3711 )
...
- Finished the code section
- Finished general section
- nearly finished the play section
- Still don't understand which/what kind of `"Poll" # Tooltip on poll button from /play` is meant.
2016-06-03 20:02:26 +01:00
Scott Erickson
f6f941b13d
Merge pull request #3705 from duybkict/refactor-LadderView
...
refactor LadderView
2016-06-03 10:21:28 -07:00
Imperadeiro98
5a6fe46b22
Uncomment an header in de-AT.coffee
2016-06-03 14:25:20 +01:00
Oliver Harald Jessner
a12c9402f4
Adding some German words ( #3699 )
...
In some strings the contexts are missing, so its hard to translate.
2016-06-03 14:23:46 +01:00
Rob
8d2df0baff
Kill some console logs @poojawins
2016-06-02 20:17:52 -07:00
duybkict
e7f221813e
remove constructor, handle load async process
2016-06-03 09:23:35 +07:00
duybkict
b88ca10f21
Merge branch 'master' into refactor-LadderView
2016-06-03 09:06:58 +07:00
Rob
3485abd413
Don't show indent guides for incorrect python indention.
2016-06-02 18:46:47 -07:00
Matt Lott
51a37d9edc
Update licenses contact us form email routing
2016-06-02 15:32:54 -07:00
phoenixeliot
ae3b8057f7
Detect URL classCode in createAccountModal
2016-06-02 12:51:05 -07:00
Matt Lott
50ee20d3ae
Send teacher contact us form emails through Close.io
2016-06-02 11:13:52 -07:00
Scott Erickson
13ca4a6174
Fix intermittent CreateAccountModal error
...
AuthModal spec was loading the G+ API during tests, which
caused G+ to get unhappy when CreateAccountModal mocked it.
2016-06-02 10:59:45 -07:00
Duy Trần
3c2e3e37d4
Vi translation ( #3703 )
...
* Translate into Vietnamese
* Translate and edit some Vietnamese strings
* update Vietnamese translate
* try to fix some error
* fix bugs with tab character
* update vi.coffee: play_level
* Update vi.coffee
* update vi.coffee
* update text on Home page
* Vietnamese: update legal
* vi.coffee: edit community page
* vi.coffee: update user's page
* vi.coffee: about page
* update vi.coffee
* update vi.coffee
* vi.coffee: invoices
* vi.coffee: account_prepaid
* update vi.coffee
* vi.coffee: error strings
* Update vi.coffee
* update vi.coffee
* vi.coffee: update contact form
* vi.coffee: minor update
* vi.coffee: update about page, modify some strings
* update vi.coffee
* vi.coffee: minor update
* no message
* Update vi strings, fix minor bug in page /community
* vi.coffee: update Adventure and Artisan
* vi.coffee: update Adventurer
* vi.coffee: reverse changes
* vi.coffee: reverse changes
* vi.coffee: update some strings
* vi.cofffe: update Diplomat
* vi.coffee: update Diplomat
* vi.coffee: update descriptions of classes
* vi.coffee: update Ambassador
* remove .cleafix div, will fix in another branch
* refactor ClansView #3138 #3488
* use initialize() in ClansView #3138 #3488
* update vi.coffee
* update vi.coffee
* exclude changes on ClansView
* vi.coffee: update play screen
* vi.coffee: update some strings
* vi.coffee: update createClass form
* vi.coffee: modify some strings on home page and teachers page
* minor fix
* vi.coffee: update some strings
2016-06-02 18:58:29 +01:00
phoenixeliot
18138ec6ae
Fix typo
2016-06-02 10:55:48 -07:00
phoenixeliot
7dc490bbcb
Add Create Account button to student-only pages
2016-06-02 10:28:10 -07:00
Scott Erickson
5e8b402c3d
Switch POST /db/classroom/:id/invite-members to refactored version
2016-06-02 10:27:20 -07:00
Scott Erickson
6e48d700bc
Merge branch 'update-invite-to-classroom'
...
Work was duplicated. Merging in changes from branch, but leaving
the master version as is in this commit.
2016-06-02 10:20:19 -07:00
Scott Erickson
bd64764b6c
Merge pull request #3704 from duybkict/refactor-MainLadderView
...
refactor MainLadderView
2016-06-02 10:08:20 -07:00
duybkict
a9d9a67383
refactor LadderView
2016-06-02 15:44:19 +07:00
duybkict
215ff1faaf
refactor MainLadderView
2016-06-02 14:54:00 +07:00
Rob
c20ee729ca
Merge branch 'bug-smash'
2016-06-01 16:45:01 -07:00
Rob
bd57121f63
Fix algolia-autocomplete.js version
2016-06-01 15:11:19 -07:00
Scott Erickson
1f3eed9a4e
Remove focus
2016-06-01 10:01:41 -07:00
Scott Erickson
b143d552ce
Write test, verifying removeFromClassrooms handles sessionless requests
2016-06-01 10:01:05 -07:00
Scott Erickson
ee0195ab21
Require req.user in all /db routes
2016-06-01 09:53:28 -07:00
Rob
c08d426c6b
Use cloudflare for analytics so we get the correct SSL cert.
2016-05-31 19:56:37 -07:00
