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

4163 Commits

Author SHA1 Message Date
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images 
Fix non-ascii course image names
 2014-01-22 07:50:13 -08:00
Valera Rozuvan
33031b76f4 Enable correct total time display in VCR for YouTube videos. 
Before this, the VCR showed total time as 00:00:00 for YouTube
videos just after page loaded. The correct total time is shown only
after the user clicks Play button.

BLD-529.
 2014-01-22 16:38:24 +02:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore 
[LMS-2073]
[STUD-1197]
 2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names 
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
 2014-01-22 07:16:30 -05:00
Will Daly
8aa208e80d Disabled latex acceptance test 2014-01-21 15:01:36 -05:00
zubair-arbi
7bdcc84857 Merge pull request #2214 from zubair-arbi/zub/story/std1183-staticpagestest 
enable tests depending on assert is_css_present(css_selector)
 2014-01-21 06:50:27 -08:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic 
Detached categories don't access control on date
 2014-01-19 08:46:28 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Carson Gee
207f3c585c Merge pull request #2196 from carsongee/cg/forum_roles_on_import_command 
Adding missing forum permissions seeding routine to xml_import
 2014-01-17 13:27:19 -08:00
Carson Gee
1e809a4210 Adding missing forum permissions seeding routine to xml_import 
Currently if a course is only imported from the command line the
forum permissions are not seeded, this adds that functionality
Switched to doing seeding outside of xmodule library
Switched to using course_items
Switching to simpler test class
 2014-01-17 15:17:48 -05:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4 
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
 2014-01-17 14:17:38 -05:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector) 
STUD-1183
 2014-01-17 21:11:17 +05:00
Will Daly
30199e8a61 Updated settings for devstack django debug toolbar 2014-01-16 18:53:11 -05:00
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00
Christina Roberts
a3d22097b9 Merge pull request #2182 from edx/christina/duplicate 
Support duplicating an existing xblock to a supplied parent location.
 2014-01-16 11:04:39 -08:00
Mark Hoeber
a505fa951d Merge pull request #2173 from edx/markhoeber/documentation/STUD-1144 
Added notes about quotations to Advanced Settings page help
 2014-01-16 10:06:59 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release' 
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
 2014-01-16 12:51:22 -05:00
cahrens
81fecf3e6c Duplicate children so as to not create a DAG. 2014-01-16 11:24:35 -05:00
zubiar-arbi
769c7221fa dont update iframe src attribute if it is empty 
STUD-1136
 2014-01-16 13:33:54 +05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase 
Bok-choy fixtures, Studio tests, and (some) ORA tests
 2014-01-15 12:18:47 -08:00
cahrens
0d8d7cb393 Support duplicating an existing xblock to a supplied parent location. 
STUD-1190
 2014-01-15 14:36:40 -05:00
Mark Hoeber
fd45874372 Updated help on Advanced Settings page 
Added note to use double, not single quotes for string values.
STUD-1144
 2014-01-15 14:21:59 -05:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure 
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
 2014-01-15 09:37:32 -05:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Brian Talbot
367d2dc2ae Studio/LMS: Updates copyright notices to 2014 2014-01-13 19:59:24 -05:00
Ned Batchelder
c4792e667e Merge pull request #2139 from edx/ned/add-apostrophe-to-lorem 
Add apostrophe to lorem and fix single-quoted strings
 2014-01-13 13:48:23 -08:00
Will Daly
7adb48c0f0 Disabled static pages and course team test seen to fail in master 2014-01-13 14:14:52 -05:00
cahrens
38c516e9e9 Fix bug about draft verticals reordering. 
STUD-714
 2014-01-13 09:25:16 -05:00
Ned Batchelder
fd13908b90 Fix single-quoted translated strings to be double-quoted. 2014-01-10 14:40:34 -05:00
Calen Pennington
2ad4749a5d Merge pull request #2119 from cpennington/xblocks-behind-feature-flag 
Enable pure XBlocks, hidden by feature flags
 2014-01-10 09:51:23 -08:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Will Daly
4a9c239c3d Merge pull request #2030 from edx/will/bok-choy-integration 
Added configuration for running tests using the bok-choy framework
 2014-01-10 05:26:42 -08:00
Don Mitchell
67a5f862ab Merge pull request #2117 from edx/dhm/memory_definition 
Set definition_locator on in-memory xblocks
 2014-01-09 11:58:23 -08:00
Will Daly
dde5455227 Added configuration for running tests using the bok-choy framework 2014-01-09 12:57:50 -05:00
Don Mitchell
a07896dacc Set definition_locator on in-memory xblocks 2014-01-09 12:39:39 -05:00
Sarina Canelake
2f8088eaaf Merge pull request #2057 from edx/ormsbee/js_gettext 
Remove JS gettext() in templates
 2014-01-09 07:54:37 -08:00
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution. 
[LMS-1680]
 2014-01-09 10:24:09 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore 
During testing: drop contentstore when cleaning up modulestore
 2014-01-08 11:37:42 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page 
Added sorting to the new pagination logic for STUD-995.
 2014-01-08 10:35:40 -05:00
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date 
Set default section start date to Jan 1, 2030
 2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030 
STUD-1072
 2014-01-07 15:46:15 -05:00
Andy Armstrong
100ace64db Fix pagination test failures 
Updated the pagination tests to no longer use the toy course, but to instead explicitly upload the assets it needs.

 Added a new AssetsTestCase base class to own shared helper methods.
 2014-01-07 13:12:39 -05:00
Christina Roberts
c711bb6072 Merge pull request #2055 from edx/christina/amp 
Tests for behavior of export with & in HTML and XML-based components
 2014-01-07 07:35:58 -08:00
Andy Armstrong
430cfd7563 Merge pull request #2096 from edx/andya/pagination-fix 
Fix STUD-1129: handle out-of-range page numbers
 2014-01-07 06:55:22 -08:00
Ned Batchelder
549d9230f8 Merge pull request #2077 from edx/ned/misc-msg-fixes 
Miscellaneous fixes to strings found during i18n work.
 2014-01-07 06:41:42 -08:00