Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,086 Commits 1 Branch 0 Tags
3b5d9fe95a90579742b610391ab8d9b4d4dcd0bb
Commit Graph

34086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
3b5d9fe95a Merge pull request #10761 from jbzdak/tnl-363 
Fixes TNL-363: EdX OpenID provider doesn't handle unicode e-mails
 2015-12-03 10:17:58 -05:00
wajeeha-khalid
ef383a8902 Merge pull request #10790 from edx/jia/MA-1748 
jia/MA-1748 patch read states for users
 2015-12-03 20:15:00 +05:00
Ben Patterson
613c39b00f Merge pull request #10803 from edx/benp/fix-flaky-teams-events 
Enforce order on these events to solve flaky condition.
 2015-12-03 09:31:14 -05:00
David Baumgold
c681000975 Merge pull request #10717 from nikolas/patch-2 
Upgrade pip to 7.1.2
 2015-12-03 09:30:18 -05:00
Jacek Bzdak
3506d962f8 Fix for error in TNL-363 
Audit logs were causing open_id provider logins to fail when
username or e-mail address contained unicode data.
 2015-12-03 11:27:20 +01:00
Jacek Bzdak
451d70a2d1 Added Jacek Bzdak to AUTHORS file. 2015-12-03 11:22:02 +01:00
wajeeha-khalid
c9c1a4bc71 jia/MA-1748 patch read states for users 2015-12-03 12:08:20 +05:00
raeeschachar
f2c4a3de14 Merge pull request #10719 from edx/raees/chrome-bok-choy-test-page-scroll-on-thread-change-view 
Fixes test_page_scroll_on_thread_change_view failing on chrome
 2015-12-03 11:06:37 +05:00
Ben Patterson
134a3134df Reset mongo events store for each test. 2015-12-02 21:05:46 -05:00
Ben Patterson
1d6c61c356 Enforce order on these events to solve flaky condition. 2015-12-02 20:13:01 -05:00
Adam
cfa034ba2d Merge pull request #10785 from edx/adam/delete-orphans-in-bulk-op 
do orphan deletion in a bulk operation (SUST-21)
 2015-12-02 15:47:46 -05:00
clrux
06eede5d14 Merge pull request #10796 from edx/clrux/ac-253 
LMS: changing blue to pink, ensuring contrast, for Studio/Staff
 2015-12-02 13:54:37 -05:00
Adam Palay
72e7ac5d4c do orphan deletion in a bulk operation (SUST-21) 2015-12-02 13:33:59 -05:00
Chris Rodriguez
deaa044669 Changing blue to pink as was previously there 2015-12-02 12:14:15 -05:00
wajeeha-khalid
fee7946988 Merge pull request #10758 from edx/jia/MA-1742 
MA-1742; return read status for GET thread details
 2015-12-02 21:13:52 +05:00
Chris Rodriguez
284b1a0fdf LMS: darkening blue on Studio links 2015-12-02 11:09:11 -05:00
raeeschachar
1de57ed56b Merge pull request #10776 from edx/raees/chrome-bok-choy-test-split-test-lms-staff-view 
Fixed test studio split test failing on chrome
 2015-12-02 17:29:58 +05:00
Awais Qureshi
989389e3f2 Merge pull request #10781 from edx/awais786/ECOM-2980-admin-certs-page 
Replacing user dropdown field with user search textbox. On stage due …
 2015-12-02 17:10:45 +05:00
raeeschachar
b3271e3be1 Fixes test_page_scroll_on_thread_change_view failing on chrome 2015-12-02 15:01:02 +05:00
raeeschachar
93173622c0 Merge pull request #10783 from edx/raees/chrome-bok-choy-video-test-test-arr-license 
Fixed test cc and test arr license that were failing on Chrome
 2015-12-02 12:17:52 +05:00
Braden MacDonald
927e919ec4 Merge pull request #9903 from open-craft/sso-custom-auth-entry-points 
Allow using a custom login/register form with third_party_auth
 2015-12-01 16:41:56 -08:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Robert Raposa
1371b2e9ee Merge pull request #10786 from edx/release-2015-12-01-conflict 
Release-2015-12-01 conflict resolved
 2015-12-01 17:03:10 -05:00
Robert Raposa
38bee4f794 Merge branch 'rc/2015-11-24' into release-2015-12-01-conflict 
# Conflicts:
#	requirements/edx/github.txt
 2015-12-01 15:38:31 -05:00
Renzo Lucioni
d370b0aa23 Merge pull request #10774 from edx/renzo/fix-programs-migration 
Modify existing Programs migration to account for help_text change
 2015-12-01 11:06:12 -05:00
Matt Drayer
f6872a0fa4 Merge pull request #10750 from edx/asadiqbal08/SOL-1417-CSV 
SOL-1417 Certs: Allow CSV upload for Cert Exceptions
 2015-12-01 10:36:32 -05:00
Nimisha Asthagiri
47b0d492e4 Merge pull request #10727 from edx/cdyer/pagination 
Add pagination support to course catalog API
 2015-12-01 09:09:04 -05:00
raeeschachar
c167ad5eb0 Fixed test studio split test failing on chrome 2015-12-01 18:59:50 +05:00
raeeschachar
f87236b9ff Fixed test cc and test arr license in Video Tests that were failing on Chrome 2015-12-01 18:30:09 +05:00
Matt Drayer
2320d4220c Merge pull request #10748 from edx/saleem-latif/SOL-1389 
SOL-1389: Cert Exception: Add error states and messages
 2015-12-01 08:23:24 -05:00
Ben Patterson
abcf33aba4 Merge pull request #10757 from edx/benp/mp-support-discussion-tab 
Support multiprocess bok-choy testing for discussion
 2015-12-01 08:23:02 -05:00
Matt Drayer
f5d9f2829e Merge pull request #10759 from edx/ziafazal/SOL-1439 
SOL-1439: removed certificates delivered dependency on certificate eligibility
 2015-12-01 08:19:38 -05:00
Matt Drayer
6fca86a736 Merge pull request #10777 from edx/saleem-latif/SOL-1466 
SOL-1466: Make sure web view renders certs only if downloadable.
 2015-12-01 08:17:52 -05:00
J. Cliff Dyer
f53de2c04a Paginate results of Courses API list endpoint 
* Catalog results are now paginated
* Implements the new namespaced pagination described at
  https://openedx.atlassian.net/wiki/pages/viewpage.action?pageId=47481813
* API level code returns pythonic business objects
* View layer performs serialize at the view layer
* Convert views to use DRF generic views
* Removes an unintentional authentication decorator that caused
  the detail endpoint to return a 401 for anonymous users

MA-1724
 2015-12-01 08:13:18 -05:00
wajeeha-khalid
11f34c1e8c Merge pull request #10736 from edx/jia/MA-1211 
MA-1211; Discussion API - make boolean params case insensitive
 2015-12-01 18:11:18 +05:00
Douglas Hall
7bb6653d93 Merge pull request #10775 from edx/task/douglashall/fix_xblock_utils_requirement 
Do not install xblock-utils in editable mode
 2015-12-01 06:56:20 -05:00
Awais
afd6d3f66a Replacing user dropdown field with user search textbox. On stage due to large user's list page is not loading. 
ECOM-2980
 2015-12-01 16:52:10 +05:00
Zia Fazal
34d630eacf removed certificates delivered dependency on certificate eligibility 
split variables on multiple lines

changes after feedback from Afzal
 2015-12-01 16:24:06 +05:00
Saleem Latif
37f10a3846 Make sure web view renders certs only if downloadable. 2015-12-01 16:10:05 +05:00
Saleem Latif
a8e44b3097 Cert Exception: Add error states and messages 2015-12-01 12:46:04 +05:00
Aamir
a0db0d8297 Merge pull request #10520 from edx/aamir-khan/ECOM-1447-login-error-message 
Aamir khan/ecom 1447 login error message
 2015-12-01 11:44:31 +05:00
wajeeha-khalid
092cc4b278 MA-1211; Discussion API - make boolean params case insensitive 2015-12-01 11:25:27 +05:00
Douglas Hall
b43c2b23e9 Do not install xblock-utils in editable mode 2015-11-30 19:15:18 -05:00
Eric Fischer
7c2fec2113 Merge pull request #10771 from edx/efischer/revert-rc-fix 
Revert "Fixing CohortMembership and ATOMIC_REQUESTS issue"
 2015-11-30 18:52:27 -05:00
Renzo Lucioni
c2138a3512 Modify existing Programs migration to account for help_text change 
Prevents makemigrations from creating a new migration for the programs app.
 2015-11-30 17:36:35 -05:00
Eric Fischer
9e902264e7 Revert "Fixing CohortMembership and ATOMIC_REQUESTS issue" 
This reverts commit 12130c8006.
Manual testing found this to not fix the bug it claimed to fix.
 2015-11-30 17:09:47 -05:00
Bill DeRusha
8c69f22689 Merge pull request #10722 from edx/bd/sp-init 
Initial migrations for verified deadlines for self paced
 2015-11-30 16:28:25 -05:00
Douglas Hall
63bee2a8ad Merge pull request #10600 from edx/task/douglashall/PHX-201/xblock_lti_consumer 
Sprint Solutions:Zug PHX-200 PHX-201 Adding LTI consumer XBlock to requirements
 2015-11-30 16:18:14 -05:00
Nimisha Asthagiri
8c4eefd53f Merge pull request #10724 from edx/mobile/support-web-certs-MA-1667 
MA-1667: Update Mobile API to support Web Certificates
 2015-11-30 14:41:47 -05:00
Eric Fischer
07c6b7ccf9 Merge pull request #10765 from edx/efischer/rc-patch-small 
CohortMemberships minimal fix
 2015-11-30 13:34:35 -05:00