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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben McMorran
2cf3390ba8 Merge pull request #8837 from edx/benmcmorran/discussion-caching-3 
TNL-2389 Use discussion id map cache for thread creation and update
 2015-07-17 11:33:02 -04:00
Max Rothman
d7b57309da Merge branch 'release' into release-2015-07-08-conflict 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
	openedx/core/djangoapps/credit/tests/test_api.py
 2015-07-17 11:32:01 -04:00
Jesse Zoldak
ec6258a7ec Mark too-flaky test for skipping 2015-07-17 11:01:45 -04:00
Jesse Zoldak
da68af5c04 Disable potentially flaky jasmine tests SOL-1065 2015-07-17 10:40:08 -04:00
Vedran Karačić
c0de94295a Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing 
TNL-394: Additional testing
 2015-07-17 16:20:46 +02:00
vkaracic
f5234b1a9b TNL-394: Additional testing 
This is an additional test for:
https://openedx.atlassian.net/browse/TNL-394
to test if the get_user function escapes values correctly.
 2015-07-17 07:28:25 +00:00
Jesse Zoldak
e89d8e14d4 Merge pull request #8955 from edx/zoldak/cleanup-js-includes 
Remove unused includes
 2015-07-16 19:56:04 -04:00
Renzo Lucioni
035aa4976f Merge pull request #8947 from edx/renzo/resolve-failures 
Import missing settings module in tests of commerce views
 2015-07-16 16:52:06 -04:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Decorated instructor dashboard with sudo_required.
 2015-07-16 21:12:43 +05:00
Awais Qureshi
937ca38fb5 Merge pull request #8867 from edx/aamir-khan/ECOM-1816-credit-info-recept-page 
ECOM-1816: added the provider detail on the receipt page.
 2015-07-16 19:47:15 +05:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
arbabnazar
21832bb99a modify the whitelist cert script to take list of users 2015-07-16 15:05:34 +05:00
tasawernawaz
ba06ab1939 Merge pull request #8932 from edx/tasawer/story/ecom-1858-provider-and-eligibility-details 
ECOM-1858
 2015-07-16 13:57:06 +05:00
Zia Fazal
bed7d80777 enable certificate generation for html certificates 
Enable Student-Generated Certificates for HTML certs flow
 2015-07-16 13:32:14 +05:00
Tasawer
1ded8b546c Update code of get_eligibility api. 
ECOM-1858
 2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sarina Canelake
ae0e21b32a Merge pull request #8945 from ubc/wmono/update-authors 
Update AUTHORS
 2015-07-15 21:13:17 -04:00
Renzo Lucioni
60c818f030 Import missing settings module in tests of commerce views 2015-07-15 19:03:26 -04:00
Sylvia Pearce
c2420b0940 Final tweaks to API documentation updates 2015-07-15 21:46:11 +00:00
Renzo Lucioni
7f6e61b189 Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.3
 2015-07-15 17:22:45 -04:00
William Ono
3c489c857a Update AUTHORS 2015-07-15 21:21:58 +00:00
Jesse Zoldak
7aebf0684a Remove unused includes 2015-07-15 17:17:55 -04:00
Max Rothman
7673bde898 Merge pull request #8941 from edx/jsa/commerce-api-rc 
Jsa/commerce api rc
 2015-07-15 16:49:12 -04:00
Sarina Canelake
bb7ba752bd Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard 
Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag AN-4583
 2015-07-15 16:36:28 -04:00
jsa
7449f68522 Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-15 16:22:36 -04:00
Renzo Lucioni
d4a5ad4818 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-15 16:22:29 -04:00
Clinton Blackburn
7c5cc14a32 Merge pull request #8939 from edx/clintonb/jwt-envs-fix 
Pulling JWT settings from envs tokens
 2015-07-15 16:07:12 -04:00
Clinton Blackburn
6088bc3401 Pulling JWT settings from envs tokens 
XCOM-281
 2015-07-15 16:06:17 -04:00
Renzo Lucioni
ea37ada4db Update edx-oauth2-provider to 0.5.3 2015-07-15 15:58:00 -04:00
Kyle McCormick
738146f87c Merge pull request #8935 from edx/mekkz/course-overviews-grading-fix 
MA-1036 Make CourseOverviews handle malformed grading policies
 2015-07-15 15:29:57 -04:00
Matt Drayer
0f2a36a62a Merge pull request #8908 from edx/asadiqbal08/SOL-1050 
asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL
 2015-07-15 15:05:53 -04:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Kyle McCormick
e1472080da MA-1036 Make CourseOverviews handle malformed grading policies 2015-07-15 14:16:18 -04:00
asadiqbal
19d9ccbf67 asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL 2015-07-15 12:22:09 -04:00
Zia Fazal
b5c32ec4f1 ziafazal/SOL-980: Fix error while generating certificates 2015-07-15 12:21:50 -04:00
Matt Drayer
3f432d49a8 Merge pull request #8912 from edx/asadiqbal08/SOL-1046 
SOL-1046 converted anchor to button for linkedIn
 2015-07-15 12:07:57 -04:00
David Baumgold
8c4bb8bf3c Merge pull request #8933 from edx/revert-setuptools 
Revert setuptools
 2015-07-15 11:13:56 -04:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Sarina Canelake
4f2be41a48 Add messaging about Insights to Analytics instructor tab 2015-07-15 11:11:09 -04:00
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
Ben McMorran
d36eb83a03 Add query count tests 2015-07-15 14:56:04 +00:00
asadiqbal
56015fecf3 asadiqbal08/SOL-1046: Convert LinkedIn anchor tag to button 
* remove the onclick event
* add mako check to Javascript handler
 2015-07-15 10:30:35 -04:00
Matt Drayer
66e1b11a58 Merge pull request #8931 from edx/ziafazal/fix-SOL-1008 
SOL-1008: only edx PM can activate/deactivate or delete certificate configuration
 2015-07-15 10:03:17 -04:00
David Baumgold
2ff0f636ed Revert MySQL-python upgrade 2015-07-15 09:37:04 -04:00
David Baumgold
1a3f0958b9 Revert setuptools upgrade 2015-07-15 09:36:56 -04:00
David Baumgold
444cddaaf6 Merge pull request #8820 from edx/db/release-notes-column-in-release-script 
Add a column for release notes in the release.py table
 2015-07-15 09:16:00 -04:00
Vedran Karačić
4eb4a82ea5 Merge pull request #8851 from edx/vkaracic/PLAT-619-2 
PLAT-619: Custom error messages for delete course command
 2015-07-15 14:59:25 +02:00
Zia Fazal
0793cc8b5c only ddx PM can activate/deactivate or delete certificate configuration 
fix for flaky test

fix for broken test

fixed quality violation
 2015-07-15 17:09:01 +05:00
tasawernawaz
d3cb2e9442 Merge pull request #8853 from edx/tasawer/story/ecom-1858-provider-description-on-checkout-page 
new view added "get_provider_detail" for get provider info
 2015-07-15 13:21:53 +05:00
Tasawer
6e788d95b9 new view added "get_provider_detail" for getting provider info with provider_id 
ECOM-1858
 2015-07-15 12:25:26 +05:00