Commit graph

11297 commits

Author SHA1 Message Date
Matt Lott
49e7506c62 Add parental leave benefits to /about page 2016-04-05 10:14:54 -07:00
Scott Erickson
ebab07d736 Fix /teachers/demo to work when not logged in 2016-04-05 10:01:51 -07:00
Scott Erickson
eba4afec17 Merge remote-tracking branch 'origin/master' 2016-04-05 09:43:46 -07:00
Scott Erickson
932238bb82 Fix /teachers redirect 2016-04-05 09:34:45 -07:00
Matt Lott
4b1486159c Change teacher account convert terminology to update 2016-04-05 09:16:22 -07:00
Matt Lott
133574356a Update /about page
Removing sales positions, adding marketing position
Updating benefits list
2016-04-05 06:29:03 -07:00
Matt Lott
69b999866e 🐛Ignore parse error in updateCloseIoLeads.js 2016-04-04 18:37:04 -07:00
Matt Lott
a686021a8a Update courses getting started guide 2016-04-04 16:11:27 -07:00
phoenixeliot
c826543b40 Remove kinda broken enrollment stats (temporary) 2016-04-04 16:09:58 -07:00
phoenixeliot
beb53d9f2f Various fixes and changes to teacher-accounts and teacher-dashboard 2016-04-04 15:42:29 -07:00
Scott Erickson
58a5df7a4f Restrict teacher and student accounts to their respective areas and actions 2016-04-04 15:20:34 -07:00
phoenixeliot
4a72ffc185 Implement all of teacher-dashboard 2016-04-04 15:19:27 -07:00
Scott Erickson
bd3a77da9f Implement teacher accounts 2016-04-04 15:18:06 -07:00
Imperadeiro98
5e2c726a2b Merge pull request #3506 from rafaelkan/patch-2
Update es-ES.coffee
2016-04-03 18:12:56 +01:00
Imperadeiro98
cf9fabafa0 Merge pull request #3524 from Ikuyadeu/patch-1
Update ja.coffee
2016-04-02 11:15:00 +01:00
Yuki Ueda
476b26fca2 Update ja.coffee 2016-04-02 18:14:30 +09:00
Matt Lott
f37e2ad93e Update code language usage script 2016-04-01 14:40:18 -07:00
Scott Erickson
b01ab2eab1 Merge pull request #3521 from Kinzeng/master
Thang names
2016-04-01 09:29:26 -07:00
Kevin Zhang
fc41c0c52a added Thang names 2016-04-01 01:12:35 -04:00
Kevin Zhang
8455bb2270 added Thang names 2016-04-01 01:07:39 -04:00
Imperadeiro98
b844fa034e Merge pull request #3520 from Ikuyadeu/patch-1
Update ja.coffee
2016-03-31 20:16:08 +01:00
Matt Lott
918915813f Rewrite updateCloseIoLeads.js
Moving user-specific information from customized fields to activity
notes
Lots of data reformatting and renaming
Lots of perf/readability improvements via async.parallel
2016-03-31 09:23:38 -07:00
Yuki Ueda
08fb5baf17 Update ja.coffee 2016-03-31 18:47:41 +09:00
phoenixeliot
719ff80b2f Ignore .editorconfig and coffeelint.json until we standardize them 2016-03-30 14:25:57 -07:00
Scott Erickson
c2f17edaea Rewrite concurrent prepaid test
This test has been unstable, possibly because it was using one request instance to fire off
requests for many users. Rewrote using generators and multiple request instances with
separate cookie jars. For #3469.
2016-03-30 12:00:12 -07:00
Scott Erickson
43389ac9b6 Merge pull request #3471 from delftswa2016/loggedIn-achievement-error
Error when accessing achievement without being logged in
2016-03-30 09:41:01 -07:00
Rob
f10bcd632c Add esper support 2016-03-29 23:27:27 -07:00
Rob
e40b952ef2 Do something slightly better for loged in students. 2016-03-29 21:44:59 -07:00
Imperadeiro98
dfdfbf620c Uncomment an header from sk.coffee 2016-03-29 20:24:55 +01:00
Imperadeiro98
322037f47d Merge pull request #3512 from cundamic/patch-20
Update sk.coffee
2016-03-29 20:24:12 +01:00
Imperadeiro98
b65e0d5031 Merge pull request #3511 from cundamic/patch-19
Update sk.coffee
2016-03-29 20:23:20 +01:00
Kevin Zhang
7cf3e77b4c Testing branch commits 2016-03-29 14:18:41 -04:00
Nick Winter
0c40d7fb65 Make addExternalSubs automatically fill in details for most common payment case 2016-03-28 15:34:33 -07:00
Nick Winter
8e3a7915de No more simulations for Elemental Wars 2016-03-28 15:34:19 -07:00
Scott Erickson
996200220f Merge pull request #3508 from codecombat/fix-teacher-quote-scroll
Fix teacher quote page having lots of blank space at the bottom (after submitting the form)
2016-03-28 11:59:56 -07:00
Scott Erickson
6e16248cd8 Merge pull request #3509 from codecombat/header-avatar
Add small avatar to header
2016-03-28 11:17:58 -07:00
cundamic
0b22b6aa93 Update sk.coffee
Translation new_home finished.
2016-03-28 19:04:32 +02:00
cundamic
45b9395c3d Update sk.coffee
Translation new_home II
2016-03-28 11:39:54 +02:00
Imperadeiro98
539d0b01cc Update pt-PT.coffee 2016-03-26 21:38:59 +00:00
cundamic
ba2e92043a Update sk.coffee
translated new _home 1
2016-03-26 17:48:44 +01:00
cundamic
85b2d42cc6 Update sk.coffee
tips translations
2016-03-26 15:49:04 +01:00
Nick Winter
2dc4b17b94 Adjust ladder simulations 2016-03-25 20:01:42 -07:00
Rob Blanckaert
9da65cdcff New homepage variations. 2016-03-25 17:09:58 -07:00
phoenixeliot
0355ea3e1a Add small avatar to header 2016-03-25 16:25:51 -07:00
phoenixeliot
8d254c700a Fix teacher quote page having lots of blank space at the bottom.
This is due to "flying-focus" taking up space at the bottom of the page. This solution is a bandaid. Ideally we have view-swapping logic that contains this type of thing and we just swap out views using one function.
2016-03-25 13:57:26 -07:00
Nick Winter
914e7eb487 Propagate i18n 2016-03-25 10:54:28 -07:00
rafaelkan
da01d7fdba Update es-ES.coffee
Traslate
2016-03-25 01:25:09 +01:00
Maikel Langezaal
3be8220e0a read only message 2016-03-24 14:10:09 +01:00
Imperadeiro98
87a30b74af Merge pull request #3500 from Ikuyadeu/patch-1
Update ja.coffee
2016-03-24 11:21:23 +00:00
Imperadeiro98
5c8d6cc876 Merge pull request #3498 from sake12/master
update pl.coffee
2016-03-24 11:19:15 +00:00