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
Piotr Mitros
69a3ea63bc
Fixed minor issues (removed two unnecessary lines)
2012-08-22 16:32:14 -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
Bridger Maxwell
a694d1034e
We use django-wiki's built-in wikilinks markdown extension. They were clashing.
2012-08-22 15:57:44 -04:00
Piotr Mitros
a301abd5ad
Enrollment hack for allowing Berkeley to add their students.
2012-08-22 15:49:48 -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
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
Bridger Maxwell
788c74e07a
Added optional <wiki> tag to course to specify an alternative wiki page.
2012-08-22 14:25:05 -04:00
Rocky Duan
37c78524a8
migrated threads reloading related stuff
2012-08-22 11:07:02 -07: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
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
Bridger Maxwell
3796bb4a12
Changed title of default root wiki page to just be Wiki.
2012-08-22 12:42:03 -04:00
Bridger Maxwell
96f0f7cbde
Changed default contents of new course wiki.
2012-08-22 11:36:06 -04:00
Rocky Duan
a90af0c471
render permalink in backend
2012-08-21 23:26:06 -07:00
Bridger Maxwell
9e81ea3981
Added instructor tabs to wiki course nav.
2012-08-21 22:31:13 -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
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
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
fe091b7bc1
Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key
2012-08-21 15:45:24 -07:00
Rocky Duan
fdf92d68f6
more refactoring; enabled partial re-rendering for votes, endorse, and closed
2012-08-21 15:26:50 -07: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
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
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
David Ormsbee
3f0fba71d9
Remove non-functioning News tab. Enable Instructor tab from Discussion page
2012-08-21 14:29:30 -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
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
Arjun Singh
1cfed46d06
Adding a syllabus page (accessible via course navigation)
2012-08-21 05:47:26 -07: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
a905ac9e1d
updated backbone & single thread retrieval now working
2012-08-20 22:03:46 -07:00
Rocky Duan
d189a49ee5
continue working on backbone & got vote migrated and working
2012-08-20 17:32:36 -07:00
