Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,583 Commits 1 Branch 0 Tags
08e90d2e993a96fd191af940bb9b4531a76cbf59
Commit Graph

27583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathew Peterson
fd002500e9 Merge pull request #4042 from edx/mathewpeterson/authors 
Adds Mat Peterson to authors file
 2014-06-11 11:40:33 -04:00
Julia Hansbrough
dc33897241 Merge pull request #4053 from edx/harvard-annotations-on-hotfix 
Harvard annotations on hotfix
 2014-06-11 11:39:11 -04:00
Anton Stupak
beca9b51d9 Merge pull request #4051 from edx/anton/i18n-choicetextgroup 
ChoiceTextGroup i18n.
 2014-06-11 18:19:24 +03:00
Don Mitchell
6d682787c5 Merge pull request #4047 from edx/dhm/mongo_indices 
Review all fs.files and modulestore indices
 2014-06-11 11:07:59 -04:00
David Baumgold
e0b693f1bf Merge pull request #4034 from edx/db/kill-nginx-proxy 
Remove unused nginx.conf
 2014-06-11 10:32:10 -04:00
Alison Hodges
48824b817a 3 entries for June -> 1 entry 2014-06-11 10:26:29 -04:00
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
Will Daly
a7fe6faa53 Merge pull request #4052 from edx/will/ora2-release-2014-06-11T10.43 
ORA2 release-2014-06-11T10.43
 2014-06-11 10:16:40 -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
Mark Hoeber
1ef65f58e9 Merge pull request #3881 from edx/markhoeber/documentation/doc-452 
Release notes for 5/28/14
 2014-06-11 09:44:14 -04:00
polesye
0e2bf2234d BLD-726: ChoiceTextGroup i18n. 2014-06-11 16:09:58 +03:00
Don Mitchell
fa94360d69 Review all fs.files and modulestore indices 
and fix some gridfs calls to reduce traffic
 2014-06-11 08:33:48 -04:00
Anton Stupak
fecacf8e1d Merge pull request #4039 from edx/anton/context-aware-video-index 
Video Editor: Add table of contents.
 2014-06-11 15:23:48 +03:00
Will Daly
b00398f5ee ORA2 release-2014-06-11T10.43 
Install edx-submissions from PyPi instead of from edx-ora2
 2014-06-11 08:15:10 -04:00
polesye
d9d11a21ef BLD-933: Add table of contents. 2014-06-11 13:42:57 +03:00
Oleg Marshev
cfec580a63 Add argument. 2014-06-11 11:41:03 +03:00
Sarina Canelake
04c9426524 Merge pull request #4048 from edx/sarina/fix-notes-import 
Fix Notes import
 2014-06-10 21:37:05 -04:00
Sarina Canelake
890093ebbf Fix Notes import 2014-06-10 18:13:32 -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
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -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
Alison Hodges
e6cb73de59 Change log now lists one section for June 2014-06-10 15:01:54 -04:00
Mat Peterson
b48ab9d27c Adds Mat Peterson to authors file 2014-06-10 18:54:38 +00:00
David Baumgold
e66b4a66b4 Move Jenkins scripts into scripts directory 
with symlinks for backwards compatibility
 2014-06-10 14:47:14 -04:00
Mark Hoeber
382251495a Release notes for 5/28/14 2014-06-10 14:24:34 -04:00
jsa
526d4b1d49 forums: fix assign_default_role to use the correct constant. 2014-06-10 12:26:21 -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
David Baumgold
d719286971 Upgrade oauthlib to 0.6.3 2014-06-10 10:21:18 -04:00
Mark Hoeber
b5cd3e1be5 Merge pull request #3994 from edx/markhoeber/documentation/doc-448 
Production stack doc in ops guide
 2014-06-09 17:18:30 -04:00
David Baumgold
c38a967e0d Remove unused nginx.conf 2014-06-09 17:17:13 -04:00
David Baumgold
61d59e1c9e Remove unused .reviewboardrc 2014-06-09 17:15:27 -04:00
Brian Talbot
6ddf45e707 Merge pull request #4029 from edx/talbs/studio-flexbile-status-notifications 
Studio: Flexible Status Notifications
 2014-06-09 16:59:25 -04: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