Tom Giannattasio
d2808981cb
fixed wiki breadcrumb arrow bug
2012-08-22 12:09:57 -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
Tom Giannattasio
b7ce475adb
accordion hovers
2012-08-22 09:35:17 -04:00
Tom Giannattasio
8344fe88bd
removed funky footer logo animation
2012-08-22 09:08:42 -04:00
Tom Giannattasio
885efc47c4
darker background for increased contrast
2012-08-22 09:03:38 -04:00
Arjun Singh
a9126aa276
Fixed syllabus to look good with new courseware styling
2012-08-22 05:25:48 -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
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
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
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
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
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
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
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
Calen Pennington
9f23e4378e
Merge remote-tracking branch 'origin/hotfix/1.0.4'
2012-08-21 14:56:35 -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
Tom Giannattasio
ad5fcbe784
new header styles
2012-08-21 14:46:35 -04:00
Calen Pennington
86f20cc15d
Merge pull request #478 from MITx/kimth/fix-sequence-modx
...
Sequential modx/goto_position hits correct multicourse URL
2012-08-21 11:39:17 -07:00
David Ormsbee
3f0fba71d9
Remove non-functioning News tab. Enable Instructor tab from Discussion page
2012-08-21 14:29:30 -04:00
kimth
7d1fd538f2
Use data(...) rather than hidden span
2012-08-21 13:36:49 -04:00
kimth
9b3f560c98
Fix MathJax in sequentials
2012-08-21 13:32:55 -04:00
David Ormsbee
08e892ce9e
Add command to seed forum permissions to existing users
2012-08-21 13:22:32 -04:00
David Ormsbee
1c84f8e2dd
Remove student removal (we shouldn't ever delete users)
2012-08-21 13:00:06 -04:00
Tom Giannattasio
4e6d7babcc
fixed wiki bugs; started sequence nav bugs
2012-08-21 12:51:33 -04:00
David Ormsbee
b0894c3973
Fix tests for other courses - create default discussion roles on demand if they don't exist
2012-08-21 12:38:39 -04:00
David Ormsbee
b31722bcff
Merge branch 'master' into feature/bk_forum_int
2012-08-21 12:05:06 -04:00
David Ormsbee
6d371640d4
Removed signal removal in django_comment_client test (we're no longer doing user replication)
2012-08-21 12:04:24 -04:00
