Commit Graph

441 Commits

Author SHA1 Message Date
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
2015-06-16 16:19:33 +05:00
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component
Create a common paginated list view
2015-06-15 14:55:20 -04:00
Andy Armstrong
1689004189 Create a common paginated list view
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
2015-06-15 13:51:09 -04:00
Renzo Lucioni
3de0af1616 Merge pull request #8498 from edx/release
Release
2015-06-12 11:09:16 -04:00
Renzo Lucioni
41c5916408 Payment button UI modifications
Includes button copy revision and a styling tweak to make the selected payment button appear active while disabled.
2015-06-11 13:43:38 -04:00
jsa
e1dfdc0811 Receipt page now also handles Cybersource payment failures.
XCOM-398
2015-06-11 13:42:58 -04:00
Will Daly
5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup
Remove unused code left over from ECOM-188.
2015-06-10 14:44:51 -04:00
Renzo Lucioni
0349090815 Merge pull request #8456 from edx/renzo/payment-button-ui
Payment button UI modifications
2015-06-10 14:04:59 -04:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Renzo Lucioni
d6c0460483 Payment button UI modifications
Includes button copy revision and a styling tweak to make the selected payment button appear active while disabled.
2015-06-10 11:28:51 -04:00
Carlos de la Guardia
85111ceb5a Add jasmine tests for ccx schedule code. 2015-06-09 16:31:57 -05:00
Peter Fogg
17d3906c86 TNL-1891 Browse Teams: Category Subnavigation
Introduces a tabbed view component which displays its subviews and
handles Backbone navigation between each tab. This is used to implement
the "My Teams" and "Browse" areas of the Teams tab. Right now the
content of both tabs is stubbed out with a placeholder view which should
be replaced by TNL-1893 and TNL-1892.
2015-06-08 15:05:11 -04:00
Peter Fogg
ebafdb1d03 TNL-1900 Implement teams header component 2015-06-04 11:01:18 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04:00
Diana Huang
6534503c93 Add teams tab
TNL-1939
2015-06-03 09:10:44 -04:00
Jonathan Piacenti
f7862c1d9b Allow sharing of badges through the certificate web view. 2015-06-02 18:32:50 +00:00
Ahsan Ulhaq
689b9c2d8e No indication the photo was taken
No indication that photo is captured on verify photo page

ECOM-1473
2015-06-02 12:41:51 +05:00
zubair-arbi
c6439b53d0 Merge pull request #8231 from edx/zub/story/ecom-1612-change-icrv-block-fields
use reverification xblock location as an identifier of reverification…
2015-06-01 20:41:47 +05:00
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint
ECOM-1612
2015-06-01 19:33:04 +05:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02: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
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
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
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
aamir-khan
1323a8e2e8 ECOM-1472: js nitpick fixes 2015-05-22 11:44:24 +05: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
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
AlasdairSwan
f81d88e394 ECOM-1547 created new template and Sass file for new footer. Wrapped it in a feature flag and updated previously named footer-edx-new.html to footer-edx-v2.html to better track/name updates to the footer going forward.
ECOM-1547 removed data-updated attributes from body
ECOM-1548 added JS file that inits analytics event listener and makes ajax call to API to get footer and HTML and add it to the DOM
ECOM-1547 code review cleanup
ECOM-1547 rebase and Sass appraoch update after @talbs the IE9 killer slayed the mighty beast.
ECOM-1547 updated file names and added comments in light of @talbs review of PR
ECOM-1547 update to social media link styles and nav link order
ECOM-1547 updated SOCIAL_MEDIA_FOOTER_NAMES if ENABLE_FOOTER_V3 is true
ECOM-1547 added translations to screenreader text
ECOM-1547 fixed test and renamed files in line with @talbs's pending PR
ECOM-1547 cleaned up file naming
2015-05-18 13:43:07 -04:00
Awais Qureshi
41363ead93 Merge pull request #8020 from edx/aamir-khan/ECOM-1471-hidden-text-behind-cam-issue
ECOM-1471 Hiding the text.
2015-05-18 11:40:10 +05:00
muzaffaryousaf
378cf9bb7a Sending preferences and accounts data to template.
Fixing the pencil icon issue.

TNL-2047
2015-05-15 17:06:04 +05:00
muzaffaryousaf
2d08d669ca Learner Profile page tweaks.
TNL-2047
2015-05-15 17:06:02 +05:00
cahrens
abd25b8b45 Add a "tags" view in student notes.
TNL-1926
2015-05-14 11:36:48 -04:00
Awais
f31746e76c ECOM-1471 Hiding the text. 2015-05-13 13:44:55 +05:00
Jim Abramson
56d380c812 Merge pull request #7954 from edx/jsa/xcom-270
add custom PayPal payment button and js tests for buttons.
2015-05-07 08:15:34 -04:00
jsa
a5c9d0b0f3 add custom PayPal payment button and js tests for buttons.
XCOM-270
2015-05-06 19:01:56 -04:00
Clinton Blackburn
7c75b34baf Hiding Billing Address for Orders without Billing Addresses
Some orders, specifically those paid for with PayPal, do not have a billing address. This information will not be rendered in such cases.
2015-05-06 15:43:44 -04:00
muzaffaryousaf
0d2e2660e2 Adding hover state to image profile for accessibility.
TNL-2051
2015-05-05 21:01:47 +05:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging
Add tags plugin.
2015-05-04 20:56:52 -04:00
cahrens
8e636677ff Display tags in note template. 2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b Add tags plugin.
TNL-1924
2015-05-04 16:00:18 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release
Release (DO NOT MERGE)
2015-04-30 16:24:47 -04:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets
use commerce api v2.
2015-04-27 22:30:37 -04:00
jsa
efde11d552 Use ecommerce api v2.
XCOM-213 XCOM-214
2015-04-27 16:57:17 -04:00
Andy Armstrong
001da52af6 Address Sylvia's doc feedback 2015-04-27 16:13:25 -04:00