David Baumgold
|
e0eec89e09
|
Truncate AJAX error messages in notification
|
2013-07-09 19:15:59 -04:00 |
|
David Baumgold
|
a84f66cd51
|
Pass asset upload URL to Javascript
|
2013-07-09 19:15:58 -04:00 |
|
David Baumgold
|
3d61c6294c
|
Stubbed out textbooks index page
|
2013-07-09 19:15:58 -04:00 |
|
David Baumgold
|
cc4e01b4c6
|
Removed obsolete active_tab template variable
|
2013-07-09 19:15:58 -04:00 |
|
Jean Manuel Nater
|
18861e4ef9
|
Removed some pep8 violations.
|
2013-07-09 19:15:57 -04:00 |
|
Don Mitchell
|
a2524c517f
|
Force locations to be Location objects earlier
|
2013-07-01 12:33:08 -04:00 |
|
cahrens
|
318372f2c0
|
Introduce course creator group.
|
2013-06-26 10:48:31 -04:00 |
|
cahrens
|
d601cee8e5
|
Merge branch 'master' into christina/course-settings-drupal
|
2013-06-20 11:00:12 -04:00 |
|
cahrens
|
6e96b88518
|
On marketing site, disable course settings options that do not work.
When on the marketing site (edx.org) disable portions of the course settings page in Studio that do not actually work in that environment.
|
2013-06-19 11:28:16 -04:00 |
|
Don Mitchell
|
1ff022e181
|
Incidental pep8 changes
|
2013-06-18 17:25:06 -04:00 |
|
cahrens
|
fae8fd3841
|
Merge branch 'master' into feature/christina/unify-fields
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/fields.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_fields.py
requirements/edx/github.txt
|
2013-06-13 10:55:13 -04:00 |
|
cahrens
|
6e92ddf3dd
|
Cannot set String field to a dict anymore!
|
2013-06-12 17:07:41 -04:00 |
|
Don Mitchell
|
d7194e6bec
|
struct_time to datetime conversion.
|
2013-06-10 17:16:34 -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 |
|
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 |
|
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
|
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
|
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 |
|
Steve Strassmann
|
0bea50ede1
|
start refactoring views.py
|
2013-05-09 16:24:21 -04:00 |
|