Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,621 Commits 1 Branch 0 Tags
026c6523e8f2d8fa14eabd30dcdddeb95c1ec61c
Commit Graph

8368 Commits

Author SHA1 Message Date
muhammad-ammar
026c6523e8 Merge pull request #3882 from edx/ammar/test-youtube-availibility 
Check YouTube Availability for Video Tests
 2014-05-29 23:53:58 +05:00
Andy Armstrong
138cd45934 Merge pull request #3819 from edx/andya/edit-containers 
Allow editing of container xblocks/xmodules
 2014-05-29 14:33:26 -04:00
Julia Hansbrough
172c6d1559 Merge pull request #3905 from edx/flowerhack/change-hardcoded-defaults 
Moved hardcoded defaults into settings
 2014-05-29 14:23:06 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
David Adams
1f0c104786 Merge pull request #3871 from edx/dcadams/fix_metrics_tab_after_opaque_keys 
Fixes some stuff for metrics tab
 2014-05-29 09:43:46 -07:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Usman Khalid
eceb8318f9 Merge pull request #3833 from edx/usman/lms2738-verify-student-urls 
Added trailing slashes to verify_student app urls.
 2014-05-29 16:22:00 +05:00
David Adams
9818cc7c66 Fixes some stuff in metrics tab 
Fixes some 500s after opaque-keys
  Adds a test which would have caught the 500s
  Fixes Transifex problem on the string % of students
 2014-05-28 17:31:32 -07:00
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00:00
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course. 
For large courses this causes export to take a long time and to time out.

LMS-2747
 2014-05-28 20:48:43 +05:00
Diana Huang
019374a41e Fix gen_cert_report to use CourseKeys. 2014-05-27 16:13:45 -04:00
Sarina Canelake
0a909a9b24 Merge pull request #3868 from edx/sarina/inst-dash-cleanup 
Make SPOC gradebook an API feature
 2014-05-27 11:53:29 -04:00
Sarina Canelake
1cd94cf5e5 Remove gradebook code from legacy.py (moved to instructor/views/api.py) 2014-05-27 10:59:16 -04:00
Sarina Canelake
1a4fcb055b Make SPOC gradebook an API implementation 
rather than just hacked in to the instructor_dashboard base file.
Also move the tests from the legacy implementation to the new dash API implementation.
 2014-05-27 10:59:16 -04:00
Diana Huang
eb8f696964 Merge pull request #3886 from edx/diana/clean-up-outdated-files 
Remove some outdated code.
 2014-05-27 09:35:22 -04:00
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
Usman Khalid
1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. 
LMS-2738
 2014-05-26 15:50:23 +05:00
polesye
8c26fc6805 Refactor video volume control. 2014-05-26 09:48:27 +03:00
Sarina Canelake
d01af063a6 Merge pull request #3861 from edx/sarina/fix-quality 
Fix quality violations from opaque-keys
 2014-05-24 19:34:25 -04:00
Julia Hansbrough
6f7bc7e174 Fixed some TODOs, removed irrelevant ones 2014-05-24 18:49:06 -04:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00
Sarina Canelake
01a4f3a21f Merge pull request #3863 from edx/sarina/feature-flag-analytics-dash 
Hide beta dash Analytics tab behind feature flag
 2014-05-23 16:21:19 -04:00
Sarina Canelake
682191c474 Hide beta dash Analytics score distribution widget behind feature flag 
ENABLE_INSTRUCTOR_ANALYTICS flag is present to conditionally hide data
dependent on external analytics server installation
 2014-05-23 15:31:22 -04:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails 
Changes requested in PR
 2014-05-23 14:59:31 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes 
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
 2014-05-23 14:58:18 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
Sarina Canelake
265fa826ca Opaque-keys: fix pylint violations 2014-05-23 14:23:12 -04:00
Sarina Canelake
bf32f5a7b9 Opaque-keys: fix pep8 violations 2014-05-23 14:22:54 -04:00
Calen Pennington
ecb05e6b03 Merge pull request #2905 from edx/opaque-keys 
(WIP) Make course ids and Locations/Locators opaque to LMS/Studio
 2014-05-23 12:58:20 -04:00
Greg Price
c96bf07be6 Merge pull request #3817 from edx/gprice/forum-search-event-page 
Add page num to forum search tracking log events
 2014-05-23 12:51:38 -04:00
Greg Price
eb0e6c909b Add page num to forum search tracking log events 2014-05-23 11:55:45 -04:00
Calen Pennington
8c8cf4705a Resolve conflicts 2014-05-23 11:39:17 -04:00
Calen Pennington
6225f4d0bd Merge remote-tracking branch 'edx/master' into ok-merge-from-master 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2014-05-23 11:38:33 -04:00
Calen Pennington
9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master 
Merge master into opaque-keys
 2014-05-23 11:36:52 -04:00
Stephen Sanchez
afd55164e6 Adding new attribute to the xmodule_runtime to check admin privileges on users 2014-05-23 09:23:21 -04:00
Sarina Canelake
faeee559fd Fix Instructor Dash UX (LMS-2748) 2014-05-22 16:53:20 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Diana Huang
db0cd78152 Remove some outdated code. 2014-05-22 15:39:29 -04:00
Calen Pennington
fb65aad11e Merge pull request #3826 from cpennington/ok-use-deprecated-for-instructor-api 
Use old deprecated form for instructor api calls, and in staff debug info
 2014-05-22 12:07:16 -04:00
Sarina Canelake
c7bf96f048 Merge pull request #3822 from edx/sarina/course-modes-display 
Sarina/course modes display
 2014-05-22 11:40:15 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Don Mitchell
253ed3b855 Merge pull request #3820 from edx/dhm/bug_ok_serial_numbers 
Dhm/bug ok serial numbers
 2014-05-22 09:36:43 -04:00
Calen Pennington
ba59e3b8a5 fixup! Serial number commands deserialize course keys 2014-05-22 09:06:13 -04:00
Nimisha Asthagiri
0631c6358c Merge pull request #3821 from edx/ok-permissions-asserts 
Added asserts to ensure course_ids are course key objects.
 2014-05-22 08:47:01 -04:00
Waheed Ahmed
b6a90e0bfa Fixed register button on edge homepage. 
LMS-2719
 2014-05-22 12:09:23 +05:00
Calen Pennington
4b69cf5472 Merge pull request #3810 from cpennington/ok-management-commands 
Fix management commands
 2014-05-21 21:53:43 -04:00
Calen Pennington
942c2eab30 Merge pull request #3815 from cpennington/ok-certificaties 
Fix certificate requests
 2014-05-21 21:52:54 -04:00
Sarina Canelake
4723467345 Validate forms to allow old and new style course key serialization syntax 2014-05-21 17:44:50 -04:00
Nimisha Asthagiri
d43386a0c6 Added asserts to ensure course_ids are course key objects. 2014-05-21 17:20:56 -04:00