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

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alessandro
a299af9ec2 Minor refactoring 
TNL-925
 2015-05-26 00:04:49 +02: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
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
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
Alessandro
8efadaec52 Add timestamp on success step + refactoring 
TNL-925
 2015-05-22 17:11:29 +02:00
Alessandro
4c0bf1615e Add moment.js 
TNL-925
 2015-05-22 17:10:05 +02: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
Thomas Young
6aa1a84921 added jasmine tests for focusing on and scrolling to newly added textbook 2015-05-21 17:54:55 +02: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
E. Kolpakov
57738de2a0 Bumped xblock-utils version 2015-05-21 18:08:06 +03:00
Jesse Zoldak
85f9b5709a Merge pull request #7634 from edx/zoldak/paver-bok-choy-dir 
TE-883 Add ability to specify starting dir for bok-choy tests
 2015-05-21 10:46:16 -04:00
aamir-khan
be5a1a33eb ECOM-1472: js nitpick fixes 2015-05-21 18:53:33 +05:00
Jesse Zoldak
021e62111e Add ability to specify starting dir for bok-choy tests 2015-05-21 09:46:45 -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
aamir-khan
7395e8ab67 ECOM-1472: fixed the tab issue for taking photo 2015-05-21 16:44:09 +05:00
Marco Morales
292ad42c3b Merge pull request #8125 from edx/marco/studio/outline-styling-fix/licensing 
BUG - Fixes styling issue for course status label on outline page
 2015-05-20 18:04:50 -04:00
Christine Lytwynec
2f6cff5d69 Merge pull request #8128 from edx/clytwynec/fix_cyclic_import_in_pavelib 
Fix cyclic import in pavelib
 2015-05-20 16:51:10 -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
Ben Patterson
c1c15f3c9e Add jshint npm package. 2015-05-20 15:54:33 -04:00