Calen Pennington
4312c0e763
Enable PyContracts during tests
2015-05-20 15:07:18 -04:00
Greg Price
af69635f74
Merge pull request #8097 from edx/gprice/discussion-api-comment-list
...
Add comment list endpoint to Discussion API
2015-05-20 14:20:24 -04:00
Christine Lytwynec
63233aa5d8
Fix cyclic import in pavelib
2015-05-20 14:11:54 -04:00
Chris Dodge
f655e7c380
need to urlencode the course_id when constructing the registration redirect query string
2015-05-20 14:05:00 -04:00
Greg Price
2451e06788
Add comment list endpoint to Discussion API
2015-05-20 13:13:19 -04:00
chrisndodge
c40aa66d18
Merge pull request #8081 from edx/muhhshoaib/MAYB-65-MIT-PE-double-coupon-use-reported
...
MAYN-65 fixed the bug, removed the redemption table entry when the item is expired from the user cart
2015-05-20 12:28:17 -04:00
Mark Hoeber
930ccd6332
Merge pull request #8123 from edx/mhoeber-mobile-api-typo
...
Mobile API doc typo
2015-05-20 11:58:51 -04:00
Marco Morales
c9f13eb982
fix for broken course status label on outline page
2015-05-20 11:49:30 -04:00
Thomas Young
e294e01da3
added myself to AUTHORS
2015-05-20 16:43:47 +02:00
Mark Hoeber
0284dce949
Update overview.rst
...
Fix typo
2015-05-20 10:40:32 -04:00
Awais Qureshi
225f442623
Merge pull request #8039 from edx/awais786/ECOM-1590-eligibility-tables
...
ECOM-1590 adding models for credit eligibility.
2015-05-20 18:10:32 +05:00
Phil McGachey
d43ffd3a56
[LTI Provider] Refactoring and clean-up
2015-05-20 08:44:58 -04:00
Thomas Young
2b29c5fb18
scroll to newly created section and make first input element active on creation of a new textbook in the textbooks list page (fix for https://openedx.atlassian.net/browse/TNL-130 )
2015-05-20 11:19:04 +02:00
Awais
2599445190
ECOM-1590 adding models for credit eligibility.
2015-05-20 14:18:37 +05:00
David Baumgold
d94c0ab1af
Merge pull request #8105 from edx/db/update-devops-usernames
...
Update devops in requirement file comments
2015-05-19 17:06:18 -04:00
Sarina Canelake
6c54349d7f
Merge pull request #7836 from edx/sarina/default-xqa
...
Supply default url for XQA server
2015-05-19 15:54:03 -04:00
David Baumgold
fb777fa48f
Update devops in requirement file comments
2015-05-19 15:34:26 -04:00
Ahsan Ulhaq
47702f1bc3
Merge pull request #7918 from edx/ahsan/AC-103-fieldset-legend-solution-lost-when-editing-problem
...
Fieldset and legend solution is lost when edit Problem
2015-05-19 14:42:05 -04:00
Sarina Canelake
c7424dd7ae
Supply default url for XQA server
2015-05-19 14:19:04 -04:00
Sarina Canelake
1ca4b3b941
Merge pull request #8102 from rando305/master
...
Create email only when it will be sent
2015-05-19 14:06:35 -04:00
Christina Roberts
cff565060b
Merge pull request #8052 from edx/christina/tag-events
...
Update student notes eventing for tags.
2015-05-19 13:55:57 -04:00
cahrens
0c7af25c79
Update student notes eventing for tags.
...
TNL-2172
2015-05-19 13:14:10 -04:00
Ben Patterson
6d38de1e5a
Merge pull request #8098 from edx/benp/flaky-annotation
...
Skip test. TNL-1590
2015-05-19 12:34:13 -04:00
Renzo Lucioni
7eecfd89f9
Merge pull request #8094 from edx/renzo/enrollment-api-unenrollment
...
Allow enrollment API to deactivate enrollments
2015-05-19 10:51:23 -04:00
Randy Ostler
93e6434e19
Create email message only when it will be sent
2015-05-19 10:01:48 -04:00
Randy Ostler
470f613b44
Added Randy Ostler to AUTHORS
2015-05-19 09:59:59 -04:00
Christina Roberts
0dbdbfef20
Merge pull request #8080 from edx/track/ga-label-shim
...
Add course_id as label for Google Analytics events
2015-05-19 09:20:07 -04:00
Tyler Nickerson
df80a8d6e4
Merge pull request #8075 from edx/tyler-jwt-fullname
...
LMS now passes the full name of users to the ecommerce api client
2015-05-19 09:15:04 -04:00
Ben Patterson
e9164a72ec
Merge branch 'release'
2015-05-19 07:33:32 -04:00
Muhammad Shoaib
72bf9a5a6c
MAYN-65 fixed the bug, removed the redemption table entry when the item is expired from the user cart
...
fix quality issues
2015-05-19 15:07:07 +05:00
Ahsan Ulhaq
c75526ea5e
changes for failing label test
2015-05-19 13:17:17 +05:00
Ahsan Ulhaq
16a248b997
Fieldset and legend solution is lost when edit Problem
...
when user try to update a problem the fieldset and legend solution for that
problem is lost because legend and fieldset are not added in the markdownToXml.
So added new markups where fieldset is to be added and used ```>><<``` markup for
legend.
AC-103
2015-05-19 11:46:28 +05:00
Renzo Lucioni
960b02cf98
Allow enrollment API to deactivate enrollments
...
Will allow Otto to revoke fulfillment of course seat products. Only server-to-server calls are currently allowed to deactivate or otherwise modify existing enrollments.
2015-05-18 19:44:02 -04:00
Sarina Canelake
b1227c1dd2
Merge pull request #8095 from edx/sarina/cleanup-styles
...
Remove unused css
2015-05-18 19:29:27 -04:00
Ben Patterson
51ac5f7128
Skip test. TNL-1590
...
Even when using the flaky decorator, it is not reliable.
2015-05-18 17:02:18 -04:00
Sarina Canelake
9eb565ec2f
Remove unused css
2015-05-18 16:58:10 -04:00
Marco Morales
28072773a9
Merge pull request #8092 from edx/marco/dashboard/rebase-cleanup
...
BUG - remove username label from dashboard sidebar #UX-2153
2015-05-18 16:53:50 -04:00
Nickersoft
5359ff9d71
Passing full name to E-Commerce API
2015-05-18 16:12:10 -04:00
Greg Price
e124fb0643
Merge pull request #8059 from edx/gprice/discussion-api-thread-list-refactor
...
Refactor Discussion API thread list
2015-05-18 16:09:27 -04:00
Sarina Canelake
1775dd5365
Merge pull request #7315 from edx/db/creative-commons
...
Allow custom licensing for course content
2015-05-18 15:36:50 -04:00
Ben Patterson
3679396019
Merge pull request #8093 from edx/benp/test-user-mgmt-skip
...
Skip flaky test. SOL-618.
2015-05-18 14:58:54 -04:00
Christine Lytwynec
081b7ca750
Merge pull request #8031 from edx/clytwynec/clean-up-all-tests-script
...
clean up all-tests.sh script
2015-05-18 14:58:28 -04:00
AlasdairSwan
d1df7b1556
Merge pull request #7986 from edx/alasdair/ECOM-1547-footer-2015
...
Alasdair/ecom 1547 footer 2015
2015-05-18 14:55:06 -04:00
Sarina Canelake
ca64c665cc
Default course license to All Rights Reserved
...
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.
Add ARIA attributes to license for a11y
Gracefully handle re-selecting of selected license
2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c
Courseware license (Creative Commons): FED
...
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
8fbaa66d33
Make courseware licenses show up in Studio XBlock previews
2015-05-18 14:35:40 -04:00
David Baumgold
648e8a20f7
Creative Commons: Accessibility improvements
2015-05-18 14:35:09 -04:00
David Baumgold
37ab2fc16a
Wrap block with license info in LMS only
2015-05-18 14:35:08 -04:00
David Baumgold
ca2fee1259
Move LicenseMixin into VideoFields class
2015-05-18 14:35:07 -04:00
David Baumgold
2159d34128
Added a simple XBlockMixin for courseware licenses
...
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.
License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.
This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
