Josh Callebaut
c4779468bd
Adds Josh C's image and updates the about page.
2015-11-10 13:46:48 -08:00
Scott Erickson
a0212da789
Improve StudentCoursesView
...
* Add alert explaining when a user joins a course, and links directly to the course
* Add header to My Courses list
* Have My Courses list sorted by classroom creation then course creation
2015-11-10 12:08:44 -08:00
Zacharias Sdregas
5491bf4860
318 more strings translated
2015-11-10 17:42:55 +02:00
Zacharias Sdregas
0c8f8e3d78
Greek Translation - A few more string translated
2015-11-10 07:23:04 +02:00
Scott Erickson
0c5b39e029
Merge branch 'master' into course-correction
...
Some package scripts got in the way of each other
2015-11-09 18:18:02 -08:00
Scott Erickson
12b3947448
Tweak wording on TeacherCoursesView
2015-11-09 18:14:42 -08:00
Scott Erickson
c8fc893ef1
Adjust CourseDetailsView for classrooms
...
* Disable settings modal
* Show classroom name instead of course instance name if available
2015-11-09 18:08:39 -08:00
Scott Erickson
628ed9a990
Remove add students tab from CourseDetailsView
2015-11-09 18:00:55 -08:00
Scott Erickson
97cb5275c3
Fixes for courses, hoc
...
* Handling prepaids with strings for maxRedeemers
* Add link to TeacherCoursesView from HourOfCodeView
* Show only course instances with classrooms attached in TeacherCoursesView and StudentCoursesView
* Add event tracking to HourOfCodeView
* Add not-logged-in handling to TeacherCoursesView
* Fixed a GET prepaids bug
* Have course instances created for hour of code have hourOfCode property set to true.
2015-11-09 17:58:40 -08:00
Scott Erickson
c8a47818c2
Initial setup of the hoc page
2015-11-09 16:45:12 -08:00
Scott Erickson
39a60f1cb7
Disabling required fields to make it easier to migrate
2015-11-09 16:07:27 -08:00
Imperadeiro98
28363f780a
Small tweaks
2015-11-09 21:35:33 +00:00
Scott Erickson
f7a41dc91a
When a student joins a classroom, they also join all course instances for that classroom which are free to join
2015-11-09 13:29:49 -08:00
Imperadeiro98
8e8a3103d5
Refactor to use view in template for issue #3138
...
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
2015-11-09 21:29:27 +00:00
Scott Erickson
91b8f9bb40
Switch back active tab, was switched for testing
2015-11-09 12:41:55 -08:00
Scott Erickson
1f37f12cc5
Fix auto course-instance creation
...
The interface now shows a progress bar while course instances are created for a class.
It also creates the course instances as soon as the classroom is created.
2015-11-09 12:12:10 -08:00
Scott Erickson
b0a0530d3c
Add courses tab to teacher courses page
2015-11-09 11:48:40 -08:00
Max Lyashuk
596bae17d6
Update ukrainian l18n, fix bugs
2015-11-09 21:16:01 +02:00
Zacharias Sdregas
9aa66db52d
More strings translated
2015-11-09 16:03:51 +02:00
Matt Lott
95b61c2f83
Add recurring revenue to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-08 17:00:24 -08:00
Matt Lott
7861faaf93
Add active classes to admin analytics page
...
https://app.asana.com/0/54276215890539/59638739614287
2015-11-06 14:11:39 -08:00
Nick Winter
ad240152c6
Fix #3159
2015-11-06 13:00:23 -08:00
zacharias
6fc2e339de
more strings translated
2015-11-06 13:37:39 +02:00
Scott Erickson
7daff0861f
Add functionality to StudentCoursesView
2015-11-05 17:31:11 -08:00
Scott Erickson
4c4b301925
Add functionality to TeacherCoursesView
2015-11-05 17:26:31 -08:00
Scott Erickson
7d686c5194
Add Backbone events to stripe handler
2015-11-05 15:31:25 -08:00
Scott Erickson
b36bf7b171
Add PurchaseCoursesView
2015-11-05 15:30:57 -08:00
Scott Erickson
4b71447877
Have POST /db/prepaid/:id/redeemers set user.coursePrepaidID property
2015-11-05 12:53:25 -08:00
Rob
39a97135de
Explicitly check for selection when overriding return.
2015-11-05 10:14:53 -08:00
RUSLAN LÓPEZ CARRO
2de074821c
Update es-419.coffee
2015-11-05 11:24:13 -06:00
Nick Winter
995459e1d5
Merge pull request #3156 from Imperadeiro98/some-updates
...
Remove a lot of unused strings
2015-11-05 08:25:32 -08:00
Rob
cde3b252da
Don't load user sessions on non premium dashboards.
2015-11-04 16:57:48 -08:00
Scott Erickson
00ce821939
Add InviteToClassroomModal, begin join class in StudentCoursesView
2015-11-04 16:54:13 -08:00
Rob
75532e3a79
Use generated member count instead of pulling a list of all members from mongo when we get the public clans list.
2015-11-04 16:00:54 -08:00
Imperadeiro98
424bea90b6
Reverted resources strings removal
2015-11-04 22:44:46 +00:00
Imperadeiro98
89521e2dbe
Remove a lot of unused strings
2015-11-04 21:45:15 +00:00
Nick Winter
34715befcc
Increment user's concept stats on level completion
2015-11-04 13:42:09 -08:00
Matt Lott
722540f3be
Remove old user analytics page
2015-11-04 10:59:10 -08:00
Matt Lott
d445024cb6
Add admin analytics page with MAUs
...
Includes updating analytics insert script used to inject aggregated
data into production database.
2015-11-04 10:59:10 -08:00
Scott Erickson
d987b644a9
Merge remote-tracking branch 'origin/master'
2015-11-04 10:54:59 -08:00
Scott Erickson
669ab416e5
Fix SubscriptionView to keep emails when emails are erroneous
2015-11-04 10:52:47 -08:00
Scott Erickson
05bd12e8cc
Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation
...
# Conflicts:
# app/views/account/SubscriptionView.coffee
2015-11-04 10:47:39 -08:00
Nick Winter
1b4f6262cb
Exclude non-selected code language documentation blocks from level guides
2015-11-04 10:46:16 -08:00
Nick Winter
0caf9c3547
Fix avatars not showing up in HUD.
...
Asana 54271591170319
2015-11-04 10:26:54 -08:00
Imperadeiro98
dbd9e325d4
Merge pull request #3155 from mads232/patch-2
...
Update da.coffee
2015-11-04 18:04:24 +00:00
Imperadeiro98
b0908524c4
Merge pull request #3153 from snarkota/patch-4
...
Update lt.coffee
2015-11-04 17:52:58 +00:00
Imperadeiro98
81e68ca795
Merge pull request #3152 from abdalim/msmy-home
...
Add Bahasa Melayu translations for Home
2015-11-04 17:50:45 +00:00
Imperadeiro98
7dacacf232
Merge pull request #3151 from poshus1984/patch-1
...
Update lt.coffee
2015-11-04 17:50:11 +00:00
Rob
361b5229e6
Use an newer, official build of ace instead of just copying the files into our source tree.
2015-11-03 17:33:35 -08:00
Scott Erickson
66432990f4
Add framework for new courses pages
2015-11-03 16:41:06 -08:00
Nick Winter
964b3f534c
Remove Bloc offer
2015-11-03 15:45:05 -08:00
Scott Erickson
0e2305bc3d
Add POST /db/course_instance/:id/members
2015-11-03 14:00:51 -08:00
Scott Erickson
429f50e1c6
Untie CourseInstance creation from prepaids, tie them to classrooms instead
2015-11-03 11:18:44 -08:00
mads232
841412a87d
Update da.coffee
2015-11-03 18:43:55 +01:00
Scott Erickson
27d423a410
Add Classroom server model and endpoints
2015-11-02 17:07:23 -08:00
Nick Winter
05e95923c2
Add Carlos to /about
2015-11-02 16:15:43 -08:00
Josh Callebaut
f885a0e45d
This updates the en.coffee file to account for josh_c's blurb and title.
2015-11-02 16:08:03 -08:00
Josh Callebaut
8b26c8a8b5
Merge remote-tracking branch 'upstream/master'
2015-11-02 16:03:32 -08:00
Josh Callebaut
c0ddbd2df1
Uniquifies the i18n tag for Josh C
2015-11-02 15:26:03 -08:00
Josh Callebaut
05f74a2fcd
Adds Josh Callebaut to the about.jade file.
2015-11-02 15:21:05 -08:00
Nick Winter
b1ae9075ff
Updated README to include a few new avatars.
2015-11-02 15:19:54 -08:00
Scott Erickson
c3735ba0eb
Add exhausted property to prepaid model
...
It is true when redeemers.length >= maxRedeemers
2015-11-02 13:06:58 -08:00
Nick Winter
5106bd5390
Fix sortThangComponents corner case in course levels with Plans attaching twice
...
Fixes https://app.asana.com/0/54276215890539/62515742172177/f
2015-11-02 12:35:28 -08:00
Nick Winter
caab006c5e
Merge pull request #3149 from dillonforrest/master
...
Change visible references of 'HipChat' to 'Slack'.
2015-11-02 10:32:48 -08:00
snarkota
ce376564a9
Update lt.coffee
2015-11-02 16:55:14 +02:00
Alim
0b156242d9
Add Bahasa Melayu translations for Home
2015-11-01 13:57:19 +08:00
Sigitas Mockus
20017691d3
Update lt.coffee
2015-10-31 19:10:43 +02:00
Imperadeiro98
1cdb598350
Fixes to last merge
2015-10-31 14:06:13 +00:00
albenarammou
94cb1075e8
Update bg.coffee
2015-10-31 09:24:05 +02:00
Scott Erickson
fa4355f946
Add programming language to options in course instances
2015-10-30 15:56:43 -07:00
Scott Erickson
0da66bd468
Refactor CourseEnrollView to use view in template
2015-10-30 11:40:34 -07:00
Scott Erickson
11d3bfc9c4
Make redeem coupon network errors on /courses happen within modal
2015-10-30 11:05:24 -07:00
Scott Erickson
429f2c2839
Fix renderSelectors to handle selectors with multiple targets
2015-10-30 11:05:24 -07:00
Nick Winter
504e65ec27
Commit client-side code for acdfe7c
2015-10-30 09:43:05 -07:00
Rob
cea412c0a9
Fix indentation.
2015-10-30 11:16:48 -04:00
Imperadeiro98
6e01f367d9
Fixes to last merge
2015-10-30 14:37:05 +00:00
Imperadeiro98
08e9d682d0
Merge pull request #3143 from RobertLukowski/patch-3
...
Update de-DE.coffee
2015-10-30 14:35:05 +00:00
dillon
493d302a0d
Change visible references of 'HipChat' to 'Slack'.
2015-10-30 00:07:58 -07:00
Nick Winter
f100d6dba6
Merge pull request #3118 from codecombat/soffes/ipad
...
[WIP] Changes for iPad app
2015-10-29 16:24:39 -07:00
Rob
e048848d6b
Add 50% more room for fingers in the autocomplete box.
2015-10-29 18:16:58 -04:00
Rob
75c63a0ace
When pressing enter with an active selection, just make a new line under it.
2015-10-29 18:16:23 -04:00
Imperadeiro98
bf1ef72a15
Merge pull request #3148 from javatlacati/patch-1
...
Update es-419.coffee
2015-10-29 21:42:05 +00:00
Matt Lott
8b254164c9
Free course enrollment for admins
2015-10-29 14:09:19 -07:00
RUSLAN LÓPEZ CARRO
9283492cb8
Update es-419.coffee
...
Some already translated strings appear as untranslated :S
2015-10-29 14:32:15 -06:00
Rob
f0e1fc1f77
Let API properties declare their return values should be captured.
...
Auto complete will know when to add a variable asingment.
2015-10-29 15:07:19 -04:00
Imperadeiro98
f2ca1dbd63
Updates to i18n
2015-10-29 15:57:22 +00:00
Nick Winter
3352042af5
Uncomment nl-BE section header
2015-10-29 07:40:30 -07:00
Nick Winter
46c8b4f81d
Merge nl-BE.coffee
2015-10-29 07:37:06 -07:00
RobertLukowski
0d2f747a6e
Update de-DE.coffee
...
I hope the de-Translation is better
2015-10-29 15:19:40 +01:00
WardLanssens
8acaa80397
Update nl-BE.coffee
2015-10-29 15:18:50 +01:00
Scott Erickson
7b54a04d33
Fix reload code button in play view on IE9
2015-10-28 15:45:34 -07:00
Scott Erickson
f95426dbd9
Fix done button in LevelPlayView in IE9
...
It had no background.
2015-10-28 15:24:08 -07:00
Scott Erickson
a21d85c4ed
Remove some vestigial commented out styling for AuthModal buttons
2015-10-28 14:40:07 -07:00
Scott Erickson
fb51d40cb4
Switch AuthModal buttons to use btn-illustrated classes, for browser compatibility
...
They were white boxes in IE9 with their custom setup.
2015-10-28 14:37:59 -07:00
Scott Erickson
48c10d214d
Make highlight pointer disappear immediately and move off screen when hidden
...
It causes problems in IE10 and lower, because the css property pointer-events
does not work in those browsers. So fixed that by moving the arrow out of the way.
2015-10-28 14:01:37 -07:00
Scott Erickson
52395661f7
Fix SubscribeModal buttons on IE10
2015-10-28 11:48:15 -07:00
Scott Erickson
0228614ef6
Fix login icon placement on IE10
2015-10-28 11:34:00 -07:00
Scott Erickson
31367f39c1
Add class "ie10" to body when using IE10
2015-10-28 11:33:36 -07:00
Imperadeiro98
16e30f5b9a
Update pt-PT.coffee
2015-10-28 17:37:59 +00:00
Nick Winter
448e1c3d9f
Propagated i18n
2015-10-28 09:08:05 -07:00
