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
7e645e7f91
Merge branch 'master' into feature/tomg/fall-design
2012-08-22 07:35:26 -04:00
Tom Giannattasio
441d1955f9
fixed anonymous header bug
2012-08-22 07:34:55 -04:00
Rocky Duan
4a3975c78d
adjusted frontend stuff
2012-08-21 23:33:13 -07: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
9162bdb1b9
Changed wiki setting so article owners can't change permissions.
2012-08-21 23:06:45 -04:00
Bridger Maxwell
9e81ea3981
Added instructor tabs to wiki course nav.
2012-08-21 22:31:13 -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
273af4a5ba
make delete work
2012-08-21 17:15:52 -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
Rocky Duan
4b97e70a4c
fixed bug when no data is transmitted otherwise
2012-08-21 17:10:29 -07:00
David Ormsbee
9bcd3cd495
Merge pull request #490 from MITx/feature/rocky/discussion_api_key
...
Feature/rocky/discussion api key
2012-08-21 17:09:26 -07:00
Rocky Duan
de4b477649
make edit working
2012-08-21 17:02:17 -07:00
Tom Giannattasio
202eb7b1e9
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 19:26:10 -04:00
Tom Giannattasio
bbc95cb589
fixed accordion nav glitch
2012-08-21 19:25:32 -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
e3a3f7094a
added shared key authentication
2012-08-21 15:45:41 -07:00
Rocky Duan
fe091b7bc1
Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key
2012-08-21 15:45:24 -07:00
Bridger Maxwell
214fb9185d
Disabling anonymous wiki access until styling supports it.
2012-08-21 18:42:20 -04:00
Tom Giannattasio
88505b3948
fixed discussion sidebar
2012-08-21 18:41:06 -04: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
Bridger Maxwell
1e068b6a4a
Disabled wiki attachments.
2012-08-21 18:01:51 -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
kimth
cfa2ba95bc
Merge pull request #485 from MITx/feature/kfiedler/courseware-style
...
Fix for CSM Sass and fix headers in tutorials
2012-08-21 14:17:20 -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
Rocky Duan
72e6588be4
Merge branch 'master' into refactor
2012-08-21 13:34:20 -07:00
Arjun Singh
02ecfb4730
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:25:29 -07:00
Arjun Singh
b86fbdbd10
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:23:00 -07:00
Rocky Duan
2265713028
added shared key authentication
2012-08-21 13:22:48 -07:00
Calen Pennington
188584c77d
Allow puppet to set COURSE_LISTINGS
2012-08-21 16:21:43 -04:00
Kyle Fiedler
3273de93fe
make tutorial headers normal size
2012-08-21 16:01:48 -04:00
Bridger Maxwell
6ce69e28ae
Moved the wiki 404 page into the django-wiki project.
2012-08-21 15:58:35 -04:00
Rocky Duan
cf28dbea60
Merge branch 'feature/bk_forum_int'
2012-08-21 12:56:56 -07: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
Calen Pennington
99f94b0a6b
Merge pull request #472 from MITx/feature/victor/per-course-progress
...
Feature/victor/per course progress
2012-08-21 12:29:03 -07:00
Bridger Maxwell
9cc72c4965
Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql.
2012-08-21 15:02:27 -04:00
Victor Shnayder
d13998a135
add docstring comment
2012-08-21 15:02:27 -04:00
Victor Shnayder
ec90200b81
fix migration to remove out of date index
...
* reorder index fields
2012-08-21 15:02:26 -04:00
Victor Shnayder
f44d794e63
Add course_id to StudentModule
...
* Update all uses.
2012-08-21 15:01:54 -04: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
