Commit Graph

31319 Commits

Author SHA1 Message Date
Brandon DeRosier
b4e8ab9084 Revert "Add feature flag for Import/Export API in LMS"
This reverts commit 85b3bfe4f6.
2015-07-07 16:51:49 -04:00
Will Daly
0158ebca1f Merge pull request #8810 from edx/cherrypick-hotfix-2015-07-07-to-rc
Cherrypick hotfix-2015-07-07 into release candidate
2015-07-07 13:05:14 -07:00
Will Daly
bd5c045102 Merge pull request #8801 from edx/awais786/ECOM-1829-regen-cert-link-bug
ECOM-1829 Removing the regen link.
2015-07-07 12:42:56 -07:00
Matt Drayer
a31ae128ff Merge pull request #8808 from edx/rc/2015-07-08-mattdrayer
rc/2015-07-08-mattdrayer: Hide button behind feature flag
2015-07-07 15:38:59 -04:00
Will Daly
407e7f432c Cherrypick hotfix-2015-07-07 into release candidate
Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.
2015-07-07 12:10:25 -07:00
Matt Drayer
ba7422da87 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-07 14:27:14 -04:00
Clinton Blackburn
f9ce8264ed Merge pull request #8803 from edx/clintonb/commerce-api-fix
Corrected path to Commerce API
2015-07-07 12:32:44 -04:00
Clinton Blackburn
5d356d29bd Corrected path to Commerce API
XCOM-312
2015-07-07 11:47:45 -04:00
Awais
cc5d972c7d ECOM-1829 Removing the regen link. 2015-07-07 19:53:53 +05:00
Will Daly
47002ff785 Merge pull request #8785 from edx/will/fix-credit-migrations
Fix migrations 0012 and 0013 in the credit app
2015-07-06 10:20:02 -07:00
Will Daly
dcfd70b922 Fix migrations 0012 and 0013 in the credit app
Adds the "order" field that was introduced in 0011 to the "models"
dictionary of migrations 0012 and 0013 so South knows that
the field should exist after 0011 is run.
2015-07-06 10:01:32 -07:00
Davorin Šego
e7f7bdaed9 Merge pull request #8738 from edx/dsego/SOL-734-addendum
Fixes header styling issue introduced in SOL-734 (#8389) by reverting…
2015-07-06 16:18:00 +02:00
Shrhawk
a67d80c232 Merge pull request #8702 from edx/shr/bug/TNL-2592-problem-release-date-error
Handle dates have year smaller than 1900
2015-07-06 06:39:11 -07:00
Daniel Friedman
c4004e1113 Merge pull request #8593 from edx/dan-f/topic-list-2
Teams Topic List View
2015-07-06 09:23:31 -04:00
Sarina Canelake
bc4479a118 Merge pull request #8778 from edx/sarina/20150706-update-translations
Update translations (autogenerated message)
2015-07-06 09:17:18 -04:00
Frances Botsford
b45b122c18 fixed pagination styles in teams and studio 2015-07-06 08:45:03 -04:00
Daniel Friedman
3b55d88283 Implement paginated Team Topics UI
Authors:
  - Dan Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
2015-07-06 08:45:03 -04:00
Ben McMorran
351e491c82 Add generic paging framework
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
2015-07-06 08:45:03 -04:00
Sarina Canelake
1cc7ea2a37 Update translations (autogenerated message) 2015-07-06 08:14:16 -04:00
Ben Patterson
65a36a64df Merge pull request #8686 from edx/benp/3bok-choy-check-invisible
Update to latest bok-choy. Update tests to be compatible with the updated `invisible` property.
2015-07-03 17:36:09 -07:00
Usman Khalid
e086bb4ddc Merge pull request #8704 from edx/usman/tnl2305-disable-ora
Hide ORA 1 in LMS.
2015-07-04 00:35:05 +05:00
Usman Khalid
64ff890ff8 Disable ORA 1 tabs in LMS if combinedopeneded is disabled in LMS.
TNL-2305
2015-07-03 20:58:42 +05:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS.
TNL-2305
2015-07-03 20:58:40 +05:00
Davorin Šego
83d920ecba Merge pull request #8759 from edx/dsego/SOL-958
Add feature flag to skip enrollment start date filtering for course s…
2015-07-03 16:20:21 +02:00
Ben Patterson
8d9c16ba6e Update comment to match method name. 2015-07-03 06:54:56 -07:00
Ben Patterson
d8a649ae36 Use new bok-choy with invisible property. 2015-07-03 06:51:25 -07:00
Ben Patterson
c39ebf1bc8 Wait for element to not be present. (Compatible with minor bok-choy upgrade.)
With an upcoming bok-choy upgrade, 'not-present' and
'invisible' are two distinct concepts. In the upgrade, an
invisible element must be present on the page. This commit
draws that distinction across two helper methods, one for
'invisible' and the other for 'not-present' (or, not on the page at all).
2015-07-03 06:51:25 -07:00
Davorin Sego
7374624b3c Add feature flag to skip enrollment start date filtering for course search
add flag to lms/envs/common

update edx-search release tag
2015-07-03 13:24:25 +02:00
zubair-arbi
8934818381 Merge pull request #8753 from edx/zub/bugfix/ecom-1734-change-login-redirect-url
change redirect url from '/accounts/login' to '/login'
2015-07-03 16:19:24 +05:00
Matt Drayer
b1e0ceb34f Merge pull request #8634 from edx/asadiqbal08/SOL-766
asadiqbal08/SOL-766: Share web certificate on Facebook
2015-07-03 06:47:58 -04:00
Ned Batchelder
07da7657b3 Merge pull request #7354 from edx/ned/clean-test-turds
Clean up temp file management, mostly in tests
2015-07-02 20:20:41 -04:00
Ned Batchelder
514d85c183 Fix other temp dirs that are not cleaned up properly 2015-07-02 19:31:49 -04:00
Ned Batchelder
e6e5a8d812 Convert some try/finally to addCleanup 2015-07-02 19:31:48 -04:00
Ned Batchelder
cb0624bfa1 Correct parent references in one test. 2015-07-02 19:31:48 -04:00
Ned Batchelder
8c8810ee2c Put gitignores for test_root/uploads in one place 2015-07-02 19:31:48 -04:00
Matt Drayer
593ee74073 Merge pull request #8770 from edx/mattdrayer/update-num-queries-check
mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s)
2015-07-02 18:56:51 -04:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
2015-07-02 18:52:15 -04:00
Matt Drayer
289ec980a5 mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s) 2015-07-02 18:03:57 -04:00
David Ormsbee
db3de51ad4 Merge pull request #6190 from mitocw/bdero/import-export-api
Public Course Import/Export API
2015-07-02 16:29:41 -04:00
Matt Drayer
1ca37737e9 Merge pull request #8566 from edx/ziafazal/SOL-980
ziafazal/SOL-980: Generate certificates from instructor dashboard
2015-07-02 16:07:33 -04:00
Will Daly
8824d032d4 Merge pull request #8767 from edx/will/optimize-credit-reqs-update
Credit requirement optimizations
2015-07-02 12:37:26 -07:00
Will Daly
bfe01605b4 Merge pull request #8700 from edx/will/remove-provider-course-m2m-relation
Credit eligibility/provider refactor
2015-07-02 12:36:37 -07:00
Brandon DeRosier
85b3bfe4f6 Add feature flag for Import/Export API in LMS
This feature flag gates the exposure of the Full course/library
Import/Export API URLs in the LMS. This allows openedX deployments
that operate without Studio to take advantage of the API, while
others may turn the feature off to reserve all content authoring for
Studio.
2015-07-02 15:32:00 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
2015-07-02 15:32:00 -04:00
Will Daly
06ddb2f359 Credit requirement optimizations
* Skip adding the credit req tasks to the queue for non-credit courses.
* Load only ICRV XBlocks instead of traversing the course tree.
2015-07-02 11:35:46 -07:00
Zia Fazal
611d16b25a ziafazal/SOL-980: Generate certificates from instructor dashboard
* added generate certificates task and bok choy tests
* added unit tests
* changes based feedback and improved acceptance test
* Change header text
* changes based on feedback on 24/6
* added task_id to api output
* fixed broken test
* Remove "Instructor" from strings, per Docs team
* Fixed flaky entrance exam test
2015-07-02 14:32:36 -04:00
Matt Drayer
4526b929b0 Merge pull request #8491 from edx/mattdrayer/fix-progress-template
mattdrayer/SOL-1018: Fixed progress template for better web certificates support
2015-07-02 13:51:49 -04:00
Calen Pennington
012a3c7540 Merge pull request #8725 from openfun/regisb/fix_xblock_class_loading
Fix XBlock class loading in local resource view
2015-07-02 13:37:03 -04:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29
Merge back into master
2015-07-02 13:34:42 -04:00
Will Daly
e2acf3ab87 Credit eligibility/provider refactor
* Remove m2m relation between credit course and credit providers.
* Separate eligibility and provider APIs into different modules.
* Add API call for retrieving a user's eligibilities.
* Cache credit course list.
* Style the dashboard purchase button.
* Display a link for the credit provider on the dashboard.
* Add analytics events for clicks on the purchase button.
* Expose more credit models to Django admin and add search functionality.
2015-07-02 10:03:52 -07:00