Commit Graph

23554 Commits

Author SHA1 Message Date
Julia Hansbrough
e3459cd3cb Opaque-Keys: Response to code review 2014-06-09 15:12:22 -04:00
Julia Hansbrough
3f3e9724d0 Add fallback for org based roles 2014-06-09 15:10:49 -04:00
Calen Pennington
29bb179afc Revert back to mongo-python-driver based on the 2.4.1 tag. 2014-06-09 15:10:48 -04:00
Diana Huang
729f0eb203 Fix variable name. 2014-06-09 15:10:48 -04:00
Diana Huang
a8a77b34cd Update hash to latest version. 2014-06-09 15:10:48 -04:00
Don Mitchell
6230e14d23 Use commit hash v tag for pymongo 2014-06-09 15:10:48 -04:00
Don Mitchell
36dacba63a Update to tagged version of pymongo 2014-06-09 15:10:47 -04:00
Don Mitchell
d66b480740 pymongo son optimizations 2014-06-09 15:10:47 -04:00
Don Mitchell
84ee2b19f2 OpaqueKey copy and deepcopy are identity ops
because keys are immutable
2014-06-09 15:10:47 -04:00
Don Mitchell
2c6437a279 Fix performance regression
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
2014-06-09 15:10:47 -04:00
Dave St.Germain
b073cfaece Fixes BLD-1104 2014-06-03 10:30:58 -04:00
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -04:00
Don Mitchell
701eac33ec get_courses doesn't return ErrorDescriptor 2014-05-29 11:01:56 -04:00
Calen Pennington
a2ce703327 Don't access course.id on ErrorDescriptors when listing courses from mongo 2014-05-29 10:25:32 -04:00
Don Mitchell
c37e241230 Make reverse matching robust to errored courses
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
2014-05-29 10:17:24 -04:00
Greg Price
f25dd8dd8b Merge pull request #3888 from edx/dhm/bug_get_children
Redirect most studio access through draft modulestore
2014-05-27 11:51:50 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
2014-05-27 11:16:29 -04:00
Greg Price
c0e1c21c35 Merge pull request #3874 from edx/sarina/opaque-keys-cleanup
Sarina/opaque keys cleanup
2014-05-27 11:12:05 -04:00
Sarina Canelake
736c316ad5 Merge pull request #3884 from edx/sarina/052714-translations
Update translations
2014-05-27 10:35:16 -04:00
Sarina Canelake
41bcad2ffe Update translations (autogenerated message) 2014-05-27 08:01:43 -04:00
Sarina Canelake
ed5c36ee2d Add Gujarati language 2014-05-27 07:43:03 -04:00
Sarina Canelake
84ecac97bd Add Oriya language 2014-05-27 07:42:58 -04:00
Julia Hansbrough
78ed9e9512 Fixed some TODOs, removed irrelevant ones 2014-05-24 19:36:24 -04:00
Sarina Canelake
46d7f99004 StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 19:36:18 -04:00
Sarina Canelake
d1672e31f7 Opaque-keys: fix pylint violations 2014-05-24 19:36:09 -04:00
Sarina Canelake
c535a6b933 Opaque-keys: fix pep8 violations 2014-05-24 19:35:58 -04:00
Jay Zoldak
b56e12ff03 Merge pull request #3843 from edx/zoldak/fix-brittle-checklist-acceptance-tests
Add the needed wait for ajax statements to checklist acceptance test methods
2014-05-23 17:02:19 -04:00
Steven Burch
6844575e08 Merge pull request #3676 from edx/f/forum-flag-digest
Add 'roles' endpoint to user_api
2014-05-23 13:33:59 -07:00
Will Daly
a49cf537e7 Merge pull request #3867 from edx/will/ora2-release-2014-05-23T16.59
ORA2 release-2014-05-23T16.59
2014-05-23 16:29: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
stv
e4df2c2ceb Add 'forum_roles' endpoint to user_api
Expose a new endpoint to query a list of users based on a
role name (Moderator, Student, etc.) and a course_id.

This will initially be used by the notifier to send daily digest
messages to forum moderators.
2014-05-23 13:07:04 -07:00
Will Daly
a74502bd33 ORA2 release-2014-05-23T16.59 2014-05-23 15:59:53 -04:00
Sarina Canelake
dd8d8fc5dd Merge pull request #3831 from lduarte1991/lduarte-harvardx-image
Installing Image Annotation Tool for Upcoming June 2014 Course
2014-05-23 15:40:39 -04:00
cahrens
94f050c418 Show the menus at the top of the page. 2014-05-23 15:32:27 -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
Alison Hodges
074c4b6681 Merge pull request #3860 from edx/ahodges/documentation/DOC394
Ahodges/documentation/doc394
2014-05-23 15:01:20 -04:00
Alison Hodges
e3bf3d8f9a Adding enrollment upgrade events 2014-05-23 15:00:41 -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
008bbc224b Image Annotation Tool: Add static images for openseadragon navigation 2014-05-23 14:57:48 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
lduarte1991
c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors
Small plugin fixes
2014-05-23 14:57:16 -04:00
Jay Zoldak
b19acf693b Add the needed wait for ajax statements to checklist acceptance test methods 2014-05-23 13:30:31 -04:00
Jay Zoldak
fffdeeb95b Merge pull request #3845 from edx/zoldak/brittle-html-editor-tests
Wait for ajax to complete when editing components in Studio acceptance tests
2014-05-23 13:28:41 -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
Mark Hoeber
38e882e8d9 Merge pull request #3857 from edx/markhoeber/documentation/doc-484
Fixed typo in Studio Home Page panel help text
2014-05-23 12:36:49 -04:00
Greg Price
eb0e6c909b Add page num to forum search tracking log events 2014-05-23 11:55:45 -04:00
Jay Zoldak
753189f4d5 Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests
Skip intermittently failing js video tests
2014-05-23 11:54:19 -04:00
Mark Hoeber
8c4be448aa Fixed typo in Studio Home Page panel help text
DOC-484
2014-05-23 11:46:19 -04:00