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

3928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brittany Cheng
6c214fc4bd basic paginator styles 2012-08-01 18:03:36 -04:00
Brittany Cheng
dac66a998e Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-08-01 17:06:37 -04:00
Brittany Cheng
01ac251c2b styles and staff 2012-08-01 17:06:32 -04:00
Rocky Duan
ce15faf6a0 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 2012-08-01 16:52:06 -04:00
Rocky Duan
fc31885d2e Merge branch 'master' into discussion2 2012-08-01 16:51:54 -04:00
Rocky Duan
1ee1d900ab fixded inline with pagination 2012-08-01 16:51:32 -04:00
Rocky Duan
0dccfc0a8d forgot to change template name 2012-08-01 16:47:20 -04:00
Brittany Cheng
7bb329d436 vote styles 2012-08-01 16:45:34 -04:00
Rocky Duan
5d3b187540 Merge branch 'master' of github.com:MITx/mitx 2012-08-01 16:45:21 -04:00
Rocky Duan
17d11a6391 pagination 2012-08-01 16:45:08 -04:00
Brittany Cheng
845ca43ea1 inline and forum styles 2012-08-01 16:42:09 -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
Brittany Cheng
07ebc83368 fixing merge error 2012-08-01 14:39:26 -04:00
Brittany Cheng
bdab90190f trying to fix merge conflicts 2012-08-01 14:29:00 -04:00
Brittany Cheng
01623ddbfb merge with origin master 2012-08-01 14:24:46 -04:00
Rocky Duan
f204e9888f renamed files 2012-08-01 13:09:19 -04:00
Rocky Duan
51772c04f3 use separate templates for forum view and inline view 2012-08-01 13:02:57 -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
Rocky Duan
7d9d790c5d endorse comments 2012-08-01 12:43:57 -04:00
Rocky Duan
75c478771e fixed histogram bug under staff view 2012-08-01 12:42:57 -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
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
Brittany Cheng
c107d109c9 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-01 11:29:26 -04: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