Commit Graph

2959 Commits

Author SHA1 Message Date
Peter Fogg
ebafdb1d03 TNL-1900 Implement teams header component 2015-06-04 11:01:18 -04:00
frances botsford
446e2aa7f3 Merge pull request #7859 from edx/frances/teams-ux
UX templates for Teams
2015-06-04 08:07:05 -04:00
chrisndodge
bfe7527686 Merge pull request #8292 from edx/muhhshoaib/SOL-916-invalidate-revalidate-registration-codes
SOL 916 invalidate revalidate registration codes
2015-06-03 16:24:38 -04:00
Frances Botsford
cf89f3a62f base teams space (template) and create team form 2015-06-03 14:51:28 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04:00
Chris Rodriguez
ffad558fb1 Centering text in sign in button vertically 2015-06-03 13:07:49 -04:00
Chris
801b77d100 Merge pull request #8269 from edx/clrux/UX-2260-social-login-button-hoverz
Removing background-image from button hovers
2015-06-03 12:47:07 -04:00
Chris
30c7f00a80 Merge pull request #8303 from edx/clrux/UX-2077-lms-footer-styles
Replacing top border on footer
2015-06-03 12:38:51 -04:00
Diana Huang
6534503c93 Add teams tab
TNL-1939
2015-06-03 09:10:44 -04:00
chrisndodge
11fef20101 Merge pull request #8165 from edx/muhhshoaib/SOL-236/make-manual-enrollments
SOL-236 Manual Enrollments
2015-06-02 16:31:32 -04:00
Jonathan Piacenti
f7862c1d9b Allow sharing of badges through the certificate web view. 2015-06-02 18:32:50 +00:00
Jonathan Piacenti
81877300cd Implement OpenBadge Generation upon Certificate generation through Badgr API 2015-06-02 18:32:50 +00:00
Muhammad Shoaib
65c4f1df89 SOL-236 Manual Enrollments 2015-06-02 13:19:32 -04:00
Chris Rodriguez
b8a5dc9dee Replacing top border on footer 2015-06-02 09:02:03 -04: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
Matt Drayer
af7277cdd9 New Feature: Certificates Web View
- SOL-465: Initial implementation of certificates web view and signatories (names/titles)

- SOL-718 Close button is working properly

- SOL-801 Backbone Signatories Modeling

- SOL-803 Underscore template: Editor (Add)

- SOL-802 Signatories: Underscore template - Details

- SOL-804 Signatories: Underscore template: Editor (Edit)

- Add signatory delete Django view

- SOL-805 Signatory editor (Delete)

- Add Coffeescript router

- SOL-716 Jasmine Tests

- Added missing minified JS library

- client side validation of signatory fields

- SOL-390 signatories names

- Remove obsolete extends Sass files

- input maxlength limiting for signatory information

- SOL-389: Course title override

- SOL-466: Add capability to upload digitized signatures in Studio

- ziafazal: fixed css for upload signature image

- ziafazal: completed deletion of signature images

- UX-1741: Add initial static rendering/styling for Open edX web certs
  * creating new global static dir
  * adding static version of edX UX pattern library assets
  * adding web certificates static assets
  * adding static (+abstracted) web certificates rendering
  * creating two tiers of rendering (base + distinguished)
  * providing sample assets for certificate rendering
  * supporting RTL layouts
  * adding certifcates assests to edX static asset pipeline
  * temporarily hiding the mozilla open badges share action
  * wiring print button to print view/page
  * fixup! addressing conflict artifact in valid cert template
  * fixup! adding missing %hd-subsection sass extend + components comment clean up
  * fixup! correcting pattern library .hd-4 font-weight value

- SOL-468 Linked Student View for Web View Credential

- SOL-467: Add capability to upload organization logos for certificates

- SOL-391 / SOL-387: Signatory related info (assets) in certificates web view

- kelketek: Fixes for static asset collection in certificate HTML view.

- SOL-398 Web View: Public Access

- mattdrayer: Post-merge branch stabilization

- catong: Initial changes to Studio template and Help config file

- ziafazal: Branch stabilizations

- SOL-387: Display organization logo on LMS web view

- talbs/mattdrayer: Branch Stabilizations

- talbs: converting backpack action to use a button HTML element

- talbs: revising placeholder assets + their rendering in cert view

- mattdrayer: Username web view wireup

- SOL-386 Certificate Mode Previews

- SOL-905: Make organization logo and signatory signature uneditable

- SOL-922: Improve test coverage

- SOL-765: Add LinkedIn sharing

- [marco] temporary styling adjustment to account for smaller linkedin share image / fake button

- SOL-921: Address hardcoded template items

- SOL-927: Deleting certificate should delete org logo image also
  * updated invalid template
  * removed hr
  * fix invalid certificate error

- clrux: Add i18n to certificate templates and partials

- mattdrayer: Pylint violations

- SOL-920 Certificate Activation/Deactivation

- mattdrayer: Added LMS support

- SOL-932: Fix preview mode support in certificate view

- SOL-934: Fixed bug reported and broken tests

- SOL-935 removed the 'valid' word from web view title

- talbs: RTL support updates/fixes
  * revising certificate type icon/name vertical alignment
  * removing unused older certificate template
  * revising styling for message/banner actions
  * abstracting accomplishment type to use course mode + adding in honor/verified-specific placeholders

- mattdrayer: JSHint violations
2015-06-01 19:48:04 -04: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
Ben McMorran
f425027134 Merge pull request #8048 from edx/benmcmorran/search-tags
Enable HTML in note tags and support highlighting
2015-06-01 09:37:23 -04:00
marjev
3fe8768d93 (SOL-883) RTL support for Registration Code redemption page 2015-06-01 13:59:33 +02:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Chris Rodriguez
4e4c68f5b1 Removing background-image from button hovers 2015-05-29 10:33:28 -04:00
AlasdairSwan
cc93dcab32 Merge pull request #8247 from edx/alasdair/ECOM-1547-footer-v3-style-update
ECOM-1339 minor CSS tweaks for the footer. It now extends the full wi…
2015-05-29 09:10:30 -04:00
dino-cikatic
0d975674c2 Merge pull request #8186 from edx/dcikatic/SOL-839
SOL-839 label cursor and receipt internationalization
2015-05-29 14:43:22 +02:00
Dino Cikatic
077ea49b58 SOL-839 confirmation and receipt page internationalization 2015-05-29 13:49:19 +02:00
Ahsan Ulhaq
361d82adbb Merge pull request #8021 from edx/ahsan/AC-107-calculator-incompatible-aria-role-attribute
calculator incompatible aria role attribute
2015-05-29 02:11:37 -04:00
AlasdairSwan
0c7abfbe72 ECOM-1339 minor CSS tweaks for the footer. It now extends the full width of the browser and fixes issues with link hover states. 2015-05-28 15:16:03 -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
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
9044e48cad Calculator a11y issues
AC-107
2015-05-28 13:23:22 +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
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
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
Frances Botsford
883e9061b2 fix verification widget layout on dashboard 2015-05-26 13:00:41 -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
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
marjev
f5b166f120 (SOL-837) Added RTL support to payment page 2015-05-22 16:42:01 +02: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
Sarina Canelake
1775dd5365 Merge pull request #7315 from edx/db/creative-commons
Allow custom licensing for course content
2015-05-18 15:36:50 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -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
Brian Talbot
11ca11a411 Merge pull request #8035 from edx/talbs/sass+css-file-names
LMS/Studio: Sync Up Sass/CSS/Pipeline Names
2015-05-18 10:43:17 -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