Commit graph

9343 commits

Author SHA1 Message Date
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
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
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
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
66b7bba09b Add GET /db/prepaid?creator=:id 2015-11-05 15:29:22 -08:00
Scott Erickson
b7843b59c8 Remove courses from purchasing course prepaids 2015-11-05 14:20:24 -08:00
Scott Erickson
6b5e13501e Allow classroom members to add themselves to course instances
This is so that the client will be able to add themselves to the
intro to computer science course, so that students joining classes will
have a course to enter.
2015-11-05 13:27:26 -08:00
Scott Erickson
f57cf3a83d Make POST /db/classroom/:id/members use update to avoid race conditions 2015-11-05 13:07:36 -08:00
Scott Erickson
6de6479f3b Add GET /db/classroom by member and GET /db/classroom/:id/members 2015-11-05 12:55:51 -08:00
Scott Erickson
9577236263 Add GET /db/course_instance list by owner and by member 2015-11-05 12:55:09 -08:00
Scott Erickson
4b71447877 Have POST /db/prepaid/:id/redeemers set user.coursePrepaidID property 2015-11-05 12:53:25 -08:00
Scott Erickson
00ce821939 Add InviteToClassroomModal, begin join class in StudentCoursesView 2015-11-04 16:54:13 -08:00
Scott Erickson
222b0b28e1 Adjust POST /db/classroom/:id/members to not need an actual id
Since students need to be able to join with just the code.
2015-11-04 15:33:19 -08:00
Scott Erickson
9a2bfee5a7 Add GET /db/classrooms?ownerID=:id to server endpoints 2015-11-04 12:41:13 -08:00
Scott Erickson
66432990f4 Add framework for new courses pages 2015-11-03 16:41:06 -08:00
Scott Erickson
aafdce6fbe Add POST /db/classroom/:id/invite-members 2015-11-03 14:46:13 -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
Scott Erickson
27d423a410 Add Classroom server model and endpoints 2015-11-02 17:07:23 -08:00
Scott Erickson
d6b57f0e76 Disabling redeem at once test, as it appears to be causing errors 2015-11-02 15:27:13 -08:00
Scott Erickson
513c7e7a07 Add POST /db/prepaid/:id/redeemers 2015-11-02 15:23:08 -08:00
Scott Erickson
7a237d27c2 Add redeemers.userID index to prepaids collection 2015-11-02 13:35:47 -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
Scott Erickson
e98d60fa7d Add jasmine-node to package scripts 2015-11-02 12:50:39 -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
Imperadeiro98
1cdb598350 Fixes to last merge 2015-10-31 14:06:13 +00:00
Imperadeiro98
02b4b68ccd Merge pull request #3150 from albenarammou/patch-3
Update bg.coffee
2015-10-31 14:02:57 +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
dillon
b5d92d5c26 Change 'Slack' back to 'HipChat' in multicore and server. 2015-10-30 15:26:18 -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
da9567f85f Add Wakka Maul to simulation rotation 2015-10-30 09:45:07 -07:00
Nick Winter
504e65ec27 Commit client-side code for acdfe7c 2015-10-30 09:43:05 -07:00
Nick Winter
acdfe7c1c4 Use level instead of levelID for getHistogramData to hit the index we already have 2015-10-30 09:25:58 -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