codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11859 commits 27 branches 0 tags 134 MiB
Commit graph

8710 commits

Author SHA1 Message Date
Nick Winter
89db933c90 Change wording on enrollment purchase page for larger purchases 2016-04-27 14:17:53 -07:00
phoenixeliot
84ec2d630f Make some Course materials teacher-only on dashboard 2016-04-27 13:24:54 -07:00
phoenixeliot
1999b41ff3 Don't convert to teacher automatically in EnrollmentsView 2016-04-27 13:20:19 -07:00
Imperadeiro98
9433cefcdc Merge pull request #3579 from i32ropie/master 
Update es-ES.coffee
 2016-04-27 18:21:04 +01:00
Imperadeiro98
404171fd23 Merge pull request #3582 from KonstantinLA/patch-3 
Update ru.coffee
 2016-04-27 18:07:32 +01:00
Imperadeiro98
de23d178c2 Merge pull request #3578 from ana-esova/patch-1 
Update sr.coffee
 2016-04-27 18:04:27 +01:00
Scott Erickson
675e3290ac Lock course content to classrooms 2016-04-27 09:58:04 -07:00
KonstantinLA
17fa7226e5 Fix build error 2016-04-27 16:06:21 +03:00
KonstantinLA
6868f1f7e4 Fix placeholder for the subscribe module 2016-04-27 15:52:59 +03:00
KonstantinLA
8000cdc139 Update ru.coffee 
Added russian translation. 
Some fixes
 2016-04-27 15:34:06 +03:00
phoenixeliot
c9ed76471a Add bad translations to Portuguese for testing purposes 2016-04-26 16:37:47 -07:00
phoenixeliot
7c1059bffa Fix code review feedback 
Fix code review feedback (2)

Fix code review feedback (3)
 2016-04-26 16:37:36 -07:00
phoenixeliot
66f99dd834 Add translation tooltips for code 
Tweak tooltips, add some translation keys

Fixed not showing translations for English-speakers

Remove comment
 2016-04-26 16:37:07 -07:00
phoenixeliot
aa93a3ec6c Translate spell type (function/method/snippet/etc) 2016-04-26 16:37:06 -07:00
phoenixeliot
02d833639b Make LevelComponent names translatable, show spell name translations in doc tooltips 2016-04-26 16:37:06 -07:00
Rob
70999fa150 Track when COPPA dialog is shown. 2016-04-26 16:31:51 -07:00
Rob
4e630362ce - Switch to flat modal 
- Diffuse test time bomb
 2016-04-26 14:35:07 -07:00
Rob
5bd8f7a1cb COPPA tests. 2016-04-26 14:01:03 -07:00
Rob
4183764b61 Add birthday field to user that rejects users under 13 on signup. 2016-04-26 14:00:49 -07:00
Matt Lott
283c874496 Update /privacy COPPA section 2016-04-26 11:20:47 -07:00
Josh Callebaut
c6cbcd4777 Merge pull request #3395 from Zerrien/spade 
Implements Spade functionality, and adds the sublime project file.
 2016-04-26 11:15:17 -07:00
Josh Callebaut
c4652d82e2 Implements the SPADE logger into the SpellView 
* Updates spade.js vendor file, adds a sublime-project for developers to use
* Moves server logic away from handlers
* Moves session update logic to middleware, sets up server schema to autorender IDs as ObjectIDs
* Modernizes the supermodel loading scheme and switches from constructor to initalize
 2016-04-26 09:56:30 -07:00
Scott Erickson
3c715ceba8 Merge pull request #3562 from edtrist/PauseModalVideo 
Pause help videos when guide modal is not visible
 2016-04-26 09:39:12 -07:00
Eduardo Roldan
0c49e9d175 Update es-ES.coffee 2016-04-26 14:37:46 +02:00
Nick Winter
e4392019a4 Fix console.warning -> console.warn typo 2016-04-25 17:25:30 -07:00
Nick Winter
e96f4651f2 Add basic listening for code problems to Verifier 2016-04-25 17:03:08 -07:00
edtrist
405fbeabf8 use view jquery 2016-04-25 22:19:28 +01:00
Scott Erickson
e8d0ec08cb Merge pull request #3572 from UltCombo/i18n-subscription-modal 
Update subscribe modal's style to support i18n, fixes #3526
 2016-04-25 13:22:18 -07:00
Scott Erickson
92f58b29b0 Merge branch 'i18n-subscription-modal-interpolate' of https://github.com/UltCombo/codecombat into UltCombo-i18n-subscription-modal-interpolate 2016-04-25 12:28:46 -07:00
Ana
cd9c2dfccb Update sr.coffee 2016-04-24 21:56:46 +02:00
Ana
51a3eee697 Update sr.coffee 
Translated more sections and fixed some previous lines~
 2016-04-24 21:45:09 +02:00
Imperadeiro98
814c78be8b Uncomment headers from sr.coffee 2016-04-24 14:45:08 +01:00
Imperadeiro98
582abb0d87 Merge pull request #3568 from ana-esova/patch-1 
Update sr.coffee
 2016-04-24 14:42:42 +01:00
Imperadeiro98
4fe258fe7f Merge pull request #3576 from KonstantinLA/patch-2 
Update ru.coffee
 2016-04-24 14:41:10 +01:00
Imperadeiro98
b17c0b9785 Merge pull request #3575 from UltCombo/i18n-pt-br-newhome 
i18n pt-BR: add and improve some `new_home` translations
 2016-04-24 14:40:24 +01:00
Imperadeiro98
53f1216878 Merge pull request #3573 from Ikuyadeu/patch-1 
Update ja.coffee
 2016-04-24 14:39:18 +01:00
Imperadeiro98
a5a56f5085 Merge pull request #3569 from JurianLock/patch-9 
Update nl-NL.coffee
 2016-04-24 14:38:25 +01:00
Imperadeiro98
31d42f3132 Merge pull request #3567 from KonstantinLA/patch-1 
Update ru.coffee
 2016-04-24 14:36:58 +01:00
KonstantinLA
a7cb7a6207 Update ru.coffee 
Added russian translation
 2016-04-24 14:13:53 +03:00
UltCombo
fdb8b4ffeb i18n pt-BR: add and improve some new_home translations 2016-04-24 02:41:31 -03:00
Yuki Ueda
25bd614f9d Update ja.coffee 2016-04-24 11:38:23 +09:00
UltCombo
0ad2d086eb subscribe modal: interpolate feature values for all languages 2016-04-23 22:57:10 -03:00
Matt Lott
93194d4f1e Change top nav Courses link to Students 2016-04-23 16:54:24 -07:00
UltCombo
304cdc1113 Update subscribe modal's style to support i18n, fixes #3526 
Subscribe modal: make the "parent" and "sale" buttons take only as much space as necessary and the "subscribe" button takes all the remaining space, this fixes #3526.

Here's how the new style looks:

### Before
![](http://i.imgur.com/uwt9Jed.png)
![](http://i.imgur.com/1VKdJjZ.png)

### After
![](http://i.imgur.com/2ElCHMT.png)
![](http://i.imgur.com/G4EAi1P.png)
 2016-04-23 19:11:54 -03:00
Matt Lott
7a49eb4c77 Update /about Nolan png 2016-04-22 09:23:30 -07:00
JurianLock
156f53b0a0 Update nl-NL.coffee 2016-04-22 15:58:03 +02:00
Ana
7fcc5c9ae7 Update sr.coffee 
-Prevedene nove stvari, par grešaka u pisanju ispravljeno
-Sekcija o uplatama je pisana u 2. licu množine (formalno), mada mogu prepraviti na 2. lice jednine, kao i za ostale sekcije što je pisano ranije
 2016-04-22 15:31:03 +02:00
KonstantinLA
eab0712b75 Update ru.coffee 
Translate nav module
 2016-04-22 16:10:18 +03:00
Imperadeiro98
37e4976a0f Merge pull request #3566 from qinwenshi/master 
Add Chinese translation for teachers
 2016-04-22 13:08:11 +01:00
Matt Lott
b5f6fef862 Update /about benefits copy 2016-04-21 20:55:20 -07:00
Matt Lott
4a7518ca6f Add new team members to /about 2016-04-21 20:45:13 -07:00
Wen
d8793a315c Add Chinese translation for teachers 2016-04-22 11:34:13 +08:00
Rob
9fec6f6613 Don't break jQuery-UI autocomplete with algolia's 2016-04-21 11:21:11 -07:00
Yuki Ueda
5280470af6 Update ja.coffee 2016-04-21 16:06:30 +09:00
Scott Erickson
a452f1ce47 Update teacher trial request views, some related bug fixes 
* Tweak wording, options
* Instead of storing changes in local storage, warn when users may lose changes by navigating away
* Fix CreateTeacherAccountView so that if you connect to an existing account, the redirect is triggered
* Fix users.coffee weird race condition
 2016-04-20 16:30:11 -07:00
Rob
67686e8c71 Add district complete to teacher convert page. 2016-04-20 10:37:00 -07:00
Rob
f79a9b96bf Add district picker to teachers/signup 2016-04-20 10:29:59 -07:00
edtrist
fb15c0bf94 Pause help videos when guide modal is not visible 2016-04-20 00:38:44 +01:00
phoenixeliot
b4b435283b Don't clear me before tests (needs more thought) 2016-04-19 13:10:45 -07:00
phoenixeliot
79d4fc3126 Merge branch 'dashboard-bugfixes' 2016-04-19 12:36:36 -07:00
phoenixeliot
e2d08fa7cf Stuff 
Partially fix ActivateLicensesModal.spec

[IN PROGRESS] Don't display deleted users

Move userID to classroom.deletedMembers on user delete (not retroactive)

Fix PDF links for course guides, remove old PDFs from repo

Remove deprecated SalesView

Remove underline for not-yet-linked student names

Only show class select when there's more than one

Ignore case when sorting student names

Use student.broadName instead of name for display and sorting

Fix initial load not showing progress after joining a course (hacky)

Fix text entry for enrollment number input

Fix enrollment statistics

Fix enrollment stats completely (and add back in per-class unenrolled count)

Add deletedMembers to classroom schema

More fixes to enrollment stats (don't count nonmember prepaids)

Don't use 0 as implicit false for openSpots

Update suggested number of credit to buy automatically

Fix classroom edit form ignoring cleared values

Add alert text when more users selected than enrollments available

Alert user when trying to assign course to unenrolled students

Alert user when assigning course to nobody

Add some tests for TeacherClassView bulk assign alerts

Fix TeacherClassView tests failing without demos

Use model/collection.fakeRequests :D

Remove unused comment

Fix handling of improperly sorted deleted users on clientside

Add test for moving deleted users to deletedMembers

Add script for moving all deleted classroom members to classroom.deletedMembers

Completely rewrite tallying up enrollment statistics

Fix some tests to not be dependent on logged-in user

Address PR comments

Fix default number of enrollments to buy

Fix i18n for not enough enrollments

Use custom error message for classroom name length
 2016-04-19 12:32:20 -07:00
phoenixeliot
3ed835639e Compress jumbotron by 10% 2016-04-19 10:38:58 -07:00
Rob
988eeeeb07 Merge branch 'school-complete' 2016-04-18 23:35:50 -07:00
Rob
8d61c4387d Clear NCES data if complete data is manually edited. 2016-04-18 23:33:59 -07:00
Rob
e64d585841 Add extra information when a school is autocompleted. 2016-04-18 22:54:43 -07:00
phoenixeliot
70762f15cc Clear window.me before running tests 2016-04-18 14:32:33 -07:00
Imperadeiro98
d07a3394d1 Update pt-PT.coffee 2016-04-18 19:00:25 +01:00
edtrist
b63bf06bed Added server error subscription to AuthModal 2016-04-18 02:12:42 +01:00
Nick Winter
d739fbef9b Fix #3519; restricting importScripts has always been buggy and we probably don't need it 2016-04-17 17:32:37 -07:00
levrawonline
899422ef7f Update es-419.coffee 2016-04-17 16:17:03 -03:00
Nick Winter
15d762e93e Propagate i18n; remove newlines in en.coffee so that other locale files' line numbers will match 2016-04-16 18:11:22 -07:00
Nick Winter
43a1dcad2b Merge da.coffee 2016-04-16 18:07:39 -07:00
Nick Winter
1ceb7f2573 Merge nl-NL.coffee 2016-04-16 18:06:49 -07:00
Nick Winter
439e7bbcab Remove Errorception 2016-04-16 17:34:55 -07:00
Catsync
b90f1fb18f Hack to use hero instead of self/this in SpellPalette docs (#3552) 
Hack to change SpellPalette docs to use hero instead of self/this
 2016-04-16 14:59:18 -07:00
Nick Winter
e3e3807844 Use jQuery version of Algolia autocomplete 2016-04-15 17:48:31 -07:00
Scott Erickson
ecf6cd7054 Fix Travis tests 2016-04-15 15:36:35 -07:00
Rob
e7356411fb Autocomplete names of schools on quote page. 2016-04-15 14:00:36 -07:00
phoenixeliot
4b6dde9809 Unbreak non-course campaign for teachers 2016-04-15 13:39:11 -07:00
phoenixeliot
c3da6a23c9 Change isTeacher checks to isSessionless for /play 2016-04-15 10:58:52 -07:00
Scott Erickson
d5662fa2c9 Add fakeRequests array to models and collections during client tests 
So you don't have to find the request through jasmine-ajax's functions.
 2016-04-14 15:26:29 -07:00
cundamic
6885de36fc Update sk.coffee 
subscription
 2016-04-14 06:51:20 +02:00
Rob
ceb64ce9ca Improve verifier. 2016-04-13 16:41:16 -07:00
phoenixeliot
0416528de0 Fix language-getting for next level URL on teacher courses play 2016-04-13 16:32:39 -07:00
Catsync
7ff12f326f Merge pull request #3548 from Catsync/autocomplete-hero 
hero autocomplete hack
 2016-04-13 14:59:21 -04:00
cundamic
0dc913ba78 Update sk.coffee 
translated 1-447
 2016-04-13 17:59:24 +02:00
phoenixeliot
a524256b5b Add sessionless play for Teachers 2016-04-12 19:34:05 -07:00
Nick Winter
a7114a2719 Implement headless verifier; fix headless client 2016-04-12 19:34:05 -07:00
Nick Winter
5949cf51f0 Merge pull request #3513 from UltCombo/beautifier-loop 
JS beautifier: fix loop construct, fixes #3510
 2016-04-12 17:13:12 -07:00
Cat Sync
fddba4e0ce Hacks autocomplete to use hero instead of self/this 
Uses hero instead of self/this if “hero” is already in the code, in
javascript, python, and lua.
 2016-04-12 14:31:50 -04:00
Imperadeiro98
7d653bf567 Merge pull request #3532 from Minhir/patch-1 
Update English to Russian translation.
 2016-04-11 18:43:45 +01:00
Imperadeiro98
f3bbafda91 Small fixes to pt-BR.coffee 2016-04-11 18:43:15 +01:00
Imperadeiro98
3859c40f66 Merge pull request #3530 from jozadaquebatista/master 
Update pt-BR.coffee
 2016-04-11 18:39:07 +01:00
Imperadeiro98
1bb9678c05 Merge pull request #3543 from murat-yuksel/patch-1 
Added some TR translations
 2016-04-10 16:16:52 +01:00
Imperadeiro98
c056d97594 Small fixes to sk.coffee 2016-04-10 15:42:45 +01:00
Imperadeiro98
aa46de2b26 Merge pull request #3544 from cundamic/patch-21 
Update sk.coffee
 2016-04-10 15:39:20 +01:00
Imperadeiro98
0af4907f71 Merge pull request #3535 from levlas/patch-1 
Suggestions till line 55
 2016-04-10 15:36:16 +01:00
Imperadeiro98
14a6679ed9 Merge pull request #3531 from informaticienzero/master 
Update fr.coffee
 2016-04-10 15:35:13 +01:00
Imperadeiro98
312cc3ca1c Merge pull request #3527 from rafaelkan/patch-3 
Update es-ES.coffee
 2016-04-10 15:33:19 +01:00
Imperadeiro98
4f1e186cc2 Merge pull request #3525 from LawrenceFebs/patch-1 
Update it.coffee
 2016-04-10 15:32:36 +01:00
cundamic
fe8f081cc4 Update sk.coffee 2016-04-10 12:14:43 +02:00
cundamic
f2440bdbc9 Update sk.coffee 
translated 1-318
 2016-04-10 12:10:57 +02:00
Murat Yüksel
bd4811d7fd Added some TR translations 2016-04-09 17:48:11 +03:00
Scott Erickson
cabca6366f Show guides when users are a teacher OR own a classroom 2016-04-08 10:14:47 -07:00
Josh Callebaut
6c0823486f Merge pull request #3539 from Zerrien/solutionSchema 
Changes terminology to match schema
 2016-04-07 15:30:13 -07:00
Josh Callebaut
4275d41324 Changes terminology to match schema 2016-04-07 14:49:55 -07:00
Scott Erickson
5aeb559ad1 Fix ConvertToTeacherAccountView to save the email field 2016-04-07 14:40:21 -07:00
Matt Lott
5661a1fd8c Add site origin data to course trial requests 2016-04-07 12:13:48 -07:00
Levente Laszlo
cf4bdba31d Suggestions till line 55 2016-04-06 11:23:50 +02:00
Matt Lott
265f4a8c37 Update enrollments purchase blurb 2016-04-05 11:55:14 -07:00
Matt Lott
be254cf10e Route homepage students to /courses instead of /play 2016-04-05 10:43:06 -07:00
Matt Lott
49e7506c62 Add parental leave benefits to /about page 2016-04-05 10:14:54 -07:00
Vladimir Ivakin
6ef5e6742c Update ru translation 2016-04-05 23:05:11 +06: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
informaticienzero
622ff4cea1 Update fr.coffee 
Corrections and typo changes to match French rules.
 2016-04-05 12:13:00 +02: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
Jozadaque Batista
a202681096 Update pt-BR.coffee 2016-04-04 16:34:02 -03:00
Jozadaque Batista
cfae28fc86 Update pt-BR.coffee 2016-04-04 15:08:00 -03:00
rafaelkan
6834a9069f Update es-ES.coffee 
Traslate: loading_error, concepts and legal
 2016-04-04 16:05:17 +02:00
Imperadeiro98
5e2c726a2b Merge pull request #3506 from rafaelkan/patch-2 
Update es-ES.coffee
 2016-04-03 18:12:56 +01:00
LawrenceFebs
d83395c4d8 Update it.coffee 2016-04-03 11:40:58 +02:00
Yuki Ueda
476b26fca2 Update ja.coffee 2016-04-02 18:14:30 +09:00
Scott Erickson
b01ab2eab1 Merge pull request #3521 from Kinzeng/master 
Thang names
 2016-04-01 09:29:26 -07:00
Kevin Zhang
8455bb2270 added Thang names 2016-04-01 01:07:39 -04:00
Yuki Ueda
08fb5baf17 Update ja.coffee 2016-03-31 18:47:41 +09: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
Keld Ølykke
87b66747e8 Update da.coffee 
Added some glue words to make concatenated sentences flow.
 2016-03-29 01:31:12 +02:00
Keld Ølykke
2163dfa115 Update da.coffee 
Fixed wrong indentation of courses.length.
 2016-03-29 00:56:19 +02:00
Keld Ølykke
fbe1a817a9 Update da.coffee 2016-03-29 00:40:19 +02: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
UltCombo
8326b5e182 JS beautifier: fix loop construct, fixes #3510 
As JavaScript is the only language supported by the beautifier, and [CodeCombat is in the process of converting things to while (true)](https://github.com/codecombat/codecombat/issues/3510#issuecomment-201965310), I guess adding this quick hack to the view's code should suffice for now. Hopefully, the non-standard `loop` construct will be removed from other languages before they receive beautifier support.

If this doesn't seem good, I can move  this hack to `aether.beautify`, where it is possible to perform this substitution in a language-aware way (i.e. inside Aether's JavaScript implementation's [`beautify` method](418ccf2414/src/languages/javascript.coffee (L137))). Seeing as the `loop` construct is specific to CodeCombat, I'm not sure if that would be a good idea. Passing an options object with a flag to support the `loop` construct seems a bit overkill.

Let me know what works best for you.
 2016-03-28 00:00:40 -03: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
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
JurianLock
7b05223037 Update nl-NL.coffee 
Reduced some translations so they fit better in the menu.
 2016-03-24 15:34:15 +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
Nick Winter
b208fddabb Fix #3484 2016-03-23 15:56:45 -07:00
Nick Winter
00bd983590 Fix #3387 2016-03-23 15:24:38 -07:00
Rob
455dd813b1 Add image refrenced by OpenGraph. 2016-03-22 12:47:13 -07:00
Imperadeiro98
5676c6b2e4 Add i18n to new level loading strings 2016-03-22 12:02:36 +00:00
Matt Lott
50171a5b02 🐛Fix admin trial requests page 
Server refactoring exposed incorrect server parameters.
 2016-03-21 11:39:15 -07:00
Nick Winter
eec50c8e44 Only collapse collision shapes for walls 2016-03-21 10:57:38 -07:00
Matt Lott
6a4132e057 Update campaign ads test groups 2016-03-21 08:07:22 -07:00
Yuki Ueda
27f5cb5e45 Update ja.coffee 2016-03-21 20:06:09 +09:00
Matt Lott
d1ae4adfbb Merge pull request #3499 from IC-Induja/master 
Added 9 new loading screen comments
 2016-03-20 05:40:17 -07:00
Matt Lott
2bf028cc4a Update /about page team section 2016-03-20 05:30:52 -07:00
IC-Induja
57bd7ab5f8 Update level_loading.jade 2016-03-20 01:20:42 -04:00
sake12
9a52185e77 Update pl.coffee 2016-03-19 20:13:30 +01:00
Krzysztof Pomarański
1e9f950717 update pl.coffee 2016-03-19 12:25:56 +01:00
Matt Lott
5d71acba05 Replace HipChat with Slack 2016-03-18 17:05:21 -07:00
Nick Winter
905c9cdb93 Use victory text and next level data on level completion. Update picoCTF logo. 2016-03-18 14:18:41 -07:00
Nick Winter
dc3ba40a45 One more change from #3483 2016-03-18 11:35:56 -07:00
Nick Winter
c42f2512e9 Merge nl-NL.coffee 2016-03-18 11:35:04 -07:00
Nick Winter
13928884b0 Merge iDEAL link for nl on home 2016-03-18 11:16:28 -07:00
Nick Winter
4a737d3045 Merge iDEAL link for nl on home 2016-03-18 11:14:10 -07:00
Scott Erickson
d6a46826e6 Add top margin to base-flat footer 2016-03-18 11:03:55 -07:00
Scott Erickson
461fb14f37 TestView styling and responsive tweaks 2016-03-18 11:03:55 -07:00
Scott Erickson
ecfb148b3c Add spacing classes to style-flat 2016-03-18 11:03:55 -07:00
Scott Erickson
2a399e71fa Add CocoView.scrollToTop 2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d Refactor FacebookHandler and GPlusHandler 
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
 2016-03-18 11:03:55 -07:00
Scott Erickson
93c7072d8d Refactor ConfirmModal for #3138 and #3488 2016-03-18 11:03:55 -07:00
Scott Erickson
1c629a3181 Fix options in forms.objectToForm 2016-03-18 11:03:55 -07:00
Scott Erickson
f21baa7af5 Migrate /db/trial.request for #3469 2016-03-18 11:03:55 -07:00
Scott Erickson
356523dd4b Add .btn-burgandy 2016-03-18 11:03:54 -07:00
Scott Erickson
46afe40637 Fix forms.scrollToFirstError when there is no error to scroll to 2016-03-18 11:03:54 -07:00
Scott Erickson
2e96a387e9 Add User.logout to client 2016-03-18 11:03:54 -07:00
Matt Lott
255ebbc048 Ads for free campaign players 
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.

Closes #3491
 2016-03-18 10:29:31 -07:00
Matt Lott
f14575ece6 Update subscribe modal level counts 2016-03-17 17:29:47 -07:00
Maikel Langezaal
49d7028e2e Cleanup 2016-03-17 11:30:19 +01:00
Imperadeiro98
9a36267ba7 Cleanup i18n in some files 2016-03-16 21:49:19 +00:00
Zeldaretter
d565d5bc0b Update de-DE.coffee 
i added and translated all lines that where missing from the original English en.coffee

I would like to Copy my changes to the Austrian German version, because it is nearly the same and if some Austrian Translator finds an error or a better word than he can edit it, but its like british and american English and both understand each others well and here I think its better to have German than English, what do you think?
 2016-03-16 18:36:53 +01:00
Imperadeiro98
e6b0eb6401 Merge pull request #3492 from JurianLock/patch-7 
Update nl-NL.coffee
 2016-03-16 12:59:22 +00:00
Imperadeiro98
1b1ac3028f Merge pull request #3490 from Zeldaretter/patch-1 
Update de-DE.coffee
 2016-03-16 12:58:26 +00:00
JurianLock
3a46ada802 Update nl-NL.coffee 
Another set of updates.
 2016-03-16 13:02:20 +01:00
Zeldaretter
10dc03bc7e Update de-DE.coffee 
Added some new strings from the English original
 2016-03-16 10:12:35 +01:00
Zeldaretter
0ec23f025c Update de-DE.coffee 
new updated strings, I finished translating. Next I will check if all strings are correct by comparing with the English original because some strings were allready translated and may not fit with the new layout.
Greetings and Thank you for a great game
 2016-03-16 09:09:21 +01:00
Nick Winter
42e1ab6c99 Fix wall collision coalescing code 2016-03-15 15:52:15 -07:00
Zeldaretter
07f21d44bd Update de-DE.coffee 
New strings translated. Nearly done, till Eastern I will finish this and start comparing with the english strings again.
 2016-03-15 22:01:03 +01:00
Nick Winter
ab29f7e10e Don't try to use Arvo for Cyrillic language headline fonts 2016-03-15 10:15:16 -07:00
Nick Winter
db813bd77e Merge zh-HANS.coffee 2016-03-15 08:47:20 -07:00
Imperadeiro98
c07b100712 Merge pull request #3489 from JurianLock/patch-6 
Update nl-NL.coffee
 2016-03-15 15:32:55 +00:00
Imperadeiro98
e5348e665c Merge pull request #3485 from MatiasOlivera/master 
Update es-419.coffee
 2016-03-15 15:26:45 +00:00
Imperadeiro98
719e45a084 Merge pull request #3481 from Zeldaretter/patch-1 
Patch 1
 2016-03-15 15:23:30 +00:00
Imperadeiro98
f659d22fa5 Merge pull request #3480 from delftswa2016/Chinese-translation 
Chinese translation
 2016-03-15 15:20:31 +00:00
Nick Winter
8a93374a87 Fix silly ancient math mistake 2016-03-15 08:05:00 -07:00
JurianLock
c1fb0c53a9 Update nl-NL.coffee 
Another set of updates and tweaks.
 2016-03-15 01:22:02 +01:00
Nick Winter
e5dda556c6 Add Mandate configuration for session save delays 2016-03-14 16:39:05 -07:00
Scott Erickson
07aad0ca18 Merge pull request #3463 from delftswa2016/maximize-button-fix 
Fix the fullscreen-code button and beautiful-code button
 2016-03-14 10:45:08 -07:00
Jacob Boon
ce8f7f2c14 include iDeal offer for Dutch (nl) users 2016-03-14 16:39:16 +01:00
Zeldaretter
d9e271da4a Update de-DE.coffee 
Just did the changes. I don't know if it is good to translate the job benefits, because some of them don't work in Germany and I think if someone wants to work for you they have to at least speak enough English to understand this benefits.
 2016-03-14 07:05:01 +01:00
lazydogP
bdf59fe430 Update zh-HANS.coffee 2016-03-14 13:00:44 +08:00
Matías Olivera
d5b8f5c726 Update teachers_quote 2016-03-13 21:56:06 -03:00
Matías Olivera
147db289fb Update about 2016-03-13 21:06:11 -03:00
Chengxin Ma
d2cefce7da Update zh-HANS.coffee 2016-03-13 22:42:12 +01:00
Chengxin Ma
286b8161ca Update zh-HANS.coffee 2016-03-13 22:37:26 +01:00
Yu Liang
3dfb0c04b8 add margin-left for id 'create-account-btn' 2016-03-13 16:36:36 +01:00
Jan van den Berg
e449571139 Update nl-NL.coffee 
Minor language fixes
 2016-03-13 12:11:18 +01:00
yuliang123
c875c8c5ec fix misaligned login 2016-03-13 00:22:19 +01:00
Zeldaretter
37944f38d9 Update de-DE.coffee 
typo
 2016-03-12 22:18:31 +01:00
Zeldaretter
c968341cb4 Update de-DE.coffee 
6hours of translating, only some Classroom stuff needs to be translated now.
 2016-03-12 22:15:22 +01:00
yuliang123
1a11ade67b Update zh-HANS.coffee 2016-03-12 21:51:20 +01:00
yuliang123
b48e8eeecf Update zh-HANS.coffee 2016-03-12 21:39:26 +01:00
Nick Winter
96d0f4e7ee Merge nl-NL.coffee 2016-03-12 08:48:51 -08:00
Nick Winter
4f9932cd2f Merge pull request #3479 from delftswa2016/new-homepage-header-i18n 
updated new homepage header (i18n)
 2016-03-12 08:43:31 -08:00
Imperadeiro98
4b96cd272b Merge pull request #3477 from delftswa2016/update-Chinese-translation 
Update zh-HANS.coffee
 2016-03-12 14:12:03 +00:00
Imperadeiro98
7bce51c06b Small fixes to previous merge 2016-03-12 14:11:14 +00:00
Imperadeiro98
546ced6816 Merge pull request #3474 from mqrelly/master 
Update hu.coffee: Translate new home page to Hungarian.
 2016-03-12 14:09:33 +00:00
Imperadeiro98
820aeb0b04 Merge pull request #3467 from delftswa2016/NL-translation 
NL translation
 2016-03-12 14:07:56 +00:00
Imperadeiro98
e4ab59ef65 Added a diplomat 2016-03-12 14:03:59 +00:00
Imperadeiro98
551ec13743 Rearranged quotation marks in es-419.coffee 2016-03-12 14:02:45 +00:00
Imperadeiro98
d8ffcb355c Merge pull request #3464 from MatiasOlivera/master 
Update es-419.coffee
 2016-03-12 13:59:47 +00:00
Imperadeiro98
200d91a8a6 Merge pull request #3461 from Zeldaretter/patch-1 
Update de-DEcoffee
 2016-03-12 13:58:55 +00:00
Chengxin Ma
6ff7c562a8 updated new homepage header (i18n) 2016-03-12 12:19:21 +01:00
Chengxin Ma
db52cd0c83 updated new_home in zh-HANS.coffee 2016-03-12 02:26:42 +01:00
Chengxin Ma
e02083214a updated new_home in zh-HANS.coffee 2016-03-12 02:19:20 +01:00
Matt Lott
3a1627682d Update homepage logged out copy 2016-03-11 15:44:37 -08:00
Szabadkia Márk
ba266eae5c Update hu.coffee: Translate new home page to Hungarian. 
Also fix minor spelling errors.
 2016-03-12 00:14:51 +01:00
Scott Erickson
464430200c Fix AccountSettingsView to only try to change permissions in development 2016-03-11 15:00:55 -08:00
JurianLock
1d7d9c76b6 Update nl-NL.coffee 
Another set of updates and tweaks
 2016-03-12 00:00:51 +01:00
Scott Erickson
9d315a4848 Fix "students enrolled" to "students assigned" in TeacherCoursesView 2016-03-11 14:13:44 -08:00
Maikel Langezaal
5aff988ec5 Cleaned up code 2016-03-11 21:08:13 +01:00
Maikel Langezaal
e07d2561bd Made the treema visible to be build, but disabled and hidden the buttons 2016-03-11 21:01:06 +01:00
Maikel Langezaal
b4c8948f6e small typo 2016-03-11 19:33:59 +01:00
Matías Olivera
e614e5a76c Update play_level's tips 2016-03-11 14:05:23 -03:00
Martijn Cligge
550cec9cd1 NL. Coffee _ Added more translations 
Added more translations and corrected old ones
 2016-03-11 18:00:13 +01:00
Matías Olivera
d3323fc9c7 Update nav 2016-03-11 13:56:42 -03:00
Matías Olivera
cba4fbcad6 Update new home 2016-03-11 13:54:21 -03:00
yuliang123
457d6bbc6c Fix the fullscreen-code button and beautiful-code button 2016-03-11 16:59:45 +01:00
Maikel Langezaal
bee812149b Additions to dutch translation 2016-03-11 15:58:40 +01:00
Matt Lott
acba838db4 🐛Request demo Ux bugs 
Only ask about login if not logged in
Add missing set up a class i18n string
 2016-03-10 14:40:16 -08:00
Scott Erickson
84cdf1e2ce Add showRequiredError and showSignupRationale alerts and tests to CreateAccountModal 2016-03-10 11:37:31 -08:00
Scott Erickson
a59e96f277 Tweak invalid class code behavior, fix hide modal button test 2016-03-10 11:23:09 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Zeldaretter
5006fa8df3 Update de-DEcoffee 
new translations.
please add me to the diplomatpages if you like my work, that would be a great honour.
Thanks^^
 2016-03-10 16:47:26 +01:00
Imperadeiro98
910953d383 Fix build (part 2) 2016-03-10 14:47:45 +00:00
Imperadeiro98
a0b52aca49 Fix build 2016-03-10 14:37:38 +00:00
Imperadeiro98
60f0522192 Uncomment header in nl-NL.coffee 2016-03-10 14:36:48 +00:00
Imperadeiro98
b9e7417b07 Merge pull request #3460 from JurianLock/patch-4 
Update nl-NL.coffee
 2016-03-10 14:35:45 +00:00
Imperadeiro98
ed926ff799 Merge pull request #3459 from Zeldaretter/patch-3 
Update De-de-coffee
 2016-03-10 14:34:15 +00:00
Imperadeiro98
d3d408c5c6 Merge pull request #3455 from Agalondia/patch-1 
Update id.coffee
 2016-03-10 14:32:37 +00:00
Galandre Athalon
cbf8ebd98c Update id.coffee 
There, i've got rid of the # in the translated bits, and change some things and translated a lot of others :D
 2016-03-10 19:35:22 +08:00
JurianLock
aeec7a8e9c Update nl-NL.coffee 
Another set of tweaks and updates
 2016-03-10 11:37:47 +01:00
Zeldaretter
4d72fbeb63 Update De-de-coffee 
New translations
 2016-03-10 11:33:48 +01:00
Imperadeiro98
84ffdc8df2 Merge pull request #3446 from vellrya/patch-1 
Update ru.coffee
 2016-03-09 20:23:58 +00:00
Agalondia
6fec94ffbd Update id.coffee 
Here's my translation for Indonesian, please consider it guys!
 2016-03-09 22:17:29 +08:00
Chengxin Ma
a8e72aac70 fix Chinese grammar 2016-03-09 11:04:46 +01:00
Matt Lott
eb7bebe293 Add DAU 30-day avg and daily total to dashboard 2016-03-08 15:27:57 -08:00
JurianLock
25f598934d Update nl-NL.coffee 
Few tweaks and some general updates.
 2016-03-08 23:44:08 +01:00
Matt Lott
bce9862be2 Update request demo Ux 
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email

Closes #3449
 2016-03-08 09:30:50 -08:00
Robin Yang
ee331cc9c5 Change request quote headings H1/H2 to H3/H4 2016-03-07 13:56:34 -08:00
Imperadeiro98
86e10d0c34 Fix previous merge 2016-03-07 19:22:52 +00:00
Imperadeiro98
1577dc5708 Merge pull request #3444 from JurianLock/patch-2 
Update nl-NL.coffee
 2016-03-07 19:22:17 +00:00
Nick Winter
6a9a36b1eb Don't show misc achievements in picoCTF mode 2016-03-07 09:54:29 -08:00
Nick Winter
78379f2e6a Merge pull request #3440 from Imperadeiro98/master 
Remove i18n from admin pages
 2016-03-07 09:16:07 -08:00
Nick Winter
6d246129de Make languages fall sideways if needed (ex: nl-BE using nl-NL instead of en) 2016-03-07 08:13:49 -08:00
Nick Winter
9dc6a04f5e Fix #3447 2016-03-07 07:02:01 -08:00
vellrya
eb32320b6f Update ru.coffee 2016-03-07 15:25:29 +03:00
JurianLock
b6f1a5046d Update nl-NL.coffee 2016-03-06 23:16:14 +01:00
Imperadeiro98
ba12f0b7f4 Fix previous merge 2016-03-06 21:39:43 +00:00
JurianLock
01d250caf3 Update nl-NL.coffee 2016-03-06 22:30:09 +01:00
sake12
44cf0931c4 Update pl.coffee 2016-03-06 12:10:53 +01:00
Imperadeiro98
773c640ced Fix build 2016-03-05 15:25:12 +00:00
Imperadeiro98
2442115892 Remove i18n from admin pages 2016-03-05 15:08:27 +00:00
Imperadeiro98
88091cf166 Update pt-PT.coffee 2016-03-05 14:15:52 +00:00
Nick Winter
fb9b169c62 Propagate a big i18n 2016-03-04 15:51:16 -08:00
Nick Winter
1ccad78782 Submit picoCTF solutions, show progress, disable sound 2016-03-04 11:44:43 -08:00
Scott Erickson
0b6390795a Tweak text on admin page 2016-03-04 11:14:18 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Nick Winter
59e8c42ddb Client-side support for beating picoCTF levels 2016-03-03 17:18:24 -08:00
Scott Erickson
47f3223be1 Fix and improve new errors system 
* Fix error property name -> errorName
* showNotyError can handle Backbone error callbacks where jqxhr is second param
* showNotyError correctly shows JSON error message or name
* Add timeout to showNotyError
 2016-03-03 13:59:17 -08:00
Nick Winter
bada484445 Fix fetchPatchesWithStatus for non-versioned models 2016-03-02 16:19:33 -08:00
Imperadeiro98
defade9824 Merge pull request #3435 from Zeldaretter/patch-1 
Update de-DEcoffee
 2016-03-01 21:26:21 +00:00
phoenixeliot
939265a119 Fix supermodel.trackModel 2016-03-01 10:33:45 -08:00
Matt Lott
9e8e865049 Remove old homepage 
Turning off homepage a/b testing for now, but leaving the plumbing in
because we’ll be iterating on that shortly.
 2016-03-01 09:48:53 -08:00
Yuki Ueda
bfe45cbb88 Update ja.coffee 2016-03-01 20:47:09 +09:00
Matt Lott
19b7fe7295 Remove iOS position from /about careers section 2016-02-29 15:16:09 -08:00
Matt Lott
2e2bf95ff7 Remove classroom MAUs from KPI graphs 
Covered by active classes, and doesn’t make sense to have separate MAU
scales between classroom and campaign.
 2016-02-29 13:58:00 -08:00
Zeldaretter
84f28b15c2 Update de-DEcoffee 
New lines and some typos fixed
 2016-02-29 19:49:05 +01:00
Mario Catuogno
b9379c9984 Update it.coffee 2016-02-29 13:56:37 +01:00
Imperadeiro98
4b20258cef Merge pull request #3432 from MarioCatuogno/patch-1 
Update it.coffee
 2016-02-29 12:44:53 +00:00
Imperadeiro98
5f74bef303 Merge pull request #3431 from mqrelly/master 
Update hu.coffee
 2016-02-29 12:39:11 +00:00
Mario Catuogno
bddf849f1e Update it.coffee 
Tried to translate some new lines to help.
 2016-02-29 02:18:10 +01:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Szabadkia Márk
e81fc634b2 Update hu.coffee 2016-02-28 21:58:17 +01:00
Imperadeiro98
a8f1ca7c7e Fix build 2016-02-28 18:11:59 +00:00
Zeldaretter
1fabe3224e Update de-DEcoffee 
New strings translated into german. Please add this strings soon. Thanks a lot
 2016-02-28 18:41:52 +01:00
Nick Winter
859e127e14 Merge pull request #3422 from blorente/master 
Added some lines for #710
 2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947 Small fixes to new-home-view.jade 2016-02-27 08:25:57 +00:00
Imperadeiro98
02a91642fc Merge master 2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699 Trailling spaces removed, typo fixed and added 1 tag 2016-02-26 23:28:39 +01:00
Nick Winter
a6333cf739 Propagate SpriteParser's auto-insignificant-tween skipping fix to SpriteBuilder too 2016-02-26 11:42:32 -08:00
Matt Lott
1f7489970e Remove auto-refresh from subs dashboard 2016-02-26 10:36:04 -08:00
Scott Erickson
b64a212a17 Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master 2016-02-26 09:38:09 -08:00
Matt Lott
7bd0936c93 Import approved trial requests into Close.io 2016-02-26 06:21:31 -08:00
Maikel Langezaal
40ed5618b8 Added i18n tags for new HomePage Issue #3413 2016-02-26 11:43:38 +01:00
minwook shin
d816b4388f 2/26 ko update. 2016-02-26 11:59:44 +09:00
Scott Erickson
e7366040f3 Add full screen button to tutorial videos in Safari 2016-02-25 17:13:42 -08:00
Scott Erickson
2a69ca3774 Fix lesson time estimate dropdown in NewHomeView 2016-02-25 16:49:26 -08:00
Scott Erickson
3f8652d9a9 Add showNotyNetworkError to app/core/errors 2016-02-25 15:50:53 -08:00
Scott Erickson
bd20536046 Add validateEmail to forms 2016-02-25 15:28:04 -08:00
Scott Erickson
1c4a84dee6 Handle when a SomethingResource fails, show Unknown Error 2016-02-25 15:15:39 -08:00
Scott Erickson
43a659ea80 Add styling for modal-base-flat 2016-02-25 15:15:15 -08:00
Scott Erickson
946436083c Add updateSelects to forms 
So that in forms you don't have to find the equality for each option. Instead,
just set the select value and, afterRender, call updateSelects, the options that
matches the value will become selected.
 2016-02-25 15:14:48 -08:00
blorente
ef8ed4b6ed Added some lines for #710 2016-02-25 23:41:27 +01:00
phoenixeliot
10e03c87c1 Fix style-flat color, .text-h1/2/etc style 2016-02-25 13:22:41 -08:00
Scott Erickson
78d221fe4c Refactor AdministerUserModal to use new flat style instead of legacy plain style 2016-02-25 11:49:34 -08:00
Scott Erickson
8b22b78f74 Add style-flat base 
To create a modal with the flat style, just use modal-base-flat instead of modal-base
 2016-02-25 11:40:27 -08:00
Imperadeiro98
b5bbe85836 Revert jobs i18n 2016-02-25 18:28:45 +00:00
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Matt Lott
8d1c39e714 Merge pull request #3421 from codecombat/AboutPageFixes 
Improve responsiveness on fixed nav
 2016-02-25 09:36:03 -08:00
phoenixeliot
401c185108 Improve responsiveness on fixed nav 2016-02-25 09:25:13 -08:00
Nick Winter
e2f40994e4 Merge lt.coffee 2016-02-25 09:03:00 -08:00
Imperadeiro98
62c5b34a96 Update About page i18n 
Also fixed some images
 2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa Fix screenshot carousel when focused on the carousel control and pressing arrow keys 2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e Refactor Request Quote page to flat-style 2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2 Add new About page and refactor out flat-style 2016-02-24 16:22:06 -08:00
Imperadeiro98
42f84de394 Merge master branch 2016-02-24 19:40:21 +00:00
Imperadeiro98
9c12f6c957 Revert changes to LevelLoader and SuperModel 2016-02-24 19:32:28 +00:00
Matt Lott
e74a77342c Update admin trial requests page 
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
 2016-02-24 10:22:55 -08:00
Nick Winter
9a344d1a61 Sort a few name categories; remove a log. 2016-02-24 08:49:39 -08:00
Nick Winter
cac20fd39c Merge pull request #3416 from delftswa2016/additional-thang-names 
Some additions to Ogre and Horse names
 2016-02-24 08:46:49 -08:00
Matt Lott
609884eb51 Update furthest course dashboard tables 
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
 2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436 Add school sales table to dashboard 2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5 Add more year long dashboard graphs 2016-02-24 06:25:01 -08:00
Maikel Langezaal
8882ff8d46 Some additions to Ogre and Horse names 2016-02-24 12:56:02 +01:00
Scott Erickson
e2feeb8330 Prevent didReappear from setting up shortcuts twice for RootViews 2016-02-23 12:00:07 -08:00
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00