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

4730 Commits

Author SHA1 Message Date
Julia Hansbrough
2757ac4fcb Opaque-keys: response to code review 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
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
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -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
Sarina Canelake
d1672e31f7 Opaque-keys: fix pylint violations 2014-05-24 19:36:09 -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
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
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
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -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
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
Mark Hoeber
8c4be448aa Fixed typo in Studio Home Page panel help text 
DOC-484
 2014-05-23 11:46:19 -04:00
Jay Zoldak
bb4f9148e0 Skip intermittently failing js video tests 2014-05-23 11:21:57 -04:00
Nimisha Asthagiri
21ddc7db00 Fixed DeleteComponent on Container Page. 2014-05-23 11:05:37 -04:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
zubair-arbi
0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton 
move upload asset code for assets to AssetsView
 2014-05-23 18:24:24 +05:00
Jay Zoldak
4a86b926c5 Wait for ajax to complete when editing components in Studio acceptance tests 2014-05-22 16:45:18 -04:00
Calen Pennington
35083ad9f9 Fix bad uses of course_id/location/locator in new code on master 2014-05-22 16:24:02 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Jay Zoldak
9f6d0594d3 Merge pull request #3835 from edx/zoldak/skip-brittle-test 
Skip brittle HTML editor lettuce test
 2014-05-22 15:45:09 -04:00
Jay Zoldak
7db6e639e2 Skip brittle test 2014-05-22 12:22:55 -04:00
Andy Armstrong
dfbfd7b204 Merge pull request #3802 from louyihua/translation-fix 
i18n: Make checklists translatable
 2014-05-22 11:22:04 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
louyihua
34d2f051a4 i18n: Make checklists translatable 
Now the description & action_text strings in checklists can be extracted and translated.
 2014-05-22 22:15:45 +08:00
Ben Patterson
dd07967805 Disable cms test due to failure on master build. 2014-05-22 09:24:13 -04:00
zubair-arbi
72d9a91f1d Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft 
create draft request gets already created version if it exists
 2014-05-22 18:18:56 +05:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
Calen Pennington
7f8543a2e4 Clean up logging in import_export.py 2014-05-21 14:25:21 -04:00
Adam
2124571c0f Merge pull request #3803 from edx/release 
Release
 2014-05-21 12:52:18 -04:00
zubair-arbi
a8bb768970 Merge pull request #3767 from edx/zub/story/std1624-cmssubsectiontests 
fix cms subsection tests
 2014-05-21 19:45:00 +05:00
zubair-arbi
6d0e2b215c update _xmodule_recurse method 2014-05-21 18:31:19 +05:00
zubiar-arbi
08f313f9b4 move upload code for assets to AssetsView 
STUD-1523
 2014-05-21 17:15:04 +05:00
zubair-arbi
6bdf984e8d update _xmodule_recurse to ignore some exception 2014-05-21 16:36:55 +05:00
zubair-arbi
83db659f94 create draft request gets already created version if it exists 
STUD-1616
 2014-05-21 16:36:54 +05:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
Frances Botsford
f2d8894118 fix for modal appearing off-screen 2014-05-20 14:13:51 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04:00
zubair-arbi
807f8e9a9a fix cms subsection tests 
STUD-1624
 2014-05-20 13:42:51 +05:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04:00