Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,476 Commits 1 Branch 0 Tags
2ca4acb4e337d1c200e734e8608cdf72f0747661
Commit Graph

5231 Commits

Author SHA1 Message Date
Renzo Lucioni
3b2d067e79 Resolve merge conflict between master and release 2015-05-29 11:17:49 -04:00
Christina Roberts
eb3d3a99a5 Merge pull request #8246 from edx/christina/TNL-2251 
Fix bug when student scoring error occurs with no message.
 2015-05-28 21:05:00 -04:00
jsa
18cbc0a557 Suppress email for refunds unless mode is verified. 
XCOM-375
 2015-05-28 17:26:36 -04:00
Renzo Lucioni
0b173946ee Use publicly-accessible ecommerce URL root when constructing refund email 
Parsing the ECOMMERCE_API_URL yields a URL root only accessible from within the VPC.
 2015-05-28 17:26:26 -04:00
cahrens
4d4e260964 Fix bug when student scoring error occurs with no message. 
TNL-2251
 2015-05-28 16:49:02 -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
Renzo Lucioni
81578791ed Merge pull request #8219 from edx/renzo/external-ecommerce-url 
Use publicly-accessible ecommerce URL root when constructing refund email
 2015-05-28 12:13:25 -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
Renzo Lucioni
8dfd250171 Use publicly-accessible ecommerce URL root when constructing refund email 
Parsing the ECOMMERCE_API_URL yields a URL root only accessible from within the VPC.
 2015-05-28 09:45:08 -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
David Ormsbee
ba4be3cdea Merge pull request #8117 from mcgachey/mcgachey-lti-migrations 
[LTI Provider] Refactoring and clean-up
 2015-05-27 16:52:03 -04:00
Phil McGachey
a7b8b3f503 [LTI Provider] Documentation fix 2015-05-27 15:37:30 -04:00
Nimisha Asthagiri
83866943bb Merge pull request #8212 from edx/mobile/API_decorators 
Move generic mobile API view decorators.
 2015-05-27 15:36:48 -04:00
Nimisha Asthagiri
a7fabd5927 Move generic mobile API view decorators. 2015-05-27 14:35:27 -04:00
Phil McGachey
1ea4b8a026 Logging invalid key errors 2015-05-27 13:56:10 -04:00
Nimisha Asthagiri
5bf6009975 Merge pull request #8211 from edx/mobile/update_video_outline 
Minor update to video_outline API.
 2015-05-27 13:27:59 -04:00
Greg Price
f3911c44c0 Merge pull request #8198 from edx/gprice/discussion-api-create-thread-following 
Add "following" parameter to thread creation
 2015-05-27 13:14:47 -04:00
Phil McGachey
577438d085 Addressing review comments 2015-05-27 12:22:34 -04:00
Nimisha Asthagiri
5aa15954f7 Minor update to video_outline API. 2015-05-27 12:00:18 -04:00
Greg Price
df3e6535dc Add "following" parameter to thread creation 
This allows authors to follow the thread immediately upon creation.
 2015-05-27 10:58:14 -04:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05: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
Greg Price
93178bc395 Merge pull request #8170 from edx/gprice/discussion-api-create-thread 
Add thread creation to discussion API
 2015-05-26 14:22:00 -04:00
Greg Price
f891450f50 Add thread creation to discussion API 
Also, fix the field-specific error format for all API endpoints.

This requires cs_comments_service commit fdf017c918.
 2015-05-26 12:42:40 -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
Ben Patterson
176770efad Revert "Enable PyContracts during tests" 
This reverts commit 4312c0e763.
 2015-05-22 15:05:11 -04:00
Marko Jevtić
796541af4f Merge pull request #7987 from edx/mjevtic/SOL-837 
(SOL-837) Added RTL support to payment page
 2015-05-22 18:31:39 +02:00
Clinton Blackburn
a3cea74a1d Merge pull request #8162 from edx/refund-post-fix 
Fixed call to refund creation endpoint
 2015-05-22 10:53:01 -04:00
marjev
f5b166f120 (SOL-837) Added RTL support to payment page 2015-05-22 16:42:01 +02:00
Greg Price
09b00df71c Merge pull request #8154 from edx/gprice/discussion-api-comment-list-refs 
Add comment list URLs to discussion api threads
 2015-05-22 07:53:31 -04:00
Clinton Blackburn
cc3bb3055b Fixed call to refund creation endpoint 
Data should be sent as a dict, not kwargs.
 2015-05-21 23:04:42 -04:00
Greg Price
c83f56153e Add comment list URLs to discussion api threads 2015-05-21 15:03:02 -04:00
Awais
f2f44312d2 ECOM-1600 fixing certs button issue. 2015-05-21 23:01:00 +05:00
Greg Price
a4dd6e56f0 Merge pull request #8132 from edx/gprice/discussion-api-comment-list-endorsed 
Add endorsement fields to comment list API
 2015-05-21 13:54:16 -04:00
chrisndodge
4c9f415b46 Merge pull request #8131 from edx/cdodge/fix-encoding-of-course-id 
need to urlencode the course_id when constructing the registration re…
 2015-05-21 11:47:10 -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
Greg Price
c65893e9e0 Add endorsement fields to comment list API 2015-05-21 11:35:39 -04: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
122039ac58 Add __len__ to FieldDataCache 2015-05-20 15:33:31 -04:00
Calen Pennington
4625036d31 Standardize on triple double-quotes for docstrings 2015-05-20 15:33:30 -04:00
Calen Pennington
827a8f815a Improve documentation of courseware.model_data 2015-05-20 15:33:30 -04:00
Calen Pennington
bd1e9aa129 Record valid scopes when raising InvalidScopeError 2015-05-20 15:33:30 -04:00
Calen Pennington
3e8631c214 Make the use of StudentModules explicit in variable names in user_state_client.py 2015-05-20 15:33:30 -04:00
Calen Pennington
13dc390f7a Use a specialized method to clean up DjangoKeyValueStore 2015-05-20 15:33:30 -04:00
Calen Pennington
7d2909c5b5 Add contracts to DjangoXBlockUserStateClient interface methods 2015-05-20 15:33:29 -04:00
Calen Pennington
2bfbd57ec1 Add a test case for an XBlock that has no student state fields, but sets a score 2015-05-20 15:33:29 -04:00
Calen Pennington
2e06e592ca Use DjangoXBlockUserStateClient to implement UserStateCache 2015-05-20 15:33:29 -04:00
Calen Pennington
257660ed85 Move query-chunking into StudentModule and related ORM-objects 2015-05-20 15:33:29 -04:00