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
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
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
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
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
c6f4afc9c9
Header a.dropdown --> button.dropdown
2015-11-23 13:51:00 -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
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
f5d0f3ff55
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
Akiva Leffert
bb43407586
Force wrapping for long content like hyperlinks.
...
Content that doesn't fit on the screen was causing the viewport to be
the wrong size on mobile devices resulting. This forces wrapping for
long content instead of letting it force the viewport size.
JIRA: https://openedx.atlassian.net/browse/MA-1236
2015-11-20 17:47:58 -05:00
Christine Lytwynec
b96cd65a14
remove reset style for button outlines in firefox
2015-11-20 14:26:16 -05:00
Kevin Falcone
80614a2798
Merge branch 'release' into hotfix-2015-11-20-conflict
2015-11-20 13:13:05 -05:00
chrisndodge
7c7c0b6809
Merge pull request #10670 from edx/cdodge/fix-unenrollment-audit-data
...
Cdodge/fix unenrollment audit data
2015-11-20 12:07:14 -05:00
Chris Dodge
21c2d3f7bd
Add in the attempt_code field to the proctoring report
2015-11-20 12:05:49 -05:00
Usman Khalid
c22d0de9fb
Merge pull request #10690 from edx/usman/fix-settings
...
Cleanup some settings.
2015-11-20 20:41:59 +05:00
Amir Qayyum Khan
7bb4980f05
Added auto-enrol and email student check boxes to enrolment tab ccx coach dashboard
2015-11-20 19:22:38 +05:00
Usman Khalid
dc7b57f459
Cleanup some settings.
2015-11-20 18:18:32 +05:00
zubair-arbi
0b93054cbb
Allow user to submit initial verification through reverify flow
...
ECOM-2933
2015-11-20 14:34:38 +05:00
Chris Dodge
f4c5541339
be sure to include the enrollment_id when unenrolling
2015-11-19 15:50:51 -05:00
Nimisha Asthagiri
a2675fe0b4
Merge pull request #10649 from edx/jia/MA-1190
...
MA-1190; patch 'read' attribute for thread
2015-11-19 15:27:50 -05:00
Alison Hodges
02b43c05fc
Merge pull request #10562 from edx/ahodges/DOC-2390
...
Updates the example locations to split format
2015-11-19 14:55:29 -05:00
Brian Beggs
141e0a93c7
Merge branch 'master' into dj18-release-merge
2015-11-19 13:36:13 -05:00
Adam Palay
5b5cf7d3b0
Fix login redirect when user is logged out while answering a question (TNL-3789)
2015-11-19 10:28:58 -05:00
Matt Drayer
42c2cc4dbe
Merge pull request #10618 from edx/ziafazal/SOL-1386
...
SOL-1386: refactored cert web view code
2015-11-19 09:46:57 -05:00
wajeeha-khalid
e662e869d6
MA-1190; patch 'read' attribute for thread
2015-11-19 15:33:35 +05:00
Peter Fogg
60f6bbe929
Add correct payment processor messages.
...
(facepalm)
2015-11-18 14:05:37 -05:00
