David Ormsbee
73fb8f5464
Merge branch 'hotfix/1.0.3'
...
Conflicts:
lms/urls.py
2012-08-02 11:51:50 -04:00
Victor Shnayder
64346d727b
todos and comments
2012-08-02 11:33:53 -04:00
Rocky Duan
aa29b77715
Merge branch 'master' of github.com:MITx/mitx
2012-08-02 11:05:58 -04:00
Brittany Cheng
8febbf249f
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-02 10:06:43 -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
a759850e3e
add SSL / MIT certificates auth; clean up external_auth.views
2012-08-01 22:42:06 -04:00
ichuang
102d4906d0
fix problem with add_histogram (expects module as second argument)
2012-08-01 22:41:27 -04:00
Rocky Duan
efc0cc7ca7
oops
2012-08-01 21:31:06 -04:00
Rocky Duan
e05faef88a
fixed tag url
2012-08-01 21:26:14 -04:00
ichuang
ec78e1a126
add missing trailing slash
2012-08-01 20:19:33 -04:00
Rocky Duan
a8e23dcc53
Merge branch 'master' into discussion2
...
Conflicts:
lms/templates/discussion/_forum.html
lms/templates/discussion/_inline.html
2012-08-01 19:46:52 -04:00
Rocky Duan
9a31d7a9b4
basic sorting
2012-08-01 19:44:07 -04:00
Victor Shnayder
b63f05b651
update clean_xml script to use error trackers properly
2012-08-01 19:25:47 -04:00
Brittany Cheng
b2ddef99be
padding and margins of discussion containers
2012-08-01 18:14:59 -04:00
Brittany Cheng
03d9b7a928
merge kyle's style fixes
2012-08-01 18:09:27 -04:00
Brittany Cheng
ae89aac6ce
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-01 18:07:52 -04:00
Brittany Cheng
6c214fc4bd
basic paginator styles
2012-08-01 18:03:36 -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
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
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
