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

23575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lduarte1991
e48cc16d45 Annotations Tools: i18n Make stati strings extractable 
Original changes found in this commit
https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca
3512bb085eb

Conflicts:
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
 2014-06-11 10:23:45 -04:00
lduarte1991
848c7165e3 Annotation Tool: PR #4019 
Reverting commit @3bfb633 and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
 2014-06-11 10:21:08 -04:00
lduarte1991
fecb2e1682 Annotation Tool: PR #3969 
Text Annotation Tool: Added Instructor Filter and Clear Search

Video Annotation Tool: Added Instructor Filter

Image Annotation Tool: Added Instructor Filter

Image Annotation Tool: Annotation Mode for AB Testing

Annotation Tools PR Fixes

- forgot to overwrite the previous line

Annotation Tools: PR Fixes

- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA

Annotator Tools: OpaqueKeys update for Notes

Annotation Tools: Added CommonAnnotatorMixin

Annotator Tool: Fixed delete bug and factored out settings

Removed print context

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
	lms/djangoapps/notes/views.py
 2014-06-11 10:19:06 -04:00
lduarte1991
643a7bfa95 Annotation Tools: PR #3907 
Annotation Tools: Load Tinymce in student_view

Annotation Tools: Fixing tests for student_view

Fixed typo from autocomplete

Fixed dict for tests
 2014-06-11 10:15:14 -04:00
Diana Huang
0df7037650 Send the serialized string to the track_function in split_test_module. 2014-06-10 17:02:53 -04:00
Sarina Canelake
21a784b469 Merge pull request #3968 from edx/hotfix/2014-06-03 
Fix performance regression
 2014-06-10 16:40:31 -04:00
Julia Hansbrough
b7b0414607 Merge pull request #4036 from edx/flowerhack/conditional-module-rendering 
Flowerhack/conditional module rendering
 2014-06-10 11:35:19 -04:00
Julia Hansbrough
6e702c3131 Fix conditional module rendering 2014-06-10 15:32:32 +00:00
Sarina Canelake
749cb4ee7d Merge pull request #4031 from edx/sarina/other-ok-fixes 
Sarina/other ok fixes
 2014-06-09 15:18:13 -04:00
Sarina Canelake
305c126e68 Merge pull request #4030 from edx/sarina/fix-openended-logging 
Sarina/fix openended logging
 2014-06-09 15:18:07 -04:00
Sarina Canelake
bf6c342dcf Fix location.url [LMS-2786] 2014-06-09 15:17:20 -04:00
Diana Huang
baf0cee0be Fix gen_cert_report to use CourseKeys. 2014-06-09 15:17:13 -04:00
Sarina Canelake
a9cad6a5bb Fix logging bug in openended grading 2014-06-09 15:16:18 -04:00
Calen Pennington
87557a1af8 Add tests of RoleCache 2014-06-09 15:15:03 -04:00
Julia Hansbrough
2757ac4fcb Opaque-keys: response to code review 2014-06-09 15:13:31 -04:00
Julia Hansbrough
3a9f0b3f74 Fix import 2014-06-09 15:13:31 -04:00
Calen Pennington
dc7b2f0762 Don't create model objects to check the roles cache 2014-06-09 15:13:31 -04:00
Don Mitchell
c808277007 Change document_class back to dict 2014-06-09 15:13:31 -04:00
Don Mitchell
acc02b0e09 Fix to excess asset query 2014-06-09 15:13:23 -04:00
Julia Hansbrough
ade82c2d05 Notes convert course_id to course_key 2014-06-09 15:12:23 -04:00
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
Adam
d4ab2b8fc5 Merge pull request #3962 from edx/dcs/BLD-1104 
Fixes BLD-1104
 2014-06-04 10:39:19 -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