Commit Graph

33991 Commits

Author SHA1 Message Date
Clinton Blackburn
c6bfac720f Updated credit migration for CreditProvider.provider_id
There is no need for a separate migration for the validation. Updated the regex in the initial migration to appease Django.

ECOM-2609
2015-11-25 14:52:34 -05:00
Ned Batchelder
ae50d4d6fb Merge pull request #10730 from edx/ned/github-txt-instructions
Add instructions to github.txt
2015-11-25 12:47:25 -05:00
Jesse Zoldak
83979f35f7 Merge pull request #10740 from edx/zoldak/quiet-pip-uninstalls
Disable the pip version check message for uninstalls
2015-11-25 11:43:43 -05:00
Jesse Zoldak
c5be59d8c7 Disable the pip version check message for uninstalls 2015-11-25 10:45:20 -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
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
Ned Batchelder
fc875b1cc5 Add instructions to github.txt 2015-11-24 16:25:05 -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
Carol Tong
933a2b343a Merge pull request #10715 from edx/carol/doc/StudioHelpUpdates
DOC: Studio Help -- update config.ini file with new paths to B&R Guide
2015-11-24 13:18:40 -05:00
Carol Tong
163e6f0a19 Update config.ini file with new paths 2015-11-24 12:27:27 -05:00
Christine Lytwynec
0100e50669 Merge pull request #10666 from edx/clytwynec/ac-239
remove unneeded aria-describedby and aria-hidden attrs on studio modal
2015-11-24 12:14:44 -05:00
Cliff Dyer
c8a791abf0 Merge pull request #10576 from edx/cdyer/course-list-api
Added new Course Catalog API

https://openedx.atlassian.net/browse/MA-1625
2015-11-24 11:38:14 -05:00
Sarina Canelake
00ea617412 Merge pull request #10721 from edx/sarina/20151124-update-translations
Update translations (autogenerated message)
2015-11-24 11:27:52 -05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Christine Lytwynec
9a361b6b8a remove unneeded aria-describedby and aria-hidden attrs on studio modal 2015-11-24 10:42:04 -05: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
Andy Armstrong
7731f3d8f8 Merge pull request #10718 from edx/andya/new-ora-release
Use the latest ORA and submissions API
2015-11-24 10:31:22 -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
Sarina Canelake
7d2aa28ef8 Update translations (autogenerated message) 2015-11-24 10:26:03 -05:00
Sarina Canelake
4f4a0895ea Merge pull request #6279 from edx/ned/add-officemix-xblock
Add the Microsoft Office Mix XBlock
2015-11-24 10:01:28 -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
Ned Batchelder
e16fad3540 Add the Microsoft Office Mix XBlock 2015-11-24 09:04:12 -05:00
Sarina Canelake
bb625770b4 Merge pull request #10716 from edx/ned/update-i18n-tools
Use 0.1.4 of i18n-tools so Django 1.8 will work. PLAT-919
2015-11-24 08:40:02 -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
chrisndodge
236d251e6e Merge pull request #10691 from edx/cdodge/add-attempt-code-to-report
Add in the attempt_code field to the proctoring report
2015-11-24 07:18:11 -05:00
Ahsan Ulhaq
73eb9bd9df Update help text for Name field in edx registration
ECOM-2897
2015-11-24 12:47:42 +05:00
Andy Armstrong
fbbf3380b8 Use the latest ORA and submissions API 2015-11-24 00:41:12 -05:00
Ned Batchelder
3ae92b9f02 Use 0.1.4 of i18n-tools so Django 1.8 will work 2015-11-23 21:59:26 -05:00
Ned Batchelder
a7e21bf188 Merge pull request #10707 from edx/ned/fix-pylint-c7630-violations
Fix pylint C7630 (literal used as attribute) violations
2015-11-23 16:58:54 -05:00
Feanil Patel
995a214c95 Merge pull request #10710 from edx/feanil/upgrade_pymongo
Upgrade to latest 2.x version of pymongo.
2015-11-23 15:50:23 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
2015-11-23 15:32:54 -05:00
David Baumgold
2e71a66daa GitHub has a capital H 2015-11-23 15:06:33 -05:00
Christine Lytwynec
29b719f394 Merge pull request #10527 from edx/clytwynec/ac-230
Navigation dropdown link should be button
2015-11-23 15:06:02 -05:00
Christine Lytwynec
c6f4afc9c9 Header a.dropdown --> button.dropdown 2015-11-23 13:51:00 -05:00
Feanil Patel
6f0e7c5116 Upgrade to latest 2.x version of pymongo.
Release Notes: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=14795
Mostly backports to prep for moving to 3.0
2015-11-23 12:26:03 -05:00
Christine Lytwynec
6a92d4cb2b Merge pull request #10639 from edx/clytwynec/remove-firefox-focus-outline-override
remove reset style for button outlines in firefox
2015-11-23 11:55:00 -05:00
Ned Batchelder
5634692f6c Merge pull request #10708 from edx/ned/fix-wiki-0002-migration
Update the django-wiki reference
2015-11-23 10:46:06 -05:00
Ned Batchelder
68e30f5dee Update the django-wiki reference
Django-wiki had an incorrect migration. This gets the right one.
2015-11-23 10:01:08 -05:00
Peter Pinch
d4d63ece1f Merge pull request #10647 from mitocw/enhancement/aq/email_notification_setting_ccx_enrollment
Added auto-enroll and email student check boxes to enrollment tab ccx coach dashboard
2015-11-23 08:18:41 -05:00
Ned Batchelder
dcc86a3b1b Merge pull request #10703 from edx/ned/remove-useless-pylint-suppression
Remove useless pylint suppressions. TOOLS-124
2015-11-23 07:00:26 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Akiva Leffert
7a858b6e09 Merge pull request #10405 from edx/aleffert/block-wrapping
Force wrapping for long content like hyperlinks.
2015-11-20 19:17:41 -05:00