Matt Lott
abc42298c6
Delay MailChimp subscribing after account creation by 30min
2016-05-31 12:30:36 -07:00
Matt Lott
ffcd89d327
Turn off video tutorials for course levels
2016-05-31 10:12:22 -07:00
duybkict
4f369a1e2f
#3138 #3488 refactor UserView, MainUserView
2016-05-31 09:56:55 -07:00
Scott Erickson
734c51780e
Merge pull request #3689 from duybkict/master
...
Update vagrant script to avoid issue with new line character
2016-05-31 09:38:06 -07:00
Duy Trần
f1ace99dad
Vi translation ( #3691 )
...
* 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
2016-05-30 20:58:11 +01:00
Imperadeiro98
ac3ef36a21
Fix es-419.coffee
2016-05-30 20:57:48 +01:00
RUSLAN LÓPEZ CARRO
5f90866efd
Update es-419.coffee ( #3695 )
2016-05-30 20:56:33 +01:00
Imperadeiro98
92e2eaa4cd
Fix some i18n files ( #3696 )
...
Uncomment headers and change translation
2016-05-30 20:24:24 +01:00
Nick Winter
252b9a0448
Pets should only have one name
2016-05-30 10:02:51 -07:00
Louis Robinson
fde005b2c8
Added more names for #53 ( #3692 )
2016-05-30 09:39:38 -07:00
Fabrício Matté
06df1b9485
i18n pt-BR: add translations for code keywords ( #3694 )
2016-05-30 09:33:42 -07:00
Dong殺布沙
25daaead12
Zh han traditional update ( #3690 )
...
* Update zh-HANT.coffee
* Update zh-HANT.coffee
* Update zh-HANT.coffee
* Update zh-HANT.coffee
2016-05-30 09:32:36 -07:00
Kevin Avignon
d6bb496d19
French translation ( #3687 )
...
* Initial work on navigation context
* navigation section completed
* started work in the code section
* code section completed
* started work in the sign up section
* completed work in the sign up section
* common section completed
* general section completed
* work started in play_level section
* work done in play_level section
* work in calendar section started
* work done in calendar section
* work started in account_prepaid
* work in progress in account_prepaid
2016-05-30 09:30:51 -07:00
GrecK0
59eeef75d6
Update es-ES.coffee ( #3677 )
...
Hi,
Several sentences translated to it's spanish version.
Regards!!!
2016-05-30 09:29:31 -07:00
JurianLock
956e91c2f5
Update nl-NL.coffee ( #3674 )
...
Did some user-flow optimizations and some spelling checks.
2016-05-30 09:28:55 -07:00
Ana
3042462080
Update sr.coffee ( #3673 )
...
began translation of skill docs and clans
2016-05-30 09:28:33 -07:00
Nick Winter
34e375be55
Merge branch 'korytsya-patch-6'
2016-05-30 09:27:14 -07:00
Nick Winter
98970fe45c
Merged uk.coffee
2016-05-30 09:27:01 -07:00
duybkict
27f270856a
Merge remote-tracking branch 'upstream/master'
2016-05-28 12:44:51 +07:00
duybkict
72f95843ee
update vagrant script
2016-05-28 12:44:38 +07:00
phoenixeliot
8bb5251797
Fix potential undefined error in logging
2016-05-27 11:27:04 -07:00
phoenixeliot
438e8e426c
Fix potential undefined error in logging
2016-05-27 11:22:33 -07:00
Matt Lott
5fcc3669af
🐛 Revert to css-brunch ^1.7.0
2016-05-27 11:19:50 -07:00
duybkict
ebab0dedec
minor fixes
2016-05-27 10:42:21 -07:00
duybkict
877bea35e7
add new vagrant box "brunchv2", revert npm package upgrades in package.json
2016-05-27 10:41:02 -07:00
duybkict
e3c2947e2d
upgrade brunch related packages to >=2.0.0
2016-05-27 10:40:54 -07:00
Matt Lott
9ce4ac51f0
Role-based hard feature blocks
2016-05-27 10:40:54 -07:00
Matt Lott
d0d3d838ed
Better page titles
...
Also ditching non-production constructor page titles
2016-05-27 09:40:46 -07:00
Matt Lott
72b8674237
Add error message for closeIO.getSalesContactEmail
2016-05-26 17:02:58 -07:00
Matt Lott
4bb3ac1f0a
Replace Anoner with Anonymous
...
Closes #3686
2016-05-26 16:54:24 -07:00
phoenixeliot
9bc35db7a6
Include teacher name in course invite email data
...
In preparation for changing the sendwithus template.
2016-05-26 16:24:13 -07:00
phoenixeliot
c9ece55d49
Fix console.log to log.debug
2016-05-26 16:15:09 -07:00
phoenixeliot
77ba873da9
Add tests for teacher password reset endpoint
2016-05-26 16:07:55 -07:00
Scott Erickson
6b3e94d60a
Remove log
2016-05-26 15:12:10 -07:00
Scott Erickson
7d1d1500d9
Fix course progress tab select
2016-05-26 15:01:23 -07:00
phoenixeliot
dfcbbb7c9c
Log classroom forbidden errors for debugging
2016-05-26 14:54:11 -07:00
Scott Erickson
8f7e4e2278
Add hints to level schema, I18N editor
2016-05-26 14:51:28 -07:00
Scott Erickson
b255b02854
Add POST /db/level/:handle test
...
It's erroring in my dev console, complaining of duplicate keys, and not sure why.
Adding a test to make sure creating a new level version doesn't break.
2016-05-26 14:46:54 -07:00
Nick Winter
feeca7a586
Sending HTML emails now so that Front will eat them
2016-05-26 13:34:36 -07:00
Scott Erickson
3ca32f93a1
Merge pull request #3680 from duybkict/vagrant-brunch-v2
...
Add vagrant box for brunch v2
2016-05-26 11:12:41 -07:00
Scott Erickson
886ddd381d
Add getPrepaidsFor script for updating start/end dates
2016-05-26 10:50:48 -07:00
Matt Lott
770987715e
Update under 13 account creation copy
2016-05-26 10:02:25 -07:00
Bryukhanov Valentin
7e958639b2
Add choice method in rand ( #3682 )
...
As in python random module. It can be useful for levels instead "someArray[@world.rand.rand(someArray.length)]".
2016-05-26 09:44:50 -07:00
duybkict
38ebd6111d
minor fixes
2016-05-26 16:52:57 +07:00
duybkict
36fdd79b6a
add new vagrant box "brunchv2", revert npm package upgrades in package.json
2016-05-26 15:44:35 +07:00
duybkict
6e36a4abc4
Merge branch 'master' into vagrant-brunch-v2
...
# Conflicts:
# package.json
2016-05-26 10:50:40 +07:00
Matt Lott
de9761073d
Temporarily disable /contact server test
2016-05-25 16:54:14 -07:00
Matt Lott
6246ac0955
Send request licenses emails to Close.io sales contact
2016-05-25 16:03:08 -07:00
Scott Erickson
106057b99d
Make jasmine server test timeout longer
...
A production travis test failed because of a timeout:
https://travis-ci.org/codecombat/codecombat/builds/132905284
Timeout used to be two minutes for Stripe tests, was removed after those were nocked,
now turning back on somewhere to somewhere in between.
2016-05-25 14:48:54 -07:00
Scott Erickson
673c608d5a
Add deteacher script
2016-05-25 14:46:07 -07:00
