Commit Graph

11131 Commits

Author SHA1 Message Date
Daniel Friedman
1365096821 Merge pull request #8129 from edx/dan-f/auto-auth-add-anonymous_id_2
Add anonymous_id to page returned by auto_auth
2015-06-01 15:21:39 -04:00
Daniel Friedman
9e0dcb7239 Add JSON response to auto_auth with anonymous_id 2015-06-01 14:21:42 -04:00
dino-cikatic
62797a3f2e Merge pull request #7697 from edx/feature/course-discovery
Feature/course discovery
2015-06-01 11:46:44 +02:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
2015-06-01 10:45:51 +02:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Sarina Canelake
be8eed65c8 Internationalize help text 2015-05-31 17:22:52 -04:00
Sarina Canelake
1237ee6b37 Add correct_or_past_due option for showanswer help text (ref bbeb79cb) 2015-05-31 17:22:51 -04:00
Adam Palay
683d2b3dbe fix quality violation 2015-05-29 21:46:02 -04:00
Adam Palay
e3976f7e98 Merge remote-tracking branch 'origin/release' into merge-release-to-master 2015-05-29 19:47:12 -04:00
Adam Palay
0aba5874e6 Revert "Fieldset and legend solution is lost when edit Problem"
This reverts commit 16a248b997.
2015-05-29 18:50:34 -04:00
Adam Palay
509f27f02c Revert "changes for failing label test"
This reverts commit c75526ea5e.
2015-05-29 18:50:23 -04:00
John Eskew
a0675a16d0 Merge pull request #8281 from edx/release
Merging hotfix-2015-05-29 from release to master
2015-05-29 18:32:46 -04:00
Calen Pennington
6d7944fa34 Allow specification of ReadPreference via DOC_STORE_CONFIG.
Use a MongoReplicaSetClient for Split modulestore, but only
if replicaSet config is set.
2015-05-29 14:58:20 -04:00
Sarina Canelake
e72d5d542b Add fake Arabic testing language 2015-05-29 10:16:30 -04:00
Ned Batchelder
eb3b8c5ce4 TNL-2269 Compute language direction every time.
The old code would compute the language direction once when the template
was loaded.

TNL-2269
2015-05-28 16:13:59 -04:00
Sarina Canelake
4eaa12d9a7 Merge pull request #8237 from edx/revert-i18n-lon-capa-problem-explanation-title
Revert "i18n lon-capa problem explanation title"
2015-05-28 14:03:57 -04:00
Will Daly
78ea4d55f4 Merge pull request #8175 from edx/will/footer-api-redux
ECOM-1339 Branding API footer
2015-05-28 11:03:06 -04:00
Sarina Canelake
cde166a0a2 Revert "i18n lon-capa problem explanation title"
This reverts commit 3e0342cbb3.
2015-05-28 10:23:34 -04:00
Will Daly
6af5fc1452 ECOM-1339 Branding API footer
Serve branded footer JSON/HTML/CSS/JS from an API endpoint
in the branding app.  Refactor OpenEdX and EdX.org footer templates
to use the Python version of the API, ensuring that the API
values are consistent with the footer included in main.html.

Detailed changes:

* Added footer API end-point to the branding app.
* Footer API allows the language to be set with querystring parameters.
* Footer API allows showing/hiding of the OpenEdX logo using querystring parameters.
* Deprecate ENABLE_FOOTER_V3 in favor of the branding API configuration flag.
* Move no referrer script into main.html from the edx footer template.
* Rename rwd_header_footer.js to rwd_header.js
* Cache API responses.

Authors:
Awais Qureshi, Aamir Khan, Will Daly
2015-05-28 08:30:45 -04:00
Awais Qureshi
5c5ec5c471 Merge pull request #8157 from edx/awais786/ECOM-1494-deprecate-midcourse-code
Awais786/ecom 1494 deprecate midcourse code
2015-05-28 12:25:48 +05:00
Awais Jibran
64ffcb2e2b Merge pull request #8179 from edx/aj/tnl2223-expand-inline-discussion-jumps-to-the-bottom-of-page
TNL-2223 Inline discussion jumps to the bottom of the page when threa…
2015-05-27 22:50:28 +05:00
Nimisha Asthagiri
8aae4023f9 MA-738 OAuth2 token exchange for session cookie. 2015-05-27 07:35:31 -04:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05:00
Sarina Canelake
29c86032ec Merge pull request #8181 from IONISx/tusbar/fix-enrollment-api-doc
Fix documentation comment for enrollment API
2015-05-26 16:13:14 -04:00
chrisndodge
99de1c8f48 Merge pull request #7992 from edx/muhhshoaib/SOL-794-generate-detailed-enrollment-report
Muhhshoaib/sol 794 generate detailed enrollment report
2015-05-26 15:57:22 -04:00
Christine Lytwynec
df758d7917 Add an explicit accessibility test TE-890 2015-05-26 11:55:27 -04:00
Bertrand Marron
e8bf151f3d Fix documentation comment for enrollment API 2015-05-25 16:56:25 +02:00
Awais Jibran
adfca9d480 TNL-2223 Inline discussion jumps to the bottom of the page when thread is expanded. 2015-05-25 18:31:17 +05:00
John Eskew
f0c52e3244 Merge pull request #7948 from edx/jeskew/PLAT_618_elemental_publish_tests
Add tests for publishing operations and OLX export.
2015-05-22 19:14:32 -04:00
John Eskew
4219086d40 Add framework for testing the effects of modulestore operations on OLX.
Add tests for all course-changing operations from the
ModuleStoreDraftAndPublished interface.
Enforce the OLX format of draft and published items for those ops.
2015-05-22 16:21:00 -04:00
Muhammad Shoaib
b555c869bf SOL-794 Detailed Enrollment Report
- added the abstract and concrete layers of enrollment report provider
- created a celery task.
-added the button in the e-commerce reports section

added the enrollment data backend

added the payment data and start writing the test cases.

updated the code with the feedback suggestions and wrote some test cases.
- all the downloadable reports are now visible in the ecommerce download section.
Pending instructor tasks is also visible in the ecommerce section

added the fields in the user profile information
changed the report store configuration key
added the new http endpoint for financial reports to add more permissions for finance_admin to access.

fix quality issues

added test cases to check csv content data

rebased with master and resolved conflicts

changed the log messages

added the changes as per code clintonb suggestions during code review

updated the test cases for the finance_admin decorator

changes suggested by clinton.

Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.

ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues

added the registration code column in the csv

added the full gender in the csv file

Update data sources and add display name translations for the report columns

fix meta name

Make sure the reports section does not appear on non whitelabel courses

pylint fixes

expand out enumerated values
2015-05-22 15:16:57 -04:00
John Eskew
25a4fec7d1 boostrapper -> bootstrapper 2015-05-22 11:51:42 -04:00
Calen Pennington
83962d6497 Allow CourseAboutFactory to be used without django by explicitly passing in a modulestore 2015-05-22 11:51:42 -04:00
Jim Abramson
c807a6041b Merge pull request #8127 from edx/jsa/xcom-306
Implement student-initiated refunds for external commerce service.
2015-05-21 11:42:32 -04:00
jsa
3dede202f1 Implement student-initiated refunds for external commerce service.
XCOM-306
2015-05-21 11:37:37 -04:00
Awais Qureshi
f5d08b2ea1 Merge pull request #8085 from edx/awais786/ECOM-1590-new-field-minimum-grade-studio
ECOM-1590 adding new field in advance_settings.
2015-05-21 17:57:51 +05:00
Calen Pennington
a2cbd16680 Merge pull request #7789 from cpennington/wrap-csm
Wrap access to CSM (inside FieldDataCache) to use the new interface
2015-05-20 16:11:07 -04:00
Calen Pennington
bd1e9aa129 Record valid scopes when raising InvalidScopeError 2015-05-20 15:33:30 -04:00
Awais
3da312b224 ECOM-1590 adding new field in advance_settings. 2015-05-21 00:29:00 +05: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
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
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
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