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

3792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Shnayder
41eca8a0a5 Move files into xmodule module per comment on #326 
* move html_checker.py
* move stringify.py
* move tests into module
* remove duplicate progress.py
* fix module imports
 2012-08-02 10:13:58 -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
Calen Pennington
a7ae7905ea Merge pull request #334 from MITx/feature/victor/metadata-inherit 
Feature/victor/metadata inherit
 2012-08-02 06:25:09 -07:00
Victor Shnayder
e2ce54612c remove debugging assert from test 2012-08-01 19:25:47 -04:00
Victor Shnayder
652e2aa24c fix for inheriting metadata bug 
* problem was on import to json--got all the metadata,
  but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
 2012-08-01 19:25:47 -04:00
Victor Shnayder
b63f05b651 update clean_xml script to use error trackers properly 2012-08-01 19:25:47 -04:00
Victor Shnayder
82899323e8 Add metadata inherit test 
* also make a placeholder roundtrip export test
 2012-08-01 19:25:47 -04:00
Victor Shnayder
2f4bf5f606 Minor fixes to cms 
* make logging work properly in cms, dev
* fix a comment
 2012-08-01 19:25:47 -04:00
David Ormsbee
eedf62a1a9 Merge pull request #333 from MITx/feature/kfiedler/courseware-style 
Strip down sequence nav, start to use ems for font size instead of pixels and started to strip down the info page
 2012-08-01 14:58:02 -07: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
6c3ec99f9e Start to change to ems and remove all of cream 2012-08-01 17:36:10 -04:00
Kyle Fiedler
cdd37eeb92 Strip down sequence navigaiton and more stripping of the courseware nav 2012-08-01 17:36:10 -04:00
jarv
0e7ce4a6be Merge pull request #332 from MITx/jarv/prod-requirements 
Jarv/prod requirements
 2012-08-01 13:58:33 -07:00
John Jarvis
a68cb545be updating prod-requirements 2012-08-01 16:57:13 -04:00
John Jarvis
04f82b7b02 Merge branch 'master' of github.com:MITx/mitx into jarv/prod-requirements 2012-08-01 16:56:49 -04:00
Calen Pennington
7350243de5 Merge pull request #331 from MITx/feature/victor/xml-verify 
add back-compat code to customtag
 2012-08-01 13:35:45 -07: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
Calen Pennington
3b34d84216 Merge pull request #326 from MITx/feature/victor/xml-verify 
Feature/victor/xml verify
 2012-08-01 13:20:43 -07: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
463b758434 fixed args in call to add_histogram 2012-08-01 11:48:18 -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
119ab639d0 make cms users look like staff by default 
* so they get the staff view of problems
* does NOT actually set User.is_staff
 2012-08-01 11:48:18 -04:00
Victor Shnayder
bc14441a75 add template I forgot 2012-08-01 11:48:18 -04:00
Victor Shnayder
e2e524453f Make courseware index view more bulletproof 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
46775386d3 make CACHE_TIMEOUT messages go away 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
10054e95ce add message to import command 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
jarv
a2e1409dbb Merge pull request #328 from MITx/jarv/dev-script-updates 
Jarv/dev script updates
 2012-08-01 08:13:34 -07:00
John Jarvis
94c19059b5 trailing whitespace 2012-08-01 11:08:41 -04:00
John Jarvis
71898e4869 removing matplotlib from requirements.txt 2012-08-01 10:54:50 -04:00
John Jarvis
8c1bb0cab2 sanity checking /usr/local, updating coffee script install location, old location no longer works 2012-08-01 10:54:32 -04:00
ichuang
b9773b5d17 Merge pull request #323 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-31 19:45:55 -07:00