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

12865 Commits

Author SHA1 Message Date
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
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
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
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08: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
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
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
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
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
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
Bill DeRusha
78896c60b5 Initial migrations for verified deadlines for self paced 2015-11-30 10:30:23 -05:00
asadiqbal
7c68d80c67 SOL-1417 2015-11-30 14:40:08 +05:00
wajeeha-khalid
bbe35dcaef MA-1742; return read status for GET thread details 2015-11-30 11:54:08 +05:00
Brian Beggs
89a7e42576 Merge pull request #10742 from edx/bbeggs/acceptance-test-migration-fix 
Migrations will now run during Acceptance tests
 2015-11-26 09:34:51 -05:00
wajeeha-khalid
6e5e185b4e Merge pull request #10738 from edx/jia/MA-1593 
MA-1593; include post in comment count
 2015-11-26 11:18:30 +05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab 
Add Programs tab to Studio
 2015-11-25 16:37:34 -05:00
Nimisha Asthagiri
115ab3c11b Merge pull request #10720 from edx/mobile/course-about-url-MA-1712 
MA-1712: Update Mobile API to include course_about
 2015-11-25 15:38:45 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Nimisha Asthagiri
0b90326470 MA-1667: Update Mobile API to support Web Certificates 2015-11-25 13:49:27 -05:00
Nimisha Asthagiri
330120bb7a MA-1712: Update Mobile API to include course_about 2015-11-25 13:48:45 -05:00
Brian Beggs
0954bd0928 Migrations will now run during Acceptance tests 2015-11-25 12:57:02 -05:00
Zia Fazal
984af512b3 Merge pull request #10656 from edx/saleem-latif/SOL-1390 
SOL-1390: Cert Exceptions: View and Edit Exception list
 2015-11-25 18:03:33 +05:00
Clinton Blackburn
c474ce645d Merge pull request #10634 from edx/clintonb/credit-api-drf 
Rewrote Credit API
 2015-11-25 07:58:30 -05:00
wajeeha-khalid
6ea7c23631 MA-1593; include post in comment count 2015-11-25 17:40:06 +05:00
clrux
996da3d7bb Merge pull request #10729 from edx/clrux/ac-220 
LMS: adjusting Wiki alert styles
 2015-11-25 07:39:47 -05:00
Saleem Latif
764ceb00c8 Cert Exceptions: View and Edit Exception list 2015-11-25 10:02:52 +05:00
Clinton Blackburn
92153752c0 Rewrote Credit API 
- API built atop Django REST Framework
- Added support for OAuth 2.0 and session authentication
- Added permissions around eligibility data

ECOM-2609
 2015-11-24 22:06:54 -05:00
Peter Fogg
5043b46525 Merge pull request #10602 from edx/peter-fogg/update-footer-config 
Update LMS footer links.
 2015-11-24 15:50:46 -05:00
Chris Rodriguez
9e2e9af1f5 LMS: adjusting Wiki alert styles 2015-11-24 14:50:59 -05:00
Ahsan Ulhaq
347bfcbb38 Merge pull request #10688 from edx/ahsan/ECOM-2562-Refund-Policy-on-Prof-Ed-Receipts 
Refund Policy on Prof Ed Receipts
 2015-11-25 00:39:50 +05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Peter Pinch
1b8349994e Merge pull request #10619 from mitocw/fix/aq/dates_of_problems 
Overridden start and due dates of problems to control due date of a unit from ccx schedule
 2015-11-24 10:38:59 -05:00
chrisndodge
0ccb017408 Merge pull request #10713 from edx/cdodge/fix-zero-seat-invoices 
Cdodge/fix zero seat invoices
 2015-11-24 10:28:42 -05:00
Chris Dodge
e534e5d588 fix broken report when there is a zero seat invoice 
fix quality error
 2015-11-24 09:42:54 -05:00
Ahsan Ulhaq
d729e97f50 Merge pull request #10658 from edx/ahsan/ECOM-2897-Update-help-text-for-Name-field-in-edx-registration 
Update help text for Name field in edx registration
 2015-11-24 19:41:00 +05:00
David Baumgold
e48e250b1b Merge pull request #10712 from edx/github-capital-h 
GitHub has a capital H
 2015-11-24 09:26:55 -05:00
Amir Qayyum Khan
a1f2f395a0 overriden start and due dates for problems to controll due date of a unit from ccx schedule 2015-11-24 18:23:09 +05:00
Ahsan Ulhaq
bc64c66835 Refund Policy on Prof Ed Receipts 
ECOM-2562
 2015-11-24 17:42:09 +05:00
aamir-khan
df3c3874ed ECOM-1447: Added the custom message if there is an internal server error on ajax call. 2015-11-24 17:31:07 +05:00