Kyle Fiedler
cdd37eeb92
Strip down sequence navigaiton and more stripping of the courseware nav
2012-08-01 17:36:10 -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
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
442fb6e839
Pass the cursor, rather than the output of cursor.execute, to dictfetchall
2012-08-01 16:19:29 -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
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
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
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
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
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
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
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
Brittany Cheng
8023d2b70a
pulled from origin master
2012-07-31 18:48:39 -04:00
Brittany Cheng
f1e07024d4
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 18:43:21 -04:00
Brittany Cheng
33c7336f1d
styles again
2012-07-31 18:17:35 -04:00
Brittany Cheng
72bd3e6db0
edit tag styles
2012-07-31 16:44:55 -04:00
Kyle Fiedler
b5b0d08621
Sorta fix askbot
2012-07-31 16:29:01 -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
Brittany Cheng
29d75057f2
fix font inheritance, update post control styles
2012-07-31 16:25:27 -04:00
Victor Shnayder
71b9dbbb2e
Remove obsolete js references
2012-07-31 16:15:33 -04:00
Rocky Duan
84fcb5ef52
change watch to follow in front end
2012-07-31 16:00:42 -04:00
Brittany Cheng
c69a4728e7
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 15:42:12 -04:00
Brittany Cheng
b12d887309
font sizing
2012-07-31 15:41:03 -04:00
Brittany Cheng
3d389c099e
new post control button and link styles
2012-07-31 15:05:07 -04:00
Rocky Duan
c46b232e19
oops missed a bracket
2012-07-31 14:32:00 -04:00
David Ormsbee
fafa86b413
Merge pull request #322 from MITx/feature/kfiedler/courseware-style
...
Added fix for videos start to zero out colors and mit styles
2012-07-31 11:31:16 -07:00
