Rocky Duan
7cd0914541
minor changes
2012-08-04 16:06:15 -04:00
Rocky Duan
d507ac6cc0
should be like this
2012-08-03 16:23:19 -04:00
Rocky Duan
042ccf9754
make everything inline (ajax) for now
2012-08-03 16:09:13 -04:00
Rocky Duan
600beb2849
ajax vote / unvote comments
2012-08-03 14:52:39 -04:00
Rocky Duan
038d7f89e5
ajax editing comments / threads
2012-08-03 14:26:37 -04:00
Rocky Duan
7d1b577b80
show discussion & reply fix
2012-08-03 13:43:07 -04:00
Rocky Duan
9b2578c79c
fix reply & some random stuff
2012-08-03 13:35:15 -04:00
Rocky Duan
e59ea854ca
ajax submit new post
2012-08-03 12:29:45 -04:00
Rocky Duan
0b96d0091b
ajax reply & why am I on discussion2..
2012-08-03 12:15:45 -04:00
Rocky Duan
7ab137328f
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-03 10:16:35 -04:00
Rocky Duan
5ba879fc13
refactored some code
2012-08-02 18:23:50 -04:00
Rocky Duan
0375710d22
i meant sort before...this time it's search ajax
2012-08-02 16:01:27 -04:00
Rocky Duan
380c6f86e7
random fixes
2012-08-02 14:41:45 -04:00
Victor Shnayder
95e139f39b
Merge pull request #336 from MITx/feature/victor/xml-verify
...
Feature/victor/xml verify
2012-08-02 11:12:43 -07:00
Rocky Duan
de2f48b3bf
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-02 12:55:09 -04:00
Rocky Duan
f1b3f69656
retrieve threads by ajax
2012-08-02 12:54:09 -04:00
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
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
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
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
Calen Pennington
442fb6e839
Pass the cursor, rather than the output of cursor.execute, to dictfetchall
2012-08-01 16:19:29 -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
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
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
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
Rocky Duan
32c76d1351
bug fix search bar lol..
2012-07-31 14:08:31 -04:00
kimth
2e3c5de1a5
Remove hardcoding of LMS callback URL and default queuename
2012-07-31 14:08:02 -04:00
Rocky Duan
799f66b776
make search bar configurable
2012-07-31 13:26:36 -04:00
Rocky Duan
c39b2db678
retrieve inline discussion by ajax
2012-07-31 13:22:25 -04:00
