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
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
Kyle Fiedler
57586caaff
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-21 13:55:14 -04:00
Kyle Fiedler
f68a97a63f
Added changes to wiki 404 and fixed CMS Sass
2012-08-21 13:54:58 -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
Bridger Maxwell
cb5e277422
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-21 12:00:13 -04:00
Bridger Maxwell
cfe553304c
Removed link to wiki settings until we have a better integration with notifications.
2012-08-21 12:00:05 -04:00
Kyle Fiedler
63900ef425
Added new wiki 404 page
2012-08-21 11:55:30 -04:00
Tom Giannattasio
fafb443484
fixed wiki styles
2012-08-21 09:24:55 -04:00
Arjun Singh
1cfed46d06
Adding a syllabus page (accessible via course navigation)
2012-08-21 05:47:26 -07:00
kimth
231aa4674c
Sequential modx/goto_position hits correct multicourse URL
2012-08-21 08:39:08 -04:00
Tom Giannattasio
ed1bac7629
fixed container padding and sidebar fades
2012-08-21 08:28:24 -04:00
Bridger Maxwell
fa3734b6fc
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
...
Conflicts:
repo-requirements.txt
2012-08-21 08:24:29 -04:00
Rocky Duan
07f818da5a
got reply working under backbone framework
2012-08-21 02:12:21 -07:00
Rocky Duan
9dedd532c4
some progress
2012-08-20 23:43:47 -07:00
Rocky Duan
9ac26715a6
Merge branch 'feature/bk_forum_int' into refactor
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
lms/templates/discussion/index.html
requirements.txt
2012-08-20 22:42:32 -07:00
Rocky Duan
bca6699b58
updated seed_permissions_and_roles to accept course_id as a parameter
2012-08-20 22:37:26 -07:00
Rocky Duan
17683c43d4
attempt to migrate more code
2012-08-20 22:24:58 -07:00
Rocky Duan
a905ac9e1d
updated backbone & single thread retrieval now working
2012-08-20 22:03:46 -07:00
Calen Pennington
b29e547d3d
Merge pull request #474 from MITx/kimth/progress-hide
...
Kimth/progress hide
2012-08-20 19:31:14 -07:00
Calen Pennington
27c0104bfb
Merge pull request #466 from MITx/feature/victor/html-escape-errors
...
html escape errors
2012-08-20 19:11:38 -07:00
Rocky Duan
d189a49ee5
continue working on backbone & got vote migrated and working
2012-08-20 17:32:36 -07:00
David Ormsbee
66a9512e57
disable askbot and enable berkeley forum in AWS config
2012-08-20 19:30:45 -04:00
ichuang
65ea54f7e2
typo in common.py ALLOWED_GITRELOAD_IPS fixed
2012-08-20 19:23:15 -04:00
ichuang
e1c9e52fc5
move textinput display:inline into capa display.scss file as class
2012-08-20 19:18:00 -04:00
David Ormsbee
1ebc810ae5
Fix some links taht were still pointing to the old courseware course_navigation pages.
2012-08-20 19:16:21 -04:00
Victor Shnayder
c5aef50701
add test database for new toy course. Trying to fix build
2012-08-20 19:11:47 -04:00
David Ormsbee
eb96497cff
Merge branch 'master' into feature/bk_forum_int
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 18:57:46 -04:00
kimth
eaef8c70a7
Lowercase
2012-08-20 18:51:34 -04:00
