Victor Shnayder
ccf2cff2ba
bugfix: set errored_courses in default case
2012-08-21 15:00:21 -04: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
Victor Shnayder
f866854411
Load grading policy from policy/{url_name}/grading_policy.json
...
* with backcompat location /grading_policy.json
2012-08-21 15:00:21 -04:00
Victor Shnayder
eeadf0ba87
Let policies be stored in policies/{url_name}/policy.json
...
* still backcompat with old mode
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
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
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
David Ormsbee
8b01334a05
re-add pystache_custom requirement
2012-08-21 14:09:16 -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
32723cabc0
Merge pull request #458 from MITx/feature/bk_forum_int
...
Berkeley Forum Merge
2012-08-21 10:30:03 -07:00
Victor Shnayder
f1d670f9a8
remove no-longer-need < escape. Re #466
2012-08-21 13:29:11 -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
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
Calen Pennington
1666858c09
Merge pull request #477 from MITx/feature/arjun/check_filesubmission_names
...
Allowing filesubmissions to specify which files are allowed and require that certain files are present.
2012-08-21 09:17:13 -07: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
Calen Pennington
e0173d71a7
Merge pull request #471 from MITx/feature/bridger/new_wiki
...
New wiki update
2012-08-21 08:58:59 -07:00
Kyle Fiedler
63900ef425
Added new wiki 404 page
2012-08-21 11:55:30 -04:00
David Ormsbee
783a3905a4
disable user replication and associated tests
2012-08-21 11:39:36 -04:00
kimth
231aa4674c
Sequential modx/goto_position hits correct multicourse URL
2012-08-21 08:39:08 -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
Arjun Singh
11ffc6bb88
Allowing filesubmissions to specify which files are allowed and require that certain files are present.
2012-08-21 02:40:21 -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
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
David Ormsbee
c3718e49b6
Meaningless commit to force build
2012-08-20 20:15:07 -04:00
David Ormsbee
66a9512e57
disable askbot and enable berkeley forum in AWS config
2012-08-20 19:30:45 -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
ef2bfac32a
Merge branch 'master' of github.com:MITx/mitx
2012-08-20 19:11:58 -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
kimth
7e7247d8bf
Don't tabulate hidden chapters and sections in the Progress view
2012-08-20 18:47:18 -04:00
jarv
46c3e8a286
Merge pull request #473 from MITx/feature/pystache_custom
...
Remove pystache in favor of our custom version
2012-08-20 15:05:49 -07:00
David Ormsbee
356fac144b
Remove pystache in favor of our custom version
2012-08-20 18:04:37 -04:00
David Ormsbee
8ab98d33ea
remove pystache dependency
2012-08-20 18:02:32 -04:00
Victor Shnayder
868b076ea7
html escape errors
2012-08-20 17:55:59 -04:00
David Ormsbee
b6dfa50a73
Adjust settings so we can change the comments service URL from Django config
2012-08-20 17:33:45 -04:00
Bridger Maxwell
c0c23baac5
Removed inactive 'view this revision' button from history page.
2012-08-20 17:23:39 -04:00
Bridger Maxwell
8543f25358
Updated django-wiki version.
2012-08-20 16:51:39 -04:00
David Ormsbee
47bf516001
Remove unnecessary import that was failing a test
2012-08-20 16:48:31 -04:00
jarv
e89a7b67c5
Merge pull request #470 from MITx/jarv/dependency-update
...
ensuring pystache>=0.5.2
2012-08-20 13:46:02 -07:00
John Jarvis
bb80c66ed7
ensuring pystache>=0.5.2
2012-08-20 16:41:48 -04:00
David Ormsbee
d7327651eb
Merge pull request #469 from MITx/jarv/dependency-update
...
updating dependencies for pystache, networkx, graphviz and removing redu...
2012-08-20 13:37:57 -07:00
John Jarvis
55251039d9
updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles
2012-08-20 16:35:42 -04:00
David Ormsbee
3762efd2ec
added pystache dependency
2012-08-20 16:34:13 -04:00
Bridger Maxwell
46d2e71ac1
Fixed bug in breadcrumbs.
2012-08-20 16:24:12 -04:00
