Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,193 Commits 1 Branch 0 Tags
bc0e590842e4887fcfe0e10973da15840cd0489d
Commit Graph

64 Commits

Author SHA1 Message Date
Chris Dodge
7962ad7dd0 remove incorrect comment 2013-07-03 13:46:31 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Chris Dodge
63ed16e118 add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for whitelisting of courses with respect to codejailing 2013-07-03 13:46:31 -04:00
Calen Pennington
1a7b833146 Merge pull request #269 from edx/dhm/incidental-functionality-improvements 
Incidental functionality improvements from Next Gen Modulestore work
 2013-07-01 13:04:20 -07:00
David Baumgold
923bcc555c Make CMS errors JSON-able if requested via AJAX 2013-07-01 15:09:41 -04:00
Don Mitchell
ef9c299413 Work around XBlock limitations to force persistance of field mutation 2013-07-01 12:33:08 -04:00
Don Mitchell
2fc7d3308c Customtags can't be inserted by studio 2013-07-01 12:33:08 -04:00
Don Mitchell
a2524c517f Force locations to be Location objects earlier 2013-07-01 12:33:08 -04:00
Don Mitchell
2ef4d82959 Standardize on get_default_time_display 2013-06-28 14:19:10 -04:00
Don Mitchell
e9bd1c5602 Fix SessionKeyValueStore.has to use the correct indexing value when looking up data 2013-06-28 14:19:10 -04:00
Calen Pennington
6e357db24c Merge pull request #268 from edx/dhm/cosmetic-cleanup 
Cosmetic Cleanups Incidental to Next Gen Modulestore Implementaton
 2013-06-27 05:44:49 -07:00
Don Mitchell
1344b1e521 Make SessionKeyValueStore variable names clearer 2013-06-26 14:19:33 -04:00
Don Mitchell
65b3bcdba6 Clean up variable naming 2013-06-26 14:19:33 -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
Chris Dodge
70ee4b8060 add unit tests for asset delete/restore 2013-06-17 11:10:35 -04:00
Chris Dodge
85b904f176 fix sizing of the delete column 2013-06-17 11:09:52 -04:00
Chris Dodge
9b749c4201 add ajax callback entry point to remove the asset 2013-06-17 11:09:52 -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
chrisndodge
e685ff7125 Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash 
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
 2013-06-11 12:52:56 -07:00
Chris Dodge
fa8ae228bf Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function 2013-06-11 13:38:01 -04:00
Don Mitchell
855433341d Minor code review fixes (removing commented code). 2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
Chris Dodge
d9ce3162e0 partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client 2013-06-10 11:47:37 -04:00
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