Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,938 Commits 1 Branch 0 Tags
3dffcaca1cb620ab5863ff1af7f736d78f3e7cbc
Commit Graph

428 Commits

Author SHA1 Message Date
Bridger Maxwell
3dffcaca1c Fixed capitalization in gradebook css. 2012-08-07 08:42:08 -04:00
Bridger Maxwell
873f1431ec Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course) 2012-08-06 18:51:11 -04:00
Bridger Maxwell
4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
 2012-08-06 16:49:05 -04:00
ichuang
b1ddff838c add comment about course start date logic 2012-08-06 14:23:55 -04:00
ichuang
6f894c816c use jquery for error msg in course_about 2012-08-06 14:19:45 -04:00
Bridger Maxwell
2348f71cc6 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 
Conflicts:
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/views.py
 2012-08-06 11:48:42 -04:00
Bridger Maxwell
cbab4f1006 Fixed some imports on gradebook.html 2012-08-06 11:32:26 -04:00
ichuang
0347eb498c add MITX_FEATURES flags to enable textbook and discussion, 
and modify course_navigation correspondingly
 2012-08-05 20:24:00 -04:00
ichuang
190f1f8f89 tracking_log template 2012-08-05 16:35:32 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00
ichuang
c20ebd13c4 in course_about.html make "You are registered..." a link to course 2012-08-04 08:22:06 -04:00
ichuang
30922fb449 add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check 2012-08-03 21:39:23 -04:00
Bridger Maxwell
6d650d1825 Got the gradebook working again with the new fast grading method. 2012-08-03 17:55:25 -04:00
Calen Pennington
9b322f68b4 Merge pull request #337 from MITx/feature/victor/use-url-names 
Feature/victor/use url names
 2012-08-03 13:23:31 -07:00
Calen Pennington
b1494da02c Merge pull request #330 from MITx/ExternalAuth 
External auth
 2012-08-03 13:18:55 -07:00
Victor Shnayder
b46172da9b Rename module.name and descriptor.name to url_name 
* update templates and code references
* also a display_name property that defaults to cleaned url_name
 2012-08-03 11:36:54 -04:00
Victor Shnayder
987b9c11a9 Use url_name for chapters and sections in lms views 
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
 2012-08-02 14:28:44 -04:00
Victor Shnayder
95e139f39b Merge pull request #336 from MITx/feature/victor/xml-verify 
Feature/victor/xml verify
 2012-08-02 11:12:43 -07:00
ichuang
10b2c212b6 fix javascript for signup modal .click() in index.html for safari 2012-08-02 13:52:25 -04:00
ichuang
46bc7bc499 remove unnecessary hidden fields 2012-08-02 13:44:37 -04:00
David Ormsbee
73fb8f5464 Merge branch 'hotfix/1.0.3' 
Conflicts:
	lms/urls.py
 2012-08-02 11:51:50 -04:00
Victor Shnayder
fc0f938eae Responding to comments on pull #326 
* cleaned up error module:
  - only one template
  - save error message in xml and reload
* better display of problem definition and metadata to staff
* save error messages as string, not exception objects.
 2012-08-02 09:56:01 -04:00
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
Calen Pennington
aa215bc316 Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3 2012-08-01 15:59:06 -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
a2271d4e48 The message div will only show up when there is a message to display. 2012-07-30 12:11:54 -04:00
Kyle Fiedler
b402cde650 Added some style for the dashboard message 2012-07-30 12:11:46 -04:00
Kyle Fiedler
c51f78bdfa Added styles for course images to always the right dimentions 2012-07-30 12:09:30 -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