Rocky Duan
908a5c5d59
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-22 14:11:44 -07:00
Rocky Duan
3b76fe16d8
make inline page working
2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/envs/dev.py
2012-08-22 14:04:34 -07:00
David Ormsbee
fafbe41644
Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack
...
Enrollment hack for allowing Berkeley to add their students.
2012-08-22 13:59:07 -07:00
David Ormsbee
3b24ae1068
Merge pull request #501 from MITx/kimth/autodisable-syllabus
...
Dynamically disable syllabus per-course
2012-08-22 13:15:24 -07:00
Piotr Mitros
3777cd2f5e
Added missing file
2012-08-22 16:15:24 -04:00
David Ormsbee
c86ee73bd8
Merge pull request #504 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-22 13:13:33 -07:00
ike
7c242939f2
fix staff debug view, and also add new source_link
2012-08-22 15:51:08 -04:00
Kyle Fiedler
cca5fe2f04
Delete page
2012-08-22 15:40:56 -04:00
Kyle Fiedler
f4f8b7bf73
Added delete page and padding and hid th on overflow
2012-08-22 15:39:24 -04:00
kimth
f46607710f
Merge master
2012-08-22 15:25:07 -04:00
kimth
960cf5792b
Dynamically disable syllabus per-course
2012-08-22 15:12:49 -04:00
Kyle Fiedler
7464332180
added fix for error styles and swapped some the button order
2012-08-22 15:09:20 -04:00
Rocky Duan
9b26a20989
fixed search highlighting
2012-08-22 12:04:32 -07:00
David Ormsbee
8b8ee9f434
Merge pull request #500 from MITx/feature/cale/university-branding
...
Feature/cale/university branding
2012-08-22 12:02:19 -07:00
Calen Pennington
2eb0de99eb
Merge pull request #494 from MITx/feature/arjun/course_specific_css
...
Feature/arjun/course specific css
2012-08-22 11:55:20 -07:00
Calen Pennington
5ca636e606
Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH
2012-08-22 14:43:49 -04:00
Kyle Fiedler
d0c92aa159
Added styles for the wiki directory
2012-08-22 14:43:03 -04:00
Calen Pennington
82bab71ccf
First pass at branding the header logo on subdomains
2012-08-22 14:05:19 -04:00
Bridger Maxwell
14382702bc
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
...
Conflicts:
lms/templates/wiki/settings.html
2012-08-22 13:09:42 -04:00
Calen Pennington
aa933cb38f
Merge pull request #497 from MITx/feature/victor/catch-module-errors
...
Catch errors in module load
2012-08-22 10:05:08 -07:00
Victor Shnayder
365495521e
Catch errors in module load
...
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
2012-08-22 12:58:46 -04:00
Tom Giannattasio
fb1d9ca06c
Merge branch 'master' into feature/tomg/fall-design
2012-08-22 11:41:19 -04:00
Tom Giannattasio
7d903c4089
sidebar hover and firefox bug fixes
2012-08-22 11:40:59 -04:00
Arjun Singh
a9126aa276
Fixed syllabus to look good with new courseware styling
2012-08-22 05:25:48 -07:00
Arjun Singh
0b6bf77373
Adding a course-specific css class to body so that we can have course-targeted styles as a last resort
2012-08-22 05:00:39 -07:00
Tom Giannattasio
441d1955f9
fixed anonymous header bug
2012-08-22 07:34:55 -04:00
Rocky Duan
a90af0c471
render permalink in backend
2012-08-21 23:26:06 -07:00
Rocky Duan
654075e03f
migrated follow thread
2012-08-21 23:08:32 -07:00
Bridger Maxwell
723519ee74
Removed wiki/settings.html so the default one will be used.
2012-08-22 00:55:03 -04:00
Bridger Maxwell
a285d1a60e
Updated wiki preview template and django-wiki version.
2012-08-22 00:07:37 -04:00
Bridger Maxwell
e655b4a3b3
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
...
Conflicts:
cms/static/sass/_base.scss
repo-requirements.txt
2012-08-21 22:25:21 -04:00
Bridger Maxwell
82d414690b
Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled.
2012-08-21 22:23:40 -04:00
Rocky Duan
11e3276e80
update comment count based on operations
2012-08-21 17:43:20 -07:00
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Tom Giannattasio
202eb7b1e9
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 19:26:10 -04:00
David Ormsbee
f7539e8bce
Merge pull request #488 from MITx/kimth/fix-choiceresponse
...
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 15:46:32 -07:00
Rocky Duan
fdf92d68f6
more refactoring; enabled partial re-rendering for votes, endorse, and closed
2012-08-21 15:26:50 -07:00
Tom Giannattasio
bd536f8aec
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 18:13:40 -04:00
Tom Giannattasio
e762844c35
new sequence nav functionality - accommodates an infinite number of items
2012-08-21 18:12:59 -04:00
kimth
f83169f12d
Protect asciimath2jax in seq_contents, fix choiceresponse on CS169x
2012-08-21 17:54:21 -04:00
Bridger Maxwell
41831654ee
Added link to see wiki attachment history.
2012-08-21 17:44:38 -04:00
Victor Shnayder
2c19d01441
Merge pull request #479 from MITx/feature/arjun/syllabus
...
Adding a syllabus page (accessible via course navigation)
2012-08-21 14:33:07 -07:00
Bridger Maxwell
954ee6ab1f
Added link to list children of an article. Upgraded django-wiki version.
2012-08-21 17:09:24 -04:00
Bridger Maxwell
6ce69e28ae
Moved the wiki 404 page into the django-wiki project.
2012-08-21 15:58:35 -04:00
Calen Pennington
dca434ad34
Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate
...
add gitreload to lms-migration code
2012-08-21 12:52:52 -07:00
Arjun Singh
99703761b0
Merge master
2012-08-21 12:01:09 -07:00
Victor Shnayder
b97a2af2a2
Show policy, grading policy, and top-level errors
...
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
2012-08-21 15:00:21 -04:00
Tom Giannattasio
557975458c
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 14:50:15 -04:00
Calen Pennington
adf2d44d05
Merge pull request #482 from MITx/feature/dave/nav_fixes
...
Remove non-functioning News tab. Enable Instructor tab from Discussion page
2012-08-21 11:47:01 -07:00
