cahrens
ee836d4c40
Merge branch 'release' from 2014-08-12 release.
2014-08-12 13:51:58 -04:00
Brian Talbot
e727bd2202
Merge pull request #4790 from edx/talbs/studio-stylesweep-fontweight
...
Studio: Refactoring font-weight CSS rules to use Sass placeholders
2014-08-12 13:20:51 -04:00
Brian Talbot
f8ec92949f
Studio: refactoring font-weight CSS rules to use Sass placeholders
2014-08-12 12:31:49 -04:00
Sarina Canelake
d9a2d229a7
Merge pull request #4768 from edx/sarina/remove-legacy-banner
...
Remove banner from instructor dashboard
2014-08-12 12:21:34 -04:00
Mark Hoeber
4c065eb670
Merge pull request #4783 from edx/ahodges/documentation/relnotes08_12_14
...
Release notes - 8/12/14
2014-08-12 11:00:11 -04:00
Alison Hodges
927a55f4e4
Release Notes for 8/12/14
2014-08-12 10:56:27 -04:00
Oleg Marshev
7e9f917f62
Merge pull request #4237 from starteam/master
...
Fix for empty imsx_messageIdentifier
2014-08-12 17:38:57 +03:00
Mark Hoeber
4e8a290220
Merge pull request #4356 from edx/markhoeber/documentation/publishing-changes
...
WIP: Documentation for Publishing Changes
2014-08-12 10:34:57 -04:00
Christina Roberts
620d31022b
Merge pull request #4781 from edx/christina/publishing-tests
...
Improve stability of test_studio_outline tests.
2014-08-12 09:20:19 -04:00
Adam
8e722af080
Merge pull request #4785 from edx/adam/add-link-to-readme
...
add how to file a bug report link to readme
2014-08-12 09:18:58 -04:00
Jesse Zoldak
ab78c758f1
Merge pull request #4638 from edx/zoldak/lettuce-log-js-console
...
Capture console log on lettuce test failure
2014-08-12 09:06:53 -04:00
Ivica Ceraj
be17040f9d
Fix for empty imsx_messageIdentifier
2014-08-12 08:30:33 -04:00
Mark Hoeber
b7486133cc
Doc changes for new publishing workflow
2014-08-11 20:29:21 -04:00
Alison Hodges
41425a4647
Merge pull request #4773 from edx/ahodges/documentation/DOC804
...
Ahodges/documentation/doc804
2014-08-11 18:12:19 -04:00
Calen Pennington
25963797c6
Merge pull request #3227 from FiloSottile/enforce_type
...
Enforce type of the XBlocks Fields when set
2014-08-11 16:13:53 -04:00
Alison Hodges
83f1231f5a
Updates for Sylvia's edits
2014-08-11 15:45:47 -04:00
Julia Hansbrough
df83f5279f
Merge pull request #4766 from edx/flowerhack/update-testing-md
...
Update testing.md
2014-08-11 15:45:37 -04:00
Adam Palay
7720969965
add how to file a bug report link to readme
2014-08-11 15:44:24 -04:00
Julia Hansbrough
f06c99fec6
Update testing.md
2014-08-11 19:39:15 +00:00
cahrens
367bdf18c8
Improve stability of test_studio_outline tests.
...
STUD-2084
2014-08-11 15:13:16 -04:00
Jesse Zoldak
f59dd647c5
Capture console log on lettuce test failure
2014-08-11 14:39:22 -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
Alison Hodges
c34cf558ef
Added Will's nuance and info on availability from Lyla
2014-08-11 11:15:32 -04:00
Christina Roberts
ad37d93d24
Merge pull request #4775 from edx/alex/fix-reenable-user-partitions
...
Reenable user partition in Advanced Settings.
2014-08-11 10:39:06 -04:00
Alexander Kryklia
9643120390
Reenable user partition in Advanced Settings.
2014-08-11 16:41:29 +03:00
Alison Hodges
cd5b3bf230
wrapping
2014-08-11 08:34:26 -04:00
Alison Hodges
27927a78d8
cleanup
2014-08-11 07:22:45 -04:00
muhammad-ammar
452d69654e
Merge pull request #4386 from edx/ammar/bok-choy-cms-video-tests
...
Bok-Choy CMS Video Tests
2014-08-11 14:42:17 +05:00
Muhammad Ammar
936bd4d5ad
Bok-Choy CMS Video Tests
2014-08-11 07:50:19 +00:00
Sarina Canelake
9885b106af
Remove banner from instructor dashboard
2014-08-10 00:46:10 -04:00
Alison Hodges
2bc6f1d8b5
ORA2 events
2014-08-08 18:11:34 -04:00
David Baumgold
619f72f39c
Merge pull request #4767 from edx/release-script-validation-failed
...
Improvements to the release.py script
2014-08-08 18:00:18 -04:00
Julia Hansbrough
b9a285f1e7
Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button
...
Redirect to show_reqs for prof ed
2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673
Update redirect and wording for prof ed
...
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
2014-08-08 21:02:16 +00:00
David Baumgold
f4bfe464e2
Friendly error message if you don't have dependencies installed
2014-08-08 16:57:47 -04:00
David Baumgold
938b4f8111
Handle Validation Failed for release script
2014-08-08 16:57:47 -04:00
Christina Roberts
d6522e52e7
Merge pull request #4762 from edx/annotations-js-fix
...
Annotator Tools: Fix major logic bug in code (RC)
2014-08-08 16:37:54 -04:00
Renzo Lucioni
37598e605e
Merge pull request #4763 from edx/lms/add-optimizely
...
Lms/add optimizely
2014-08-08 16:28:55 -04:00
Feanil Patel
2a9c9ee7c8
Merge pull request #3894 from mtyaka/patch-3
...
Update xblock-mentoring.
2014-08-08 16:23:22 -04:00
Diana Huang
83f7acffca
Merge pull request #4764 from edx/diana/show-cert-without-end-date
...
Show Certificates Before End
2014-08-08 15:36:39 -04:00
Christina Roberts
562ec03696
Merge pull request #4760 from edx/oleg/turn-off-cdn-rc
...
Allow turning off Video CDN in Studio.
2014-08-08 15:12:54 -04:00
Don Mitchell
21c6812bd3
More branch override precedence refinement
2014-08-08 15:00:48 -04:00
Don Mitchell
f69ef41c21
Disable fetching by version guid for now
2014-08-08 15:00:48 -04:00
Don Mitchell
67d6347e50
Use continue version for create course side effects
2014-08-08 15:00:48 -04:00
Nimisha Asthagiri
ba8d390fd7
Support import of ErrorDescriptors.
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
7a75b94ff7
Support xml blocks w/ multiple parents
2014-08-08 15:00:47 -04:00
