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

5052 Commits

Author SHA1 Message Date
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
Don Mitchell
7e2bdeb367 Merge pull request #4155 from edx/dhm/stud-1654 
Ensure all split methods consuming Keys check that key is fully specified
 2014-06-20 13:33:15 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes 
STUD-1658
 2014-06-20 11:41:23 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Mat Peterson
3a35121099 Useless code path in import_from_xml causing errors removed 2014-06-20 13:21:40 +00:00
Tim Babych
f4280377c5 Do not print exception message below stacktrace 2014-06-19 12:19:21 +03:00
Adam
d3d45b8863 Merge pull request #4157 from edx/release 
Release
 2014-06-18 17:26:39 -04:00
Don Mitchell
17925f3c9b Ensure all split methods consuming Keys check that key is fully specified 
STUD-1654
 2014-06-18 15:08:32 -04:00
Calen Pennington
7a452b6265 Merge pull request #4113 from cpennington/remove-locator 
Remove locator.py (now sourced from the external opaque_keys library)
 2014-06-18 14:44:10 -04:00
Calen Pennington
c00f80d4fa Remove locator.py (now sourced from the external opaque_keys library) 
[LMS-2757]
 2014-06-18 13:16:25 -04:00
Ben McMorran
702bdd36a9 Merge pull request #4060 from edx/benmcmorran/edit-tracking 
Tracks last edited date and user, and adds has_changes for blocks
 2014-06-18 13:13:26 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
Usman Khalid
3d0409773b Set position for collapsible.js full-bottom link. 
Currently it is covering the whole parent div.

LMS-2852
 2014-06-18 18:20:11 +05:00
Sarina Canelake
b70bd2be78 Use ngettext rather than "word(s)" for plural phrases 2014-06-17 13:25:46 -04:00
Don Mitchell
17210d18ad Merge pull request #4078 from edx/dhm/heartbeat 
Refactor heartbeat to delegate to the modulestores and sql
 2014-06-17 08:44:37 -04:00
zubair-arbi
3a26e813bf Merge pull request #3898 from edx/zub/bugfix/std1629-annotationtool 
fix reply/return to annotation links
 2014-06-17 16:35:13 +05:00
zubair-arbi
6cb6680139 fix reply/return to annotation links 
STUD-1629
 2014-06-17 12:16:07 +05:00
polesye
af67873b7b Fix seek log. 2014-06-17 08:59:11 +03:00
Sarina Canelake
8191d3c77e fixup! Fix i18n translation issues 2014-06-16 23:10:03 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql 
LMS-2801
 2014-06-16 13:16:32 -04:00
Alexander Kryklia
e032ab1877 Add examples of html5 videos to docstrings. 2014-06-16 12:46:13 +03:00
Alexander Kryklia
6ea3c8cbdd Fix failing test and update docstrings for video player 
Fixes BLD-1115
 2014-06-12 19:06:07 +03:00
Don Mitchell
ed2358ab04 Merge pull request #4063 from edx/dhm/mongo_tweaks 
Fix wiki search query
 2014-06-12 10:07:03 -04:00
Brian Talbot
14ad71f206 Merge pull request #3462 from edx/andya/source-maps 
Update SASS ( 3.3.5), Bourbon ( 4.0.2), Neat (1.6.0)
 2014-06-11 22:31:37 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
Brian Talbot
786655f890 correcting poorly scoped Sass variables set in xmodules' .scss files to adhere to Sass 3.3 scoping 
see http://blog.sass-lang.com/posts/184094-sass-33-is-released for more information on 3.3+ variable scoping
 2014-06-11 21:19:46 -04:00
Brian Talbot
02b0725456 correcting for Bourbon deprecated inline-block() mixin 2014-06-11 21:19:46 -04:00
Don Mitchell
4959f3b85b Fix wiki search query 
and formatting error in a doc file.
 2014-06-11 15:57:51 -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
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
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
polesye
d9d11a21ef BLD-933: Add table of contents. 2014-06-11 13:42:57 +03: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
Julia Hansbrough
6e702c3131 Fix conditional module rendering 2014-06-10 15:32:32 +00: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
e3459cd3cb Opaque-Keys: Response to code review 2014-06-09 15:12:22 -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
Julia Hansbrough
7beaf4ed8a Merge pull request #4019 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tools Reverting commit @3bfb633 and updating openseadragon.js for latest build
 2014-06-06 17:30:03 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
Julia Hansbrough
d2b2699166 Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tool: Urgent update for ChinaX AB Testing
 2014-06-06 13:55:10 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings 
Removed print context
 2014-06-06 12:39:35 -04:00
lduarte1991
54974a51ca Annotation Tools: Added CommonAnnotatorMixin 2014-06-06 10:09:22 -04:00
benmcmorran
aca0971a06 Merge pull request #3997 from edx/benmcmorran/template-text-formatting 
Reformats markdown problem templates avoid extra line breaks.
 2014-06-05 15:33:55 -04:00
Ben McMorran
914f0f7415 Fixes spelling of Michigan in template. 2014-06-05 14:07:03 -04:00
Ben McMorran
da6c337702 Revert "Fixes spelling of Michigan in template." 
This reverts commit 9e9e69ace3.
 2014-06-05 14:03:49 -04:00