Don Mitchell
|
d66f33956e
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
|
2012-12-19 17:31:30 -05:00 |
|
Don Mitchell
|
e37180e074
|
Generalized the grader drop down and applied to edit_subsection
|
2012-12-19 17:31:06 -05:00 |
|
Don Mitchell
|
14330ebc4a
|
Merge pull request #1187 from MITx/feature/christina/misc
Fix for Studio #87, plus some cleanup.
|
2012-12-19 14:03:05 -08:00 |
|
Brian Talbot
|
4d13744622
|
added new visual status to course listings on edx.org
|
2012-12-19 16:56:32 -05:00 |
|
cahrens
|
61c19dbc70
|
Fix for Studio #87, plus some cleanup.
|
2012-12-19 16:55:39 -05:00 |
|
Brian Wilson
|
ee99080687
|
add additional fields to testcenter user and update test center registration.
|
2012-12-19 16:53:13 -05:00 |
|
David Ormsbee
|
89527281e8
|
Merge pull request #1186 from MITx/content/rocha/new-courses-2013
Fix links for Software as a Service courses
|
2012-12-19 13:16:27 -08:00 |
|
David Ormsbee
|
65ec8ae056
|
Merge pull request #1185 from MITx/style/btalbot/edxsupportlogo
edX's Zendesk Logo
|
2012-12-19 13:15:26 -08:00 |
|
Carlos Andrés Rocha
|
b334394473
|
Fix links for Software as a Service courses
|
2012-12-19 16:13:17 -05:00 |
|
Diana Huang
|
fa97a6a528
|
Fix the font size
|
2012-12-19 16:04:47 -05:00 |
|
Calen Pennington
|
6905f7dfd1
|
Merge pull request #1183 from MITx/bug/dhm/ie7
Bug/dhm/ie7
|
2012-12-19 12:58:07 -08:00 |
|
Brian Talbot
|
4bcfa84519
|
adding zendesk logo for styling purposes
|
2012-12-19 14:25:59 -05:00 |
|
Christina Roberts
|
fbabbcdbf2
|
Merge pull request #1184 from MITx/fix/cdodge/user-tab-crash
malformed url generation for User's tab
|
2012-12-19 10:52:34 -08:00 |
|
Chris Dodge
|
91b0fddfce
|
malformed url generation for User's tab
|
2012-12-19 13:49:47 -05:00 |
|
Diana Huang
|
ce9229fac6
|
Merge branch 'master' into feature/diana/rubric-input
|
2012-12-19 13:17:10 -05:00 |
|
Diana Huang
|
728103056d
|
Move rubric into a subset of problem in CSS.
|
2012-12-19 13:16:35 -05:00 |
|
Bridger Maxwell
|
d911297670
|
The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade.
|
2012-12-19 12:47:43 -05:00 |
|
Bridger Maxwell
|
5a65c24507
|
Added parameters to hide grade totals and grade cutoffs in progress graph.
|
2012-12-19 12:37:02 -05:00 |
|
David Ormsbee
|
a53959a770
|
Merge pull request #1181 from MITx/content/rocha/new-courses-2013
Add news announcement for spring 2013 courses
|
2012-12-19 09:36:10 -08:00 |
|
David Ormsbee
|
ed051a50a2
|
Merge pull request #1180 from MITx/feature/rocha/google-analytics-on-registration
Add google analytics to model signup and login panels
|
2012-12-19 09:12:50 -08:00 |
|
David Ormsbee
|
4a283218ca
|
Merge pull request #1179 from MITx/content/rocha/job-and-faq-update
Update jobs and faq page
|
2012-12-19 09:12:02 -08:00 |
|
Carlos Andrés Rocha
|
a239fe2ee7
|
Add google analytics to model signup and login panels
[# 40805407]
|
2012-12-19 12:07:34 -05:00 |
|
Diana Huang
|
11d5eea2b9
|
Add in CSS updates and fixes to the template so that it will work.
|
2012-12-19 11:52:37 -05:00 |
|
Carlos Andrés Rocha
|
6d85accad8
|
Add news announcement for spring 2013 courses
[# 41258693]
|
2012-12-19 11:49:55 -05:00 |
|
Bridger Maxwell
|
f23bf85199
|
Added config to grader to hide averages of pset scores.
|
2012-12-19 11:44:32 -05:00 |
|
chrisndodge
|
3ae08d101c
|
Merge pull request #1178 from MITx/fix/zoldak/cms-jasmine
CMS Jasmine tests are fixed. Fail the Jenkins edge build when CMS Jasmine specs fail.
|
2012-12-19 08:42:08 -08:00 |
|
Carlos Andrés Rocha
|
42857796c0
|
Update jobs and faq page
[#41258701 #41258685]
|
2012-12-19 11:39:44 -05:00 |
|
chrisndodge
|
8d15860c66
|
Merge pull request #1177 from MITx/bug/dhm/dec12
Bug/dhm/dec12
|
2012-12-19 08:33:17 -08:00 |
|
Jay Zoldak
|
e21c17ffeb
|
Fail the Jenkins build when CMS Jasmine tests fail.
|
2012-12-19 11:32:55 -05:00 |
|
Jay Zoldak
|
b19aa06540
|
Fix broken jasmine tests for CMS. All (11) specs are now passing.
|
2012-12-19 11:26:36 -05:00 |
|
Don Mitchell
|
08d5ab0a3b
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
|
2012-12-19 11:11:24 -05:00 |
|
Don Mitchell
|
b689d19bec
|
Ensure empty video string deletes the video record and doesn't create
a partial descriptor.
Use 400 not the contrived 515 for malformed html.
|
2012-12-19 11:11:14 -05:00 |
|
Don Mitchell
|
4a953d4949
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-12-19 10:51:58 -05:00 |
|
Don Mitchell
|
326d21d143
|
ie7 fixes: define indexOf, use charAt rather than [] to access string,
put try/catch around fn that was throwing errors.
|
2012-12-19 10:48:03 -05:00 |
|
chrisndodge
|
c1c88a207d
|
Merge pull request #1172 from MITx/bug/dhm/dec12
Gives warning on type name change
|
2012-12-19 06:33:02 -08:00 |
|
David Ormsbee
|
0c4ced6361
|
Merge pull request #1176 from MITx/feature/dave/freeform_advertised_start
Basic support for freeform advertised_start dates like 'Spring'
|
2012-12-19 01:14:29 -08:00 |
|
David Ormsbee
|
8373ee4bf6
|
Basic support for freeform advertised_start dates like 'Spring'
|
2012-12-19 04:01:37 -05:00 |
|
Brian Wilson
|
f472ac60f5
|
minor tweaks to test center registration
|
2012-12-19 00:21:49 -05:00 |
|
Brian Wilson
|
f912ffe8a2
|
add persistence of testcenter_user registration
|
2012-12-18 18:31:41 -05:00 |
|
Brian Wilson
|
bc40a7f127
|
make test-reg dialog non-modal, and pass course_id in URL. Add to course info.
|
2012-12-18 16:16:55 -05:00 |
|
Don Mitchell
|
b5fd6c9012
|
Send back error to client if failed to save malformed update and have it
show an alert.
|
2012-12-18 15:22:07 -05:00 |
|
Diana Huang
|
8a0dae01f0
|
Add in some sorting and validation of the options list
|
2012-12-18 14:32:10 -05:00 |
|
Don Mitchell
|
fc2b6f034b
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
|
2012-12-18 14:29:10 -05:00 |
|
Don Mitchell
|
0192a04b20
|
Fixed course_info parsing bug.
Addressed some of Christina's review comments.
|
2012-12-18 14:28:53 -05:00 |
|
chrisndodge
|
a34b42b8d2
|
Merge pull request #1174 from MITx/bug/btalbot/cms-userstab
cms - added users tab back into course navigation
|
2012-12-18 10:19:30 -08:00 |
|
Don Mitchell
|
dd758c06f7
|
Merge pull request #1175 from MITx/fix/cdodge/initializing-tabs
initialize the tabs metadata on course if we go to the edit-tabs page. T...
|
2012-12-18 10:13:35 -08:00 |
|
Chris Dodge
|
2ae2e46880
|
initialize the tabs metadata on course if we go to the edit-tabs page. This will prevent the author from getting into a bad state in the LMS
|
2012-12-18 13:08:21 -05:00 |
|
Diana Huang
|
dfe438dc73
|
Initial work on the rubric input type including the most basic parsing
without error handling
|
2012-12-18 13:02:17 -05:00 |
|
Brian Talbot
|
af5d007a8f
|
cms - added users tab back into course navigation
|
2012-12-18 12:50:04 -05:00 |
|
Don Mitchell
|
5709ff34f5
|
Refactored videos to a much simpler impl b/c about videos don't have
speeds and don't use the video/default.yaml format.
|
2012-12-18 12:46:54 -05:00 |
|