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

23800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
clytwynec
6c6f67dc1f Merge pull request #3945 from edx/clytwynec/rake2paver-tests 
Deprecated unit tests from rake to paver
 2014-06-06 16:14:42 -04:00
Jay Zoldak
1cf6b5f4f7 Merge pull request #3944 from edx/zoldak/bok-choy-user-not-staff 
Bok choy tests should not all run as global staff
 2014-06-06 15:47:47 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
David Baumgold
e159ff9b5d Remove unused verbose property 2014-06-06 15:35:33 -04:00
David Baumgold
4221bf9ec0 Set verbosity on paver test tasks 2014-06-06 15:35:33 -04:00
Christine Lytwynec
da6d70a92b updating diff-cover, adding --compare-branch feature to paver task 2014-06-06 15:35:33 -04:00
Christine Lytwynec
2e2136d39c Deprecated unit tests from rake to paver 2014-06-06 15:35:32 -04:00
Jay Zoldak
00d5c5b490 Reuse course creator user in bok-choy tests and have them not be global staff 2014-06-06 15:17:14 -04:00
Joe Blaylock
fa9a022cca Merge pull request #4016 from edx/jrbl/bugfix_lxml_flattening 
Bugfix certificates request queue HTML flattening
 2014-06-06 11:10:33 -07:00
Alison Hodges
1b58ca5d1b Merge pull request #3975 from edx/ahodges/documentation/DOC307 
Ahodges/documentation/doc307
 2014-06-06 14:03:52 -04:00
Alison Hodges
60b38ba801 Added new section on states, image, fixed old images 2014-06-06 14:02:40 -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
Ned Batchelder
3584d571a3 Merge pull request #4017 from edx/ned/fix-duplicate-xmodule-tests 
Remove duplicates in a class list so tests aren't duplicated
 2014-06-06 13:19:24 -04:00
Ned Batchelder
ec5aee2949 Remove duplicates in a class list so tests aren't duplicated 2014-06-06 13:17:36 -04:00
David Baumgold
30815dba01 Merge pull request #3960 from edx/db/update-ddt 
Update ddt to 0.8.0
 2014-06-06 13:16:58 -04:00
lduarte1991
dc9ae84e56 Merge pull request #2 from lduarte1991/lduarte-harvardx-pr3 
Annotation Tools: Fix delete bug and factor out xmodule settings
 2014-06-06 12:42:24 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings 
Removed print context
 2014-06-06 12:39:35 -04:00
Joe Blaylock
277dcb1113 Bugfix certificates request queue HTML flattening 2014-06-06 09:31:46 -07:00
David Baumgold
8dd4731d42 Merge pull request #3965 from edx/db/django-babel-underscore 
Extract i18n strings from *.underscore files using django-babel-underscore
 2014-06-06 10:36:12 -04:00
lduarte1991
54974a51ca Annotation Tools: Added CommonAnnotatorMixin 2014-06-06 10:09:22 -04:00
Jay Zoldak
210bffd44c Merge pull request #4013 from edx/zoldak/disable-cc-test 
Skip video cc test BLD-1115
 2014-06-06 09:42:13 -04:00
Jay Zoldak
d837cdc54f Skip video cc test BLD-1115 2014-06-06 09:25:22 -04:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -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
Jim Abramson
f5cfd1ef96 Merge pull request #3986 from edx/jsa/search-spell-correction 
Add support for search spell corrections to Forums UX.
 2014-06-05 15:14:00 -04:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -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
Ben McMorran
9e9e69ace3 Fixes spelling of Michigan in template. 2014-06-05 13:59:40 -04:00
lduarte1991
68acf66f6c 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
 2014-06-05 13:05:37 -04:00
Christina Roberts
da09898778 Merge pull request #3928 from edx/christina/custom-split-editor 
Implement a custom editor for the split_module.
 2014-06-05 12:55:09 -04:00
Ben McMorran
e18fd76d07 Reformats markdown problem templates avoid extra line breaks. 2014-06-05 12:54:39 -04:00
lduarte1991
b22643adc2 Image Annotation Tool: Annotation Mode for AB Testing 
Annotation Tools PR Fixes

- forgot to overwrite the previous line
 2014-06-05 12:47:48 -04:00
lduarte1991
50e8ae9a6e Image Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
1dcf2dc10a Video Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
8429897c82 Text Annotation Tool: Added Instructor Filter and Clear Search 2014-06-05 12:47:48 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
David Baumgold
8fffef77f6 Merge pull request #3988 from louyihua/django-babel-underscore 
Babel underscore extraction update according to @nedbat
 2014-06-05 10:35:47 -04:00
Alexander Kryklia
2eae8b8380 Merge pull request #3981 from edx/alex/fix_matlab_check 
Improve escaping in code response.
 2014-06-05 15:59:28 +03:00
Anton Stupak
4eab9cdbe6 Merge pull request #3950 from edx/anton/transcript-editor-disable-validation 
Allow the video player to work with links with redirection.
 2014-06-05 11:10:52 +03:00
louyihua
12d8df970b Babel underscore extraction update according to @nedbat 
1. Add underscore.po into the merge section in config.yaml
2. Using one babel command template to construct two babel commands
 2014-06-05 15:22:40 +08:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
David Baumgold
fa0dee1754 Don't search for underscore files under lms 2014-06-04 13:43:05 -04:00
David Baumgold
7228d41aa9 Merge pull request #3707 from edx/db/release-script-no-duplicate-jira 
Don't show duplicate JIRA tickets in the release PR table
 2014-06-04 11:59:31 -04:00
David Baumgold
ddfd50bb13 extract from underscore files under cms, lms, and common 
to avoid extracting from test_root and such
 2014-06-04 11:58:05 -04:00
David Baumgold
126cf88504 Merge pull request #3971 from louyihua/django-babel-underscore 
Django babel underscore
 2014-06-04 11:49:54 -04:00
benmcmorran
5dd7ffe7e3 Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation 
Fixes delete page confirmation text.
 2014-06-04 11:39:47 -04:00
zubair-arbi
f19ad92ddf Merge pull request #3977 from edx/zub/bugfix/std1691-IEeditannouncement 
prevent caching of GET requests for xblock student view
 2014-06-04 20:15:22 +05:00
benmcmorran
6a89375245 Merge pull request #3980 from edx/benmcmorran/remove-conrads-name 
Removes Conrad's name from the course schedule settings (STUD-1511).
 2014-06-04 11:00:25 -04:00