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

11412 Commits

Author SHA1 Message Date
Matt Drayer
ba7422da87 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-07 14:27:14 -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
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
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
Ben Patterson
8d9c16ba6e Update comment to match method name. 2015-07-03 06:54:56 -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
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
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
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
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
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
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
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
Christine Lytwynec
0bb519c2a0 Merge pull request #8727 from edx/clytwynec/TE-878 
use 1 coveragerc file to generate 1 coverage report per build
 2015-07-02 12:13:59 -04:00
Sarina Canelake
d5b26c7f8c Mark test as flaky; TNL-2647 2015-07-02 11:18:09 -04:00
zubair-arbi
e369939b4b change redirect url from '/accounts/login' to '/login' 
ECOM-1734
 2015-07-02 18:44:10 +05:00
Ned Batchelder
9d5b5658a4 Merge pull request #8552 from edx/ned/smarter-mako-caching 
Make edxmako cache properly with changing lookup paths
 2015-07-01 17:47:04 -04:00
Christine Lytwynec
e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build 2015-07-01 16:07:49 -04:00
Awais Jibran
c93d48249d Fixed quality report 2015-07-02 00:29:50 +05:00
Awais Jibran
5306ac02b0 Revert "Fixed randomized problems which were not appearing to work." 2015-07-02 02:35:54 +05:00
Braden MacDonald
cd3abf37cd Merge pull request #8733 from open-craft/fix-shibboleth-fetch 
Fix errors with fetching Shibboleth metadata
 2015-07-01 09:17:52 -07:00
Awais Jibran
9e0ed9b759 Merge pull request #8672 from edx/aj/tnl2551-randomized-problems-not-working 
Fixed randomized problems which were not appearing to work.
 2015-07-01 19:04:36 +05:00
Awais Jibran
e64ae13a34 Fixed randomized problems which were not appearing to work. 
TNL-2551
 2015-07-01 16:34:34 +05:00
Braden MacDonald
4487b6d184 Fix errors with fetching Shibboleth metadata 2015-06-30 20:50:45 -07:00
Renzo Lucioni
39dadb57f0 Merge pull request #8698 from edx/renzo/fulfillment-logging 
Improve logging of ecommerce interactions
 2015-06-30 21:31:41 -04:00
Sarina Canelake
28a234380a Dark lang middleware: Check if user is authenticated 
Check if the request's user is authenticated before attempting to
get their user preferences. Otherwise, log warnings appear indicating
the UserNotFound error was caught.
 2015-06-30 20:01:00 -04:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions 
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
 2015-06-30 17:34:16 -04:00
Kyle McCormick
6b70785c12 TNL-2623 Fix bug where status icons were hidden in image response problems 2015-06-30 17:09:20 -04:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components 
TNL-2303
 2015-06-30 13:26:18 +05:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Alison Hodges
caa6a07d15 Fixes DOC-1957 2015-06-29 13:48:11 -04:00
Will Daly
4632a07c07 Fix login/logout errors caused by unicode cookie names 2015-06-29 09:23:15 -07:00
Braden MacDonald
072ae99d12 Merge pull request #8140 from edx/feature/shibboleth-tpa 
Feature: Shibboleth/SAML SSO
 2015-06-26 14:17:24 -07:00
Diana Huang
42d8091b49 Merge pull request #8688 from edx/diana/polling-cleanup 
Clean up capa polling to have exponential backoff
 2015-06-26 17:00:53 -04:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
5bf0b1794d Bump python-social-auth and python-same to upstream's latest master - PR 8599 2015-06-26 13:24:00 -07:00
Braden MacDonald
00226bf3c0 Asynchronous metadata fetching using celery beat - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Diana Huang
254d6c6821 Put a timeout on poling for codeinput and matlab problems. 2015-06-26 15:29:49 -04:00
Sarina Canelake
e485e5ee24 Dark language should stay set until explicitly cleared. 
Adds a temporary user_preference key, DARK_LANGUAGE_KEY, to hold the user's dark lang preference.
This preference key is deleted when ?clear-lang is placed in query params.
 2015-06-26 13:41:14 -04:00
Sarina Canelake
91a7df8832 Replace deprecated 'django_language' key with LANGUAGE_SESSION_KEY 
LOC-87
 2015-06-26 13:15:43 -04:00
Sarina Canelake
34b2c91709 dark_lang: only allow released langs in accept header LOC-72, LOC-85 
Only return languages we've actually released LOC-85
Perform fuzzy matching to greedily serve the best released language LOC-72
 2015-06-26 13:15:42 -04:00