Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

24 Commits

Author SHA1 Message Date
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
 2013-05-20 10:22:36 -04:00
Jay Zoldak
71626f4ff6 Pep8 fixes of django_comment_client code 2013-05-16 15:57:34 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict"" 
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Chris Dodge
c20dd7d903 forgot to remove enough stuff from the django admin path 2013-05-06 16:40:25 -04:00
Chris Dodge
a92910db20 update lms to reflect where comment models.py is now in common 2013-05-06 16:23:32 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict" 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
 2013-04-26 12:40:35 -04:00
Your Name
0bcef4ddb7 fix merge conflicts 2013-04-22 12:54:33 -04:00
Your Name
7994e1b344 pep8 fixes 2013-04-22 12:53:30 -04:00
Chris Dodge
e0bc823365 remove auto-provisioning because of a dependency problem between cms and lms 2013-04-11 10:42:03 -04:00
Chris Dodge
3d7f893259 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision 2013-04-05 13:19:10 -04:00
Calen Pennington
72ce1af982 Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands 
fix forum management commands (assign_default_role was moved)
 2013-04-04 10:14:31 -07:00
Chris Dodge
02f97858f6 move the provisioning seeding from LMS into Common. Add provisioning seeding calling from create new course view. 2013-03-29 16:32:53 -04:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
ichuang
630607d345 fix forum management commands (assign_default_role moved); add reload_forum_users 2013-02-05 00:24:43 +00:00
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Arjun Singh
d9b553b378 Adding a better command for assigning roles. 2012-11-05 15:29:49 -08:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -04:00
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
Ibrahim Awwal
b4828db1e3 User profile page redone to act like the inline discussion, except threads are 
loaded into the page in a data attribute instead of loaded on request via ajax.
The user profile page also does not provide facilities for adding
comments/responses, which I think would clutter the page too much.

Also removed some unused stuff from views.py.
 2012-09-12 15:16:35 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
David Ormsbee
08e892ce9e Add command to seed forum permissions to existing users 2012-08-21 13:22:32 -04: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
eef24a5ebe added administrator role 2012-08-14 15:58:04 -07:00
Mike Chen
b2a048e6fc limit permissions of a role to courses and fix bugs 2012-08-08 10:42:29 -04:00