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

5043 Commits

Author SHA1 Message Date
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Brian Talbot
f8ec92949f Studio: refactoring font-weight CSS rules to use Sass placeholders 2014-08-12 12:31:49 -04:00
Tim Babych
e7fbf1327f Merge pull request #4778 from edx/tim/improve-python-group-configuration-tests 
Use UrlResetMixin to test GroupConfiguration feature
 2014-08-11 21:10:47 +03:00
Don Mitchell
05bddae34a Merge pull request #4633 from edx/dhm/create_xthing 
Make import/export work with split mongo, replace create_xmodule with create_xblock
 2014-08-11 12:53:59 -04:00
Don Mitchell
192d701899 Code review changes re split import/export, create_xblock 2014-08-11 12:13:31 -04:00
Tim Babych
06cb6008f0 Use UrlResetMixin to test GroupConfiguration feature 2014-08-11 19:12:30 +03:00
Alexander Kryklia
9643120390 Reenable user partition in Advanced Settings. 2014-08-11 16:41:29 +03:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
Don Mitchell
f69ef41c21 Disable fetching by version guid for now 2014-08-08 15:00:48 -04:00
Don Mitchell
ae4277c402 Use new check counter & bump count 2014-08-08 15:00:48 -04:00
Don Mitchell
e900a47b3f Provide workarounds for skip_draft where other code doesn't want its behavior 2014-08-08 15:00:47 -04:00
Don Mitchell
2726b437bc Trying to get split to work 2014-08-08 14:53:37 -04:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading. 
Remove post-publish step.
 2014-08-08 14:41:57 -04:00
Don Mitchell
47851c5041 Replace create_xmodule with create_xblock 
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:40:27 -04:00
Oleg Marshev
0577b9d8b9 Allow turning off Video CDN in Studio. 
BLD-1207
 2014-08-08 14:39:19 -04:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
polesye
37c3a50ffa Add tooltip manager in Studio. 2014-08-08 16:31:14 +03:00
Nimisha Asthagiri
775b50a736 Address code coverage and quality. 2014-08-08 08:31:14 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. 
Make default_store thread-safe.
 2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
e9db4ad16d LMS-11019 Add feature flag to create Split Course 2014-08-07 18:07:01 -04:00
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
cahrens
fffabeba4c Change wording of "remove staff lock" message. 2014-08-07 12:27:37 -04:00
cahrens
59d44c54b1 Updates after rebase. 2014-08-07 12:27:37 -04:00
Brian Talbot
90fe25b4ff Studio: revising size and field layout of outline settings modal 2014-08-07 12:27:36 -04:00
Brian Talbot
8c72351936 Studio: revising clear icon used within outline settings modal 2014-08-07 12:27:36 -04:00
cahrens
932a130b16 pep8/pylint 2014-08-07 12:27:36 -04:00
Brian Talbot
ec89d3da1a Studio: revising unscheduled icon in outline UI 
STUD-2061
 2014-08-07 12:27:36 -04:00
Ben McMorran
0b06712645 Remove specific wording for live content warning 2014-08-07 12:27:35 -04:00
Ben McMorran
e4635aaa69 Don't release date if it hasn't been changed. 
STUD-2056
 2014-08-07 12:27:35 -04:00
Ben McMorran
391ab8469e Open "View Live Version" and "Preview Changes" in a new window 
STUD-2058
 2014-08-07 12:27:35 -04:00
Ben McMorran
9b6c9fead9 Remove staff lock field when removing staff lock 2014-08-07 12:27:35 -04:00
Daniel Friedman
206e4a954d Disable ajax caching in IE to fix backbone fetching 2014-08-07 12:27:34 -04:00
cahrens
04be309ec4 Cleanup from rebase. 2014-08-07 12:27:28 -04:00
cahrens
fbc886aab9 Store the expanded locators on the page. 
STUD-2038
 2014-08-07 12:27:28 -04:00
cahrens
0083cfc450 Always call refresh on parent of drag and drop operation. 
STUD-2048
 2014-08-07 12:27:27 -04:00
Brian Talbot
b83c3976bc scoping staff only color to .status-message icons 2014-08-07 12:27:27 -04:00
Tim Babych
ef9cf87b01 Compute graders just once per Course. 2014-08-07 12:27:26 -04:00
cahrens
bba03a51d7 Show "Not Graded" for non-graded content with due date. 2014-08-07 12:27:26 -04:00
Ben McMorran
d514f363fc Integrate UI text strings from doc 
STUD-1856

Display "IS VISIBLE TO" when released and published

Reword staff lock prompt and notifications

Change "View Published Version" to "View Live Version"

Change "Unit Tree Location" to "Unit Location in Course"

Switch live content warning based on unpublished changes

Reword discard changes confirmation prompt

Reword unit location tip

Add "Edit the name" popup text for sections and subsections

Fix popup text for section and subsection titles

Add popup text for new section, subsection, and unit buttons

Reword popup for View Live button and add tests

Reword notification when removing staff lock

Update MessageView when has_changes changed

Change "Published" to "Published (not yet released)"

Change "Unpublished (Staff only)" to "Visible to Staff Only"
 2014-08-07 12:27:26 -04:00
Tim Babych
d7f75778dd Pass parent_xblock to xblock_studio_url to avoid unnecessary calls to get_parent_xblock. 2014-08-07 12:27:26 -04:00
Alexander Kryklia
5dbfd1087b Add styling to due date and grading format of subsection. 2014-08-07 12:27:25 -04:00
Frances Botsford
8b78eefe97 fixing long names on outline, unit, container 2014-08-07 12:27:25 -04:00
Frances Botsford
22ead5d766 styling for unit location module on container page 2014-08-07 12:27:25 -04:00
Tim Babych
8d0e469cd3 Remove code and template responsible for subsection edit page 2014-08-07 12:27:25 -04:00
cahrens
819c94688a Increase "fudge" factor for dragging to top of list with only 1 element. 2014-08-07 12:27:24 -04:00
Brian Talbot
8ca3f28f16 resolving mid-drop unit marign issue in Firefox 2014-08-07 12:27:24 -04:00
Brian Talbot
988324d0a0 Studio: re-implemeting visual styling for drag and drop: 
* adding back in drag and drop indicators to outline DOM
* correcting visual display of drag action in outline UI
* adjusting styling of outline drag and drop indicators
* adjusting styling of drag and drop was-dropped state
 2014-08-07 12:27:24 -04:00