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
|
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 |
|
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 |
|
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 |
|
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 |
|
Steve Strassmann
|
10b7622018
|
declare exports from course, component
|
2013-05-13 15:06:52 -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
|
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
|
9350a2c067
|
refactoring views
|
2013-05-10 13:56:30 -04:00 |
|