Commit Graph

2900 Commits

Author SHA1 Message Date
Christina Roberts
161d89a723 Merge pull request #8045 from edx/clrux/new-extend-for-outline
Moving no-outline use to be more global
2015-05-14 12:54:43 -04:00
Christina Roberts
3f2c370d58 Merge pull request #7923 from edx/christina/show-notes
Tags Tab in Student Notes
2015-05-14 12:30:38 -04:00
Brian Talbot
4f9c50e226 Merge pull request #8047 from edx/talbs/fix-lms-dupe-sass-base
LMS: removing redundant Sass base/base partial call in build compile
2015-05-14 12:30:12 -04:00
David Baumgold
930b4f6a7a Remove outdated comment referencing IE9 rule limit 2015-05-14 11:56:14 -04:00
Chris Rodriguez
d5d7fbf786 Moving no-outline use to be more global 2015-05-14 11:48:37 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes.
TNL-1926
2015-05-14 11:36:48 -04:00
Brian Talbot
8ad01535b5 LMS: removing redundant Sass base/base partial call in build compile 2015-05-14 10:47:05 -04:00
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor
Implement the Weighted Problem Grade Report
2015-05-13 09:10:02 -04:00
Brian Talbot
220b8d1cdb LMS: removing conditional search Sass logic + simplifying _build-*.scss files 2015-05-12 22:13:31 -04:00
Brian Talbot
24673aa128 LMS: moving shared/redundant Sass partial calls to _build-*.scss partials 2015-05-12 22:03:43 -04:00
Daniel Friedman
84f3c33df7 Address doc review 2015-05-12 16:32:01 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics
TNL-1988
2015-05-12 16:32:01 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Brian Talbot
898012518b LMS: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Chris Rodriguez
709f86c11b Addressing RTL inconsistencies on Verification process 2015-05-12 07:20:32 -04:00
Clinton Blackburn
6577bb3bd6 Merge pull request #7950 from edx/clintonb/update-verify-now
Updated Take Photo page to include verification requirements
2015-05-07 22:46:28 -04:00
Clinton Blackburn
fc61c292b9 Updated Take Photo page to include verification requirements
As part of the unification of verify later/now, the take photo page needs to list the verification requirements.

XCOM-254
2015-05-07 18:14:33 -04:00
Martyn James
2f398559ae Merge pull request #7845 from edx/mjevtic/SOL-776
(SOL-776)(SOL-740)(SOL-532) Prerequisites for course discovery feature
2015-05-07 14:05:38 -04: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
Clinton Blackburn
19d0eda60c Merge pull request #7952 from edx/clintonb/paypal-receipt
Hiding Billing Address for Orders without Billing Addresses
2015-05-07 08:07:09 -04:00
marjev
8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; 2015-05-07 08:57:04 +02:00
zubair-arbi
ede1c70ed8 Merge pull request #7944 from edx/zub/bugfix/ecom-1470-photo-verification-heading
change photo reverification page heading from h3 to h1
2015-05-07 11:52:54 +05: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
zubair-arbi
b393f167fe change photo reverification page heading from h3 to h1
ECOM-1470
2015-05-06 17:47:00 +05:00
Muzaffar yousaf
77d445c962 Merge pull request #7787 from edx/muzaffar/tnl2051-profile-image-hover
Adding hover state to image profile for accessibility.
2015-05-06 14:11:04 +05:00
Marco Morales
6426e28846 Merge pull request #7591 from jolyonb/jbloomfield/printing-links
Print CSS: Fixing Links
2015-05-05 13:35:25 -04:00
muzaffaryousaf
0d2e2660e2 Adding hover state to image profile for accessibility.
TNL-2051
2015-05-05 21:01:47 +05:00
Jolyon Bloomfield
bf4a1d47a9 Fixing page size print CSS (rebase commit). 2015-05-05 11:45:56 -04:00
Jolyon Bloomfield
d4a5bf7490 Fixing links in print media (combined commit for rebase). 2015-05-05 11:39:37 -04: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
Will Daly
f6e8ce24af Merge pull request #7879 from edx/will/restore-remember-me
Add remember me checkbox back to the combined login/registration page
2015-05-01 09:57:45 -04:00
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -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
muzaffaryousaf
d0db373456 Fixing the micro-sites naming issues for profile page.
TNL-2072
2015-04-27 15:04:45 -04:00
muzaffaryousaf
9e06290b95 Fixing the micro-sites naming issues for account settings page.
TNL-2071
2015-04-27 12:13:40 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search
Feature/dashboard search
2015-04-27 09:46:35 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
Chris Rodriguez
dda656aeea RTL-ifying the due icon 2015-04-24 08:42:33 -04:00
Awais Jibran
0b66dc4b42 Merge pull request #7718 from edx/aj/tnl1921-forgot-password-model-not-showing
Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
2015-04-23 16:53:06 +05:00
Aamir
a900e1f7ec Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name-field
Aamir khan/ecom 1396/checkoint name field
2015-04-23 12:06:09 +05:00
Diana Huang
2f3ff43e3f Merge pull request #7786 from edx/release
Merge release back into master
2015-04-22 17:51:34 -04:00
Usman Khalid
e82735f79d Change image upload input name and not make duplicate of file in data.
TNL-2052
2015-04-22 14:33:30 -04:00