Commit Graph

30426 Commits

Author SHA1 Message Date
Dino Cikatic
077ea49b58 SOL-839 confirmation and receipt page internationalization 2015-05-29 13:49:19 +02: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
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
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
Daniel Friedman
019da46c60 Merge pull request #8194 from edx/hotfix/2015-05-26
Escape JSON for User Profile
2015-05-26 14:08:05 -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
Jesse Zoldak
73b70cbf3b Merge pull request #8156 from edx/clytwynec/axs_testing
add explicit accessibility test
2015-05-26 13:08:33 -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
Christine Lytwynec
df758d7917 Add an explicit accessibility test TE-890 2015-05-26 11:55:27 -04:00
Sarina Canelake
947354fb89 Merge pull request #8191 from edx/sarina/20150526-update-translations
Update translations (autogenerated message)
2015-05-26 11:49:30 -04:00
Sarina Canelake
b91bc1a201 Update translations (autogenerated message) 2015-05-26 11:48:51 -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
Sarina Canelake
1c913c1ec5 Merge pull request #8171 from edx/db/cc-css-on-rtl
Load creative-commons icon CSS on RTL pages
2015-05-26 09:14:14 -04:00
Bertrand Marron
e8bf151f3d Fix documentation comment for enrollment API 2015-05-25 16:56:25 +02: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
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
Ben Patterson
c2a0777f78 Merge pull request #8138 from edx/benp/add-jshint
Benp/add jshint
2015-05-22 17:54:55 -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
Ben Patterson
aebb35d361 Use jshint in paver, include in builds.
JShint will be executed with paver run_jshint, which will use a defined set of
directories (likewise defined are directories to ignore). A limit can be imposed
on the total number of violations. Note that this change does NOT include adding
jshint to diff-quality or `paver run_quality`.
2015-05-22 16:06:13 -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
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
Sarina Canelake
c914400c1d Merge pull request #8158 from gymnasium/gymnasium/fix-invalid-selector
fixed invalid CSS selectors
2015-05-22 11:53: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
Mike Bifulco
1dcce2c49d fixed invalid CSS selectors
The surplus ":" in the input selector causes jquery versions past 1.9 to throw an error.
2015-05-22 14:56:42 +00: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
Sarina Canelake
b0b6967a43 Merge pull request #8148 from edx/xblock-utils-has-update
Bumped xblock-utils version
2015-05-22 09:05:57 -04:00
Sarina Canelake
eed3375234 Merge pull request #8159 from edx/sarina/enable-licensing-devstack
Fully enable licensing on devstack
2015-05-22 08:46:30 -04: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
Sven Marnach
4c5215b0a9 Merge pull request #8163 from open-craft/smarnach/problem-builder-hash
Update commit hash for problem-builder.
2015-05-22 11:16:28 +02:00
Sven Marnach
0ce1da157a Update commit hash for problem-builder. 2015-05-22 10:38:54 +02: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
Sarina Canelake
7d96174f6b Fully enable licensing on devstack 2015-05-21 18:50:47 -04:00
Daniel Friedman
d406da873e Merge pull request #8160 from edx/dan-f/expose-edxnotes-interface-setting
Expose `EDXNOTES_INTERFACE` from configuration
2015-05-21 20:57:25 +00:00
Daniel Friedman
f97658a437 Expose EDXNOTES_INTERFACE from configuration 2015-05-21 15:47:48 -04:00
Awais Qureshi
20b253561a Merge pull request #8144 from edx/awais786/ECOM-1600-gen-cert-btn-bug
ECOM-1600 fixing certs button issue.
2015-05-22 00:06:55 +05: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