Calen Pennington
0bed19648e
Remove filename and giturl references
2013-01-02 15:08:27 -05:00
Diana Huang
8737009679
Merge branch 'master' into diana/peer-grading-views
2013-01-02 15:04:18 -05:00
Diana Huang
37f261f906
Move peer grading so that there are the individual problem pages
...
and the problem list page
2013-01-02 15:01:59 -05:00
Jay Zoldak
56d17d8a8a
Improve some comments and names in the acceptance test framework
2013-01-02 10:44:21 -05:00
Jay Zoldak
af4f1668d7
Stub out the video and capture the html files of the high level tabs for diff comparison
...
Conflicts:
lms/templates/video.html
2013-01-02 10:44:20 -05:00
David Ormsbee
8bf393fbba
Merge pull request #1182 from MITx/bridger/feature/ungraded_course
...
Visual changes for ungraded courses
2013-01-02 07:19:34 -08:00
Diana Huang
deffa188ff
Fix some minor problems and add new key for peer grading.
2013-01-02 09:43:21 -05:00
Diana Huang
652a8eb440
New peer grading view on the lms side
2012-12-28 15:48:06 -05:00
Calen Pennington
7977491ddf
WIP: LMS Courseware appears to be working
2012-12-28 14:51:50 -05:00
Calen Pennington
01411ae66e
WIP: Trying to get tests working
2012-12-28 14:48:47 -05:00
Calen Pennington
c5e3380b71
WIP: Save student state via StudentModule. Inheritance doesn't work
2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
2012-12-28 14:44:31 -05:00
Carlos Andrés Rocha
1ac41787a7
Fix broken display of courses in university profile
2012-12-21 16:38:17 -05:00
David Ormsbee
241b4eb0fe
Merge pull request #1196 from MITx/feature/rocha/change-courses-layout
...
New Layout for course listings with new course graphical overlay
2012-12-21 12:18:05 -08:00
Brian Talbot
45ed4a410c
resolving merge conflict around test_center_register.html template
2012-12-21 13:22:31 -05:00
Brian Talbot
3bd8f408b5
test center registration - added final styling and label focus JS
2012-12-21 13:16:39 -05:00
Brian Talbot
3987120496
test center registration - further UI design and styling on form and dashboard tweaks
2012-12-21 13:04:22 -05:00
Carlos Andrés Rocha
4959dc6005
Add Instructional Designer Job Post
2012-12-21 11:44:45 -05:00
David Ormsbee
f43c93e1d8
Merge pull request #1189 from MITx/fix/rocha/login-redirect
...
Fix django auth login redirection
2012-12-21 08:20:18 -08:00
Carlos Andrés Rocha
8ac89c39a7
Use course metadata instead of setting attributes to display new course overlay
2012-12-21 11:12:21 -05:00
Brian Wilson
2788ad8629
switch back to returning json to test_center_register template, and enable jquery handling in template.
2012-12-21 01:39:18 -05:00
Carlos Andrés Rocha
22de7cbb4e
Add logic to display courses by start date and show the new overlay
2012-12-20 20:05:11 -05:00
Carlos Andrés Rocha
a0d1d98c92
Merge branch 'style/btalbot/homepage-courselistings' into feature/rocha/change-courses-layout
2012-12-20 17:45:19 -05:00
Carlos Andrés Rocha
6ad6d348e6
Correct some spring courses announcement information
...
[#41545421 ]
2012-12-20 13:25:10 -05:00
Brian Talbot
76f6ee1877
test center - reorg of HTML - wip
2012-12-20 13:00:08 -05:00
Brian Talbot
5119257f3e
test center - fixed dashboard link font issue and started cleaning up markup in reg form - wip
2012-12-20 12:24:31 -05:00
Brian Talbot
f92266d659
course listings - new html and css for ordering - finished sass changes and static markup example
2012-12-20 09:55:52 -05:00
Brian Talbot
37e0d98fec
course listings - new html and css for ordering - wip
2012-12-20 09:32:15 -05:00
Brian Wilson
d5bd2313c1
fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics.
2012-12-20 04:16:00 -05:00
Carlos Andrés Rocha
5d85fab283
Fix django auth login redirection
...
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.
We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.
[#41499213 ]
2012-12-19 18:48:30 -05:00
Brian Talbot
4d13744622
added new visual status to course listings on edx.org
2012-12-19 16:56:32 -05:00
Brian Wilson
ee99080687
add additional fields to testcenter user and update test center registration.
2012-12-19 16:53:13 -05:00
Carlos Andrés Rocha
b334394473
Fix links for Software as a Service courses
2012-12-19 16:13:17 -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
Carlos Andrés Rocha
6d85accad8
Add news announcement for spring 2013 courses
...
[# 41258693]
2012-12-19 11:49:55 -05:00
Carlos Andrés Rocha
42857796c0
Update jobs and faq page
...
[#41258701 #41258685 ]
2012-12-19 11:39:44 -05:00
Brian Wilson
f472ac60f5
minor tweaks to test center registration
2012-12-19 00:21:49 -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
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
Brian Wilson
c7d379beb6
add first pass at wiring test registration dialog
2012-12-18 03:20:02 -05:00
Brian Wilson
b2117c1194
first dialogs
2012-12-17 17:59:44 -05:00
David Ormsbee
0ddea6d0ae
Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx
...
Feature/alex/video timeframe mitx
2012-12-17 13:20:47 -08:00
JM Van Thong
e40b0d0d08
Fixed data order when loading json record from request.
2012-12-14 17:16:57 -05:00
Tom Giannattasio
f3067cd8c8
restyling of dashboard with pearson exam notifications
2012-12-14 16:17:03 -05:00
Carlos Andrés Rocha
ede96d777d
Add member services job descriptions
...
[#40869383 ]
2012-12-13 14:27:04 -05:00
Diana Huang
4e81d9b2c5
Add some helpful indents and move the submission box to make
...
grading easier to read
2012-12-11 16:10:26 -05:00
Diana Huang
0e54592175
Add skip button logic to the LMS
2012-12-11 14:40:30 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
