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

37 Commits

Author SHA1 Message Date
chrisndodge
7735e37585 Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration 
Added videoalpha to advanced components in component.py file.
 2013-06-02 13:04:33 -07:00
Valera Rozuvan
37cffd0835 Added videoalpha to advanced components in component.py file. 2013-05-31 13:48:17 +03:00
cahrens
14eb9c9a3b Merge branch 'master' into feature/christina/metadata-ui 2013-05-30 12:27:03 -04:00
cahrens
aca5cbb215 Merge branch 'master' into bug/christina/preview_url 2013-05-28 12:13:19 -04:00
cahrens
87d904cb35 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/templates/base.html
 2013-05-24 16:10:34 -04:00
cahrens
522b76e847 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:27:05 -04:00
chrisndodge
a8084628e1 Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master 
Feature/cdodge/autoprovision forums master
 2013-05-23 09:27:36 -07:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04:00
David Baumgold
be8daf7468 /event was returning invalid JSON: fix it 2013-05-22 15:55:56 -04:00
David Baumgold
8e384a73be Remove proof-of-concept page 2013-05-22 15:55:51 -04:00
Chris Dodge
9b88528b04 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 13:20:49 -04:00
Arthur Barrett
cf502e2349 Fix advanced modules list. 2013-05-21 17:49:20 -04:00
cahrens
f3bd9ab234 Get rid of empty, store ID. 2013-05-21 14:29:33 -04:00
Chris Dodge
a44e816877 remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py 2013-05-20 10:33:52 -04:00
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
Christina Roberts
f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages 
Make sure to get the correct modulestore on delete (static tabs do not e...
 2013-05-17 09:59:59 -07:00
cahrens
944d2d61f1 Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). 
#324
 2013-05-16 17:15:53 -04:00
Arthur Barrett
430e009b5d added TODO for open ended and notes tab advanced policy settings. 2013-05-16 13:22:40 -04:00
Chris Dodge
5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
 2013-05-14 10:57:11 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Calen Pennington
bd6bb8e9c1 Fix advanced modules list 2013-05-14 09:39:25 -04:00
Arthur Barrett
bea943d537 merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules. 2013-05-13 16:26:28 -04:00
Chris Dodge
155ad08b9e create forums permissions on course create 2013-05-13 16:04:20 -04:00
Steve Strassmann
7b71271bc1 prefix unused vars with _ 2013-05-13 15:21:29 -04:00
Steve Strassmann
10b7622018 declare exports from course, component 2013-05-13 15:06:52 -04:00
Steve Strassmann
b3cc9a1174 pep8 cleanups 2013-05-13 14:55:41 -04:00
Steve Strassmann
96c37089dc whitespace for pep8 2013-05-13 13:47:51 -04:00
Steve Strassmann
8bb6ad3689 relative imports 2013-05-13 11:31:56 -04:00
Steve Strassmann
e03585d85c pylint: refactor imports 2013-05-13 11:07:08 -04:00
Steve Strassmann
b288a8e3bd fix export from tabs.__all__ 2013-05-13 10:03:20 -04:00
Steve Strassmann
979e3be174 fix pep8: imports and blank lines 2013-05-13 09:58:30 -04:00
Steve Strassmann
c071ee448f pep8 compliance 2013-05-10 16:51:26 -04:00
Steve Strassmann
571a9af0c0 declared exports 2013-05-10 16:37:28 -04:00
Steve Strassmann
70cca0540d reorder imports for pep8 2013-05-10 15:23:28 -04:00
Steve Strassmann
01d4fbeb7c reorder imports 2013-05-10 14:14:36 -04:00
Steve Strassmann
9350a2c067 refactoring views 2013-05-10 13:56:30 -04:00
Steve Strassmann
0bea50ede1 start refactoring views.py 2013-05-09 16:24:21 -04:00