Commit Graph

11358 Commits

Author SHA1 Message Date
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
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
Ahsan Ulhaq
0a43ebf191 Merge pull request #8113 from edx/ahsan/ECOM-1302-Continue-Payment-button-not-accessible
Continue to Payment button is not accessible
2015-05-27 02:02:36 -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
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
frances botsford
c8c83b5c69 Merge pull request #8193 from edx/frances/fix/dashboard-verified-status
fix verification widget layout on dashboard
2015-05-26 14:16:44 -04:00
Jesse Zoldak
e424ce8a1d Merge pull request #8196 from edx/release
Merge hotfix from release to master
2015-05-26 14:15:09 -04:00
Marco Morales
dc04f08e10 Merge pull request #7731 from edx/marco/styling/dashboard-modal
Updated shadow styling for Dashboard modal
2015-05-26 13:29:10 -04:00
Daniel Friedman
09e1f9ed71 Fix XSS vulnerability in User Profile.
TNL-2248
2015-05-26 13:17:54 -04:00
Frances Botsford
883e9061b2 fix verification widget layout on dashboard 2015-05-26 13:00:41 -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
Ben Patterson
1e47f85359 Merge pull request #8172 from edx/benp/revert-pycontracts-enablement
Revert "Enable PyContracts during tests"
2015-05-26 09:34:05 -04:00
Ahsan Ulhaq
1d5a310f5d Continue to Payment button is not accessible
When a user starts the payment/verification flow.
Tab navigation skips past the "Continue to Payment" button

ECOM-1302
2015-05-25 19:21:03 +05: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
David Baumgold
cb7068e5b4 Load creative-commons icon CSS on RTL pages 2015-05-22 14:48:26 -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
Aamir
c48dccce5c Merge pull request #8064 from edx/aamir-khan/ECOM-1472-take-photo-keyboard-issue
ECOM-1472: fixed the tab issue for taking photo
2015-05-22 15:27:22 +05:00
aamir-khan
1323a8e2e8 ECOM-1472: js nitpick fixes 2015-05-22 11:44:24 +05: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
Daniel Friedman
f97658a437 Expose EDXNOTES_INTERFACE from configuration 2015-05-21 15:47:48 -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
aamir-khan
be5a1a33eb ECOM-1472: js nitpick fixes 2015-05-21 18:53:33 +05:00
aamir-khan
7395e8ab67 ECOM-1472: fixed the tab issue for taking photo 2015-05-21 16:44:09 +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
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
Calen Pennington
cacdbc35d7 Remove the ability to select_for_updates from FieldDataCache.
The only consumer of that functionality (the XQueue callback) already
does retries, so newly introduce integrity errors (due to multiple
commiters trying to update a StudentModule) won't break the XQueue
processing pipeline.
2015-05-20 15:07:29 -04:00
Calen Pennington
e6db0af1f1 Use current OpaqueKeys methods when loading a block for the XQueue callback 2015-05-20 15:07:29 -04:00