codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 08:41:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12184 commits 27 branches 0 tags 134 MiB
Commit graph

12184 commits

This branch
This branch
All branches
Author SHA1 Message Date
phoenixeliot
e825010b26 Merge branch 'master' into production 
Several UI bugfixes
 2016-07-08 16:33:34 -07:00
phoenixeliot
6fb4cbd9ac Remember checkbox state in TeacherClassView 2016-07-08 16:24:33 -07:00
phoenixeliot
b25782f2b6 Pass username/password from CreateAccountModal to AuthModal 2016-07-08 16:24:33 -07:00
phoenixeliot
1b8d3ed023 Improve spacing for CreateAccountModal on chromebooks 
Improve spacing for type-select screen on chromebooks

Improve spacing for basic-info screen on chromebooks

Improve spacing for confirmation screen on chromebooks

tweak spacing
 2016-07-08 16:24:33 -07:00
Scott Erickson
118c76cc2d Merge branch 'master' into production 2016-07-08 16:15:08 -07:00
Scott Erickson
31b7d48735 Merge branch 'game-dev-levels' 2016-07-08 16:02:58 -07:00
Scott Erickson
2aa647fa29 Guard against trial-requests and signups being done on the same computer but by different people 2016-07-08 15:33:12 -07:00
Scott Erickson
f5c9be4831 Merge branch 'master' into game-dev-levels 2016-07-08 14:26:48 -07:00
Scott Erickson
b2bb129cbf Add realTimeInputEvents to world and gameUIState, with just mousedown events 2016-07-08 14:17:07 -07:00
Scott Erickson
10d344504a Add check to TomeView 
Found a bug while playing Ogre Encampment: click the Chest before clicking past the
intro screen and the game throws an error, when `updateSpellPalette` tries to access
call `spell.getSource()` but `spell` is undefined. This check keeps the same behavior
but handles the error.
 2016-07-08 13:27:42 -07:00
Scott Erickson
5b0b5e4169 Tweak ModuleLoader handling of index files, fix #3783 2016-07-08 13:13:28 -07:00
Scott Erickson
28c5865db2 Merge branch 'master' into production 2016-07-08 09:07:20 -07:00
Jun-Yuan Yan - sss2500
6925c4a7d5 Update : zh-HANT translate (#3779) 2016-07-08 15:53:29 +01:00
GrecK0
cca69f8074 Update es-ES.coffee (#3772) 
Some lines translated/updated to spanish.

Best Regards!!!
 2016-07-08 15:51:34 +01:00
Matt Lott
34971861cc 🐛Fix license inquiry licensesRequest parsing 2016-07-07 17:14:50 -07:00
Scott Erickson
976015734d Update CreateAccountModal comments 2016-07-07 16:58:50 -07:00
Scott Erickson
151bf93177 Fix checkEmail to prevent duplicate checks 2016-07-07 16:55:57 -07:00
Scott Erickson
54c1361b1c Fix admin view when not an admin 2016-07-07 16:48:26 -07:00
Scott Erickson
1da82fa851 Fix #1199 2016-07-07 16:34:24 -07:00
Marvellanius
c0f163938e added a new logo (circle) (#3774) 2016-07-07 16:23:00 -07:00
Scott Erickson
ecde42f356 Fix catch callback 2016-07-07 16:22:08 -07:00
phoenixeliot
21cd890bfa Use translated ClassCode error message 2016-07-07 16:03:07 -07:00
Scott Erickson
af9f7201d0 Finish new CreateAccountModal 2016-07-07 15:56:41 -07:00
phoenixeliot
e9b7543242 Start new CreateAccountModal 2016-07-07 15:56:41 -07:00
phoenixeliot
5e6c9709f9 Display better error when invalid class code is entered 2016-07-07 15:32:11 -07:00
Matt Lott
cad067fa8c 🐛Fix admin classroom progress CSV 
Respect fetch paging.
 2016-07-07 15:18:04 -07:00
phoenixeliot
21233e631d Fix arena back-to-levels link 2016-07-07 15:14:25 -07:00
phoenixeliot
855d38dfcc Fix hero select modal spacing 2016-07-07 11:48:05 -07:00
phoenixeliot
ddbbe40586 Compress student jumbotron image 2016-07-07 11:28:02 -07:00
Matt Lott
a884fbf38b Admin class progress CSV export 2016-07-07 11:07:38 -07:00
Rob
fcf1060486 Merge branch 'master' into production 2016-07-06 16:45:02 -07:00
Matt Lott
98da7962cf Add ZP auto-reply contacts to Close 
Also now including phone number when adding a new contact to an
existing Close lead.
 2016-07-06 15:48:48 -07:00
Rob
228019ac89 - Limit when this autocompletion can pop up. 
- Remove some left over cruft from the text completer.
 2016-07-06 13:31:46 -07:00
Matt Lott
5d09e219c0 Update add zp script to call APIs in series 
Takes 25s instead of 10s now.
 2016-07-06 13:21:43 -07:00
Nick Winter
bf1b2adf6a Only fetch ZenProspect leads that have replied, for performance 2016-07-05 16:31:42 -07:00
Rob
22efc269b5 Merge branch 'master' into production 2016-07-05 12:35:30 -07:00
Rob
c7901c3237 Unbreak things when you don't have glasses. 2016-07-05 12:34:54 -07:00
Rob
d7b7b1d4d9 Merge branch 'master' into production 2016-07-05 10:08:18 -07:00
Bryukhanov Valentin
7f1a6b2467 Merge pull request #3780 from codecombat/Bryukh-ru-typo 
update ru.coffee - typo
 2016-07-05 09:36:12 +03:00
Bryukhanov Valentin
acaebcdbbb update ru.coffee - typo 
"classroom_in_a_box" Russian typo fixed.
 2016-07-05 09:30:33 +03:00
Rob
5dd4db7676 Correctly feature detect WeakMap. 2016-07-01 16:44:16 -07:00
Rob
9c7320e26a - Move Zatanna out of own repo and into CodeCombat 
- Move snippet creation out of SpellView
- Disable text based completions.
 2016-07-01 16:39:21 -07:00
Matt Lott
4419f80d4c Merge branch 'master' into production 2016-07-01 15:22:13 -07:00
Matt Lott
15a605505e Link classroom levels from main admin page 2016-07-01 07:56:56 -07:00
Bryukhanov Valentin
d663de6481 Merge pull request #3771 from codecombat/locale-ru-updates 
Update ru.coffee new_home section
 2016-07-01 15:09:05 +03:00
Matt Lott
ba54754373 Admin classroom levels page 2016-06-30 08:29:27 -07:00
Rob
ac47928131 - Reduce size of answer code in verifier 
- Assume we want to run a single level on only one core for accurate speed testing.
 2016-06-29 16:18:36 -07:00
Matt Lott
87b9d74dc1 🐛Analytics sub page sponsor recipient null check 2016-06-29 15:22:38 -07:00
Matt Lott
63e38c82b2 Update school counts page with geoip and 10+ buckets 
Placing teachers and students in unknown districts and schools if we
have geoip countries and states/regions.
Placing teachers/students in unknown schools if there are 10+ students.
 2016-06-29 15:01:04 -07:00
Rob
7260690b51 Remove one level of indent for coffee-lint. 2016-06-29 12:50:23 -07:00