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

24931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
927a55f4e4 Release Notes for 8/12/14 2014-08-12 10:56:27 -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
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
Feanil Patel
2a9c9ee7c8 Merge pull request #3894 from mtyaka/patch-3 
Update xblock-mentoring.
 2014-08-08 16:23:22 -04:00
Diana Huang
0c3c7b5ab5 Merge pull request #4754 from edx/diana/show-cert-without-end-date 
Show Certificates Before End
 2014-08-08 14:58:02 -04:00
Diana Huang
7865e2fb3c Move certificates_show_before_end into a new variable 
Mark it as deprecated, but maintain backwards compatibility.

ECOM-11
 2014-08-08 14:29:57 -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
Adam
26b08a0205 Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror 
Catch InvalidKeyError in course_id_from_url().
 2014-08-08 13:27:25 -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
Usman Khalid
f9ee21f434 Incomplete course ids should return a 404. 2014-08-08 20:34:44 +05:00
Julia Hansbrough
1d64b50df2 Merge pull request #4743 from edx/flowerhack/fix-upgrade-message 
Basic fix for upgrade text bug
 2014-08-08 11:24:43 -04:00
Anton Stupak
5bf38806f8 Merge pull request #4716 from edx/anton/studio-tooltip-manager 
Studio: Add tooltips.
 2014-08-08 18:04:49 +03:00
Julia Hansbrough
3de1ab83de Basic fix for upgrade text bug 2014-08-08 14:31:49 +00:00
Will Daly
6d263fe445 Merge pull request #4752 from edx/will/ora2-release-2014-08-08T13.47 
ORA2 release-2014-08-08T13.47
 2014-08-08 10:23:11 -04:00
clytwynec
8c8d388d1a Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests 
removing "flaky" plugin, since it is not reporting failures properly
 2014-08-08 10:15:03 -04:00
Will Daly
949c965648 ORA2 release-2014-08-08T13.47 2014-08-08 09:48:26 -04:00
polesye
37c3a50ffa Add tooltip manager in Studio. 2014-08-08 16:31:14 +03:00
Carlos Andrés Rocha
80ee7e9990 Merge pull request #4747 from rocha/update-authors 
Update AUTHORS file
 2014-08-08 09:24:07 -04:00
Usman Khalid
131c8cbf10 Catch InvalidKeyError in course_id_from_url(). 
LMS-9663
 2014-08-08 18:21:48 +05:00
Nimisha Asthagiri
775b50a736 Address code coverage and quality. 2014-08-08 08:31:14 -04:00
Will Daly
dcee518dc8 Merge pull request #4742 from edx/will/ora2-release-2014-08-07T20.03 
ORA2 release-2014-08-07T20.03
 2014-08-08 05:31:20 -04:00
Carlos Andrés Rocha
8fce758bd9 Update AUTHORS file 2014-08-07 22:17:15 -04:00
Nimisha Asthagiri
934d4e8a23 Make Split Course work with new Publishing UI. 2014-08-07 20:23:44 -04:00
Nimisha Asthagiri
f10bcc1eb6 Fix get_courses. 2014-08-07 20:10:10 -04:00
Will Daly
228aa77150 ORA2 release-2014-08-07T20.03 2014-08-07 19:56:57 -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
Nimisha Asthagiri
a55b406c53 LMS-11177 Add Split to configuration settings. 2014-08-07 17:59:37 -04:00
Will Daly
cc624fd647 ORA2 hotfix 2014-08-06 2014-08-07 17:59:37 -04:00
Stephen Sanchez
4d8ef18cfb Updating ORA2 hash for hotfix August 5th, 2014 2014-08-07 17:59:37 -04:00
Christine Lytwynec
0243d0afa1 removing "flaky" plugin, since it is not reporting failures properly 2014-08-07 16:48:31 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Alison Hodges
ec5a2a1d7c Merge pull request #4741 from edx/ahodges/changelog 
Fixed table and spelling error
 2014-08-07 16:01:23 -04:00
Alison Hodges
6c59c2d470 Fixed table and spelling error 2014-08-07 16:00:51 -04:00
Diana Huang
0d62895be4 Modify certificates_show_before_end_date behavior 
Hide the certificate notification box when there's
no certificate information, even when the flag
certificates_show_before_end_date is turned on.

ECOM-11
 2014-08-07 14:58:04 -04:00
Christina Roberts
99bcf107f9 Merge pull request #4296 from edx/bulk-publishing 
Studio Publishing redesign
 2014-08-07 14:04:10 -04:00
Alison Hodges
947abe5a63 Merge pull request #4721 from edx/ahodges/documentation/relnotes_08_05 
Release notes for August 6 release
 2014-08-07 14:02:03 -04:00
Alison Hodges
2c4dbedadb Release notes for August 6 release 2014-08-07 14:01:28 -04:00
Alison Hodges
82b01fe5b8 Merge pull request #4724 from edx/ahodges/documentation/DOC790 
List of all email messages and options to view and copy them
 2014-08-07 13:48:57 -04:00
Alison Hodges
641591ce5a List of all email messages and options to view and copy them 2014-08-07 13:48:26 -04:00
Alison Hodges
c96f1e7ffd Merge pull request #4704 from edx/ahodges/documenation/DOC813 
Added enrollment breakdown by certificate track
 2014-08-07 13:20:15 -04:00
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
Daniel Friedman
4b6035bafb Automatically collect HAR data for performance testing 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