Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
Kyle Fiedler
cdd37eeb92 Strip down sequence navigaiton and more stripping of the courseware nav 2012-08-01 17:36:10 -04:00
Rocky Duan
0dccfc0a8d forgot to change template name 2012-08-01 16:47:20 -04:00
Rocky Duan
5d3b187540 Merge branch 'master' of github.com:MITx/mitx 2012-08-01 16:45:21 -04:00
Victor Shnayder
ea26c25cb4 add back-compat code to customtag 
* apparently 6002x is using the impl-as-child structure already.
 2012-08-01 16:33:28 -04:00
ichuang
4874fa51ef remove cruft from student.views 2012-08-01 15:00:27 -04:00
ichuang
10ebcefd54 add openid authentication 2012-08-01 14:59:55 -04:00
Rocky Duan
777c3ee42c Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/profile.html
 2012-08-01 12:49:00 -04:00
Victor Shnayder
7fb831a2e8 Record warning on bad html files 2012-08-01 11:48:19 -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
740c9b7df1 fixed docstring for customtag 2012-08-01 11:48:18 -04:00
Victor Shnayder
0b67d1c401 Turn error_handlers into error_trackers 
* simplify logic--tracker just tracks errors.  Trackers should not raise,
      and are not be responsible for logging.
* adapted code to use trackers.
* Started cleanup of error handling code:
  - if need to add info and re-raise, just do that.  No logging.
  - if working around a problem, log and track as needed.
 2012-08-01 11:48:18 -04:00
Victor Shnayder
009bd23066 save LazyLoadingDict in case we do want it later 2012-08-01 11:48:18 -04:00
Victor Shnayder
58543bd84b definition and metadata no longer lazy-loaded 
* get rid of dump to json
* formatting
 2012-08-01 11:48:18 -04:00
Victor Shnayder
c0cdff7071 Rename MalformedDescriptor to ErrorDescriptor 
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
 2012-08-01 11:42:39 -04:00
Victor Shnayder
707551b08d local variable naming tweak 2012-08-01 11:40:12 -04:00
Victor Shnayder
0edc40de34 Address minor comments in #313 2012-08-01 11:40:12 -04:00
Victor Shnayder
0ae434cc09 Move path_to_location out of mongo.py 
* also bugfix for load_definition in html_module
* a bit of refactoring of Location checking code in mongo.py
 2012-08-01 11:40:12 -04:00
Victor Shnayder
ed35cefa29 Fix html file handling. 
* html files are now stored as follows:

If the html file is valid xml, store as html/stuff.xml

If it's not, store as html/stuff.xml, which contains
<html meta1="..."  filename="stuff.html">,
and html/stuff.html, which actually contains the contents.
Warn if the contents are not parseable with lxml's html parser,
but don't error.

* for parseable html, strip out the html tag when storing, so that it isn't
  rendered into the middle of a page

* lots of backcompat to deal with paths.  Can go away soon.

* fix output ordering in clean_xml
 2012-08-01 11:40:12 -04:00
Victor Shnayder
d750d945fd Remove malformed tags when contents aren't malformed anymore. 2012-08-01 11:40:12 -04:00
Victor Shnayder
c53ed6a238 remove some debugging messages 2012-08-01 11:40:11 -04:00
Victor Shnayder
0d83d2e645 Add roundtrip test for malformed module 
* also fix error message in backcompat_module
 2012-08-01 11:40:11 -04:00
Victor Shnayder
53608922ba Make the malformed descriptor import properly 
* Also get rid of lazy loading of metadata and definition
 2012-08-01 11:40:11 -04:00
Victor Shnayder
ef6da22ac3 Add a fallback MalformedDescriptor 
* when things don't load normally, use this
* separate raw editing functionality into EditingDescriptor
* raw descriptor just enforces that xml is valid
* add a MalformedDescriptor that just saves a string
* Fallback to it on import.
 2012-08-01 11:40:11 -04:00
Victor Shnayder
4e6a9b0df7 Add kwargs back to DescriptorSystem init()s 
* allow future expansion without breaking interface.
 2012-08-01 11:40:11 -04:00
Calen Pennington
0bfcefd214 Merge pull request #327 from MITx/fix-beautifulsoup4 
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
 2012-08-01 08:39:38 -07: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
kimth
8a983b3ced Queuekey does not need to be integer 2012-08-01 10:39:09 -04:00
kimth
fac7659315 Use xqueue cname 2012-08-01 10:23:30 -04:00
Brittany Cheng
f637ca5120 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-01 09:44:45 -04:00
ichuang
b9773b5d17 Merge pull request #323 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-31 19:45:55 -07:00
ichuang
381d247589 djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4 2012-07-31 21:43:29 -04:00
Brittany Cheng
f1e07024d4 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 18:43:21 -04:00
kimth
11495563fa Tweaks to CodeMirror: fix indentation, textarea is vertically resizable 2012-07-31 16:42:17 -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
kimth
2e3c5de1a5 Remove hardcoding of LMS callback URL and default queuename 2012-07-31 14:08:02 -04:00
Rocky Duan
20f958e6be bug fix: resize input for defaulttext (tagsinput) 2012-07-31 14:03:55 -04:00
Brittany Cheng
ddce6d8cb6 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-31 13:39:13 -04:00
Rocky Duan
c39b2db678 retrieve inline discussion by ajax 2012-07-31 13:22:25 -04:00
kimth
a773df588a Merge branch 'master' into kimth/lms-coderesponse 2012-07-31 13:02:48 -04:00
Brittany Cheng
32cf7c6f66 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 11:26:17 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Rocky Duan
ada66adff6 Merge branch 'master' of github.com:MITx/mitx 2012-07-31 10:12:06 -04:00
kimth
e2f4995bc9 LMS provides fully qualified callback URL 2012-07-31 08:57:28 -04:00
ichuang
94e73936fc Merge pull request #319 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-30 18:51:16 -07:00
kimth
6d600ecf2c Merge branch 'master' into kimth/lms-coderesponse 2012-07-30 20:42:10 -04:00
kimth
b9e5e9f0ee Read XML for queuename 2012-07-30 20:18:25 -04:00
kimth
6244412c28 Simplify default linenumbers behavior 2012-07-30 18:59:11 -04:00
Rocky Duan
d6b7707725 refactored reply rendering by using mustache 2012-07-30 18:19:04 -04:00