ichuang
938871571b
Merge branch 'master' of github.com:MITx/mitx into ExternalAuth
2012-08-01 23:01:29 -04:00
ichuang
ec78e1a126
add missing trailing slash
2012-08-01 20:19:33 -04:00
Kyle Fiedler
b90aa2e2db
Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class
2012-08-01 17:36:11 -04:00
Kyle Fiedler
cdd37eeb92
Strip down sequence navigaiton and more stripping of the courseware nav
2012-08-01 17:36:10 -04:00
ichuang
10ebcefd54
add openid authentication
2012-08-01 14:59:55 -04:00
Victor Shnayder
05c22c4901
Prettier error display
...
* Log formatted traceback string instead of exc_info tuple itself
* display as a list
2012-08-01 11:48:19 -04:00
Victor Shnayder
32253510d1
Import error cleanup
...
* call error tracker when needed
* remove duplicate logging--just add info and re-raise
* xml modulestore uses error tracker to capture load errors
* add unstyled list of import errors to courseware homepage!
2012-08-01 11:48:19 -04:00
Victor Shnayder
bc14441a75
add template I forgot
2012-08-01 11:48:18 -04:00
Calen Pennington
ef8a211b9e
Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading
...
Got profile page working again.
2012-08-01 08:37:16 -07:00
Bridger Maxwell
ae3da772d0
Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
2012-08-01 11:27:04 -04:00
Kyle Fiedler
9d14033f6b
Added some styles for the top navigation and for the sidebar navigation
2012-07-31 16:29:01 -04:00
Victor Shnayder
71b9dbbb2e
Remove obsolete js references
2012-07-31 16:15:33 -04:00
Kyle Fiedler
d30ae5389e
Added fix for videos start to zero out colors and mit styles
2012-07-31 14:18:42 -04:00
Kyle Fiedler
c611bd9228
added treeview
2012-07-30 17:39:44 -04:00
Kyle Fiedler
7ab5bbfaef
Moved files and removed files
2012-07-30 17:37:53 -04:00
Bridger Maxwell
0a60881ca5
Merge branch 'master' of github.com:MITx/mitx
2012-07-27 08:50:07 -04:00
Bridger Maxwell
351ded6c05
Merge branch 'MITx/hotfix/1.0.2'
2012-07-27 08:49:33 -04:00
Calen Pennington
6abd1ec64a
Merge pull request #309 from MITx/feature/tutorials_fix
...
Add optional hide_from_toc attribute to XML elements
2012-07-27 05:38:29 -07:00
Bridger Maxwell
dc021312dd
Added faq about UC Berkeley's 'X University' Consortium.
2012-07-27 08:38:01 -04:00
David Ormsbee
72341569f9
Remove sections from ever getting appended in the first place if hide_from_toc is true
2012-07-27 01:22:07 -04:00
David Ormsbee
2671801f93
Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation).
2012-07-26 14:55:42 -04:00
Matthew Mongeau
8e2ced916f
Add field-error class to field with issues.
2012-07-26 14:06:29 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
David Ormsbee
e4073663e2
Have Bloomberg link point to Bloomberg article :-P
2012-07-25 18:47:26 -04:00
David Ormsbee
5ad1791433
add a few items to the press links at the bottom of the front page
2012-07-25 18:31:57 -04:00
David Ormsbee
9671df3e25
minor typo fixes
2012-07-25 18:22:46 -04:00
Kyle Fiedler
8c079c8a72
Added styles for course images to always the right dimentions
2012-07-25 18:18:52 -04:00
David Ormsbee
a8610c3889
fixed twitter link to Berkeley Press Release
2012-07-25 18:15:37 -04:00
David Ormsbee
619d4cd989
fixed twitter link for course about pages
2012-07-25 18:14:05 -04:00
David Ormsbee
a86938ee93
New press articles
2012-07-25 18:09:26 -04:00
David Ormsbee
3a933aeab8
Update About Page text with new intro paragraph
2012-07-25 17:40:58 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
Kyle Fiedler
18dc689d4d
Added fix for where the course.css is being brought in
2012-07-25 14:57:44 -04:00
Kyle Fiedler
00596d2f20
Added courseware css back into the main template
2012-07-25 14:57:44 -04:00
Calen Pennington
0a79130b11
Make problem previews work by saving problem state in the current request session
2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678
Standardize how JS XModules are instantiated
2012-07-24 16:14:04 -04:00
Calen Pennington
87ce82570d
Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
2012-07-24 16:14:03 -04:00
Calen Pennington
7e4d3c8b35
Modularize sequence coffeescript in prepration for CMS preview
2012-07-24 16:14:02 -04:00
Calen Pennington
cb6c7640c8
Get the video module pointing to the correct static files directory, without relying on get_html replacement
2012-07-24 16:14:01 -04:00
Calen Pennington
3fa636e060
Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory
2012-07-24 16:13:59 -04:00
Calen Pennington
6bcc78f767
Make lms jasmine tests mostly pass
2012-07-24 16:13:59 -04:00
Calen Pennington
66f79251dc
Add feature flag for disabling course start dates
2012-07-24 13:22:50 -04:00
Calen Pennington
d8f8d8c656
Merge branch 'release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
2012-07-24 08:52:50 -04:00
David Ormsbee
749740eb07
Actually, the bg play YT bug was there because of the lack of a class on the section. Re-removing the YouTube title.
2012-07-23 23:05:06 -04:00
David Ormsbee
75ba3ebbd4
Reverting the YouTube title hiding commit because it brings back the 'video playing in the background when you hit back' bug
2012-07-23 23:02:04 -04:00
David Ormsbee
8b503eb1ef
Remove YouTube title from showing in homepage video (thanks, Arjun).
2012-07-23 22:59:45 -04:00
David Ormsbee
8db59825f1
Bad hardcoded hack fix to password reset.
...
We used to use Django templates and the Sites framework. At some point we
stopped, but this was leftover. The site_name no longer gets set properly.
It's probably a config issue, but not one I want to deal with right before
release, so I'm hardcoding it to link to the prod edx.org site until we
can sort what's what in the morning.
2012-07-23 22:27:33 -04:00
David Ormsbee
7e8986fce9
Merge pull request #287 from MITx/release_fixes
...
Release fixes
2012-07-23 18:03:21 -07:00
Bridger Maxwell
e7bb31af5b
Changed unenroll to unregister on dashboard.
2012-07-23 20:46:39 -04:00
David Ormsbee
e53ea2f81d
Add common tech problems to help page
2012-07-23 20:39:26 -04:00
