Commit Graph

10813 Commits

Author SHA1 Message Date
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
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search
Feature/dashboard search
2015-04-27 09:46:35 -04:00
Will Daly
960ec06fb4 Merge pull request #7775 from edx/will/verification-logging
Add logging for verification and reverification.
2015-04-27 08:56:17 -04:00
Will Daly
643fc0e0b3 Add logging for verification and reverification.
Adds additional logging for the initial/re-verification flows.
This should make it easier to understand the behavior of
the production system and provide a way to identify issues early.
2015-04-27 08:04:41 -04:00
Chris
2465ceac3d Merge pull request #7765 from edx/clrux/UX-1632-due-icon-rtl-placement
RTL-ifying the due icon
2015-04-24 13:52:42 -04:00
David Ormsbee
e0122c0537 Merge pull request #7624 from mcgachey/mcgachey-courseware-flags
[LTI Provider] Adding options to suppress chrome for embedding courseware
2015-04-24 12:48:20 -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
Ned Batchelder
99fbc890f1 Merge pull request #7771 from jazkarta/mit-ccx-fix-dashboard
WIP: MIT CCX student dashboard display
2015-04-23 22:36:40 -04:00
cewing
870c30fde5 MIT CCX: Respond to PR feedback
Use the lazy module to create cached attributes

Ensure tests for localized date formatting are insulated from changes in default formatting

Other minor fixes
2015-04-23 15:59:58 -07:00
cewing
9250577f1f MIT CCX: Code Quality
refs https://openedx.atlassian.net/browse/TNL-2009
2015-04-23 15:59:58 -07:00
cewing
b34255fcdb MIT CCX: Fix display of CCXs on dashboard
repairs https://openedx.atlassian.net/browse/TNL-2007 and https://openedx.atlassian.net/browse/TNL-2009

Original Commit Messages:

Update ccx dashboard display to match new course display

Fix display of CCX dates on dashboard to use dates from the CCX instead of the related course.

The fix is implemented by providing date- and course-related APIs on the CCX object itself.  These APIs are mimicked from the same APIs available on a course descriptor.

bring the methods for printing start and end datetimes into line with course by adding UTC under the proper circumstances

add test coverage for new APIs defined on the CCX model

fix quality violation
2015-04-23 15:59:58 -07:00
Phil McGachey
6c1d997347 [LTI Provider] Create LTI Provider app, initial views and OAuth signature validation 2015-04-23 13:45:47 -04:00
zubair-arbi
05068f1b94 fix reverification link in lms
ECOM-1437
2015-04-23 17:58:33 +05: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
Andy Armstrong
4f5a2e1bc8 Fix default profile images for edx.org
TNL-2054
2015-04-22 16:33:00 -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
cahrens
6e47664cfd Merge branch 'release' 2015-04-22 12:27:52 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
Awais Jibran
8bd09d4057 Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
TNL-1921
2015-04-22 18:06:36 +05:00
Chris
4de7b8a4b1 Merge pull request #7766 from edx/clrux/UX-1634-sidebar-header-rtl
RTL-ifying the sidebar title in Handouts
2015-04-22 08:16:55 -04:00
Awais Qureshi
75d3759158 Merge pull request #7740 from edx/awais786/ECOM-1439-skip-icrv-model
ECOM-1439 adding new model and migration.
2015-04-22 12:19:28 +05:00
Clinton Blackburn
dc07943534 Merge pull request #7762 from edx/commerce-checkout-cancel
Added Payment Cancellation Page
2015-04-21 23:46:05 -04:00
Brian Talbot
ded6c4dbb0 fix: resolving edx.org and Open edX breakpoint clash
* simplifying edx.org breakpoints to use min-width
* creating -bp-* centric Sass variables
* converting all existing edx.org centric media queries to use new Sass variables

ECOM-1457
2015-04-21 16:44:32 -04:00
Clinton Blackburn
0f84749d4f Added Payment Cancellation Page
This commit creates a new page intended only for use when the user cancels payment. The previous implementation relied on the CyberSource callback page, which is not useful for orders placed with the E-Commerce Service.
2015-04-21 16:43:15 -04:00
Chris Rodriguez
f1d2231146 RTL-ifying the sidebar title in Handouts 2015-04-21 15:39:41 -04:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages.
TNL-1660
2015-04-21 19:42:50 +05:00
Muhammad Ammar
7babb3efed Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options
Add Simplified and Traditional Chinese as Transcript language options
2015-04-21 18:28:17 +05:00
Nimisha Asthagiri
c2a1870fb5 Clean ID of course_module for push notification channel name.
Update Mobile API to include channel_id for course.
2015-04-18 15:30:19 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Diana Huang
3f20a6f304 Add model change event tracking to UserProfile. 2015-04-17 17:23:18 -04:00
Andy Armstrong
8ff9fd84e4 Obey learner profile default visibility 2015-04-17 17:23:18 -04:00
muhammad-ammar
6b91ab4e2b Fixed gettext references.
TNL-1862
2015-04-17 17:23:18 -04:00
Usman Khalid
da57b13b6d Removed all references to AUTH_ENTRY_DASHBOARD.
TNL-2024
2015-04-17 17:23:17 -04:00
muzaffaryousaf
6502eaf755 DropDownFieldView should show empty option if model value is unset.
TNL-2022
2015-04-17 17:23:17 -04:00
muhammad-ammar
e50a641673 Accessibility changes for Account Settings and Learner Profile pages 2015-04-17 17:23:17 -04:00
muzaffaryousaf
f1657d1d4a Fixing the SaSS for RTL.
TNL-1759
2015-04-17 17:23:17 -04:00
muzaffaryousaf
c2d83bd4a6 Bok_choy tests for upload/remove profile image.
TNL-1538
2015-04-17 17:23:17 -04:00
muhammad-ammar
ca1f2f7768 Jasmine tests for upload/remove profile image on learner profile page.
TNL-1538
2015-04-17 17:23:17 -04:00
Usman Khalid
adf111e4d5 Adding functionlity to upload/remove profile image.
TNL-1538
2015-04-17 17:23:16 -04:00
muzaffaryousaf
9ac08ac59d Moving the country field to the required section of account setting page.
TNL-1856
2015-04-17 17:23:16 -04:00
Usman Khalid
bc05cd0ccd Resolving JS lint errors for account settings & learner profile page.
TNL-1855
2015-04-17 17:23:16 -04:00
Andy Armstrong
f03841a6bb Add client-side events for viewing pages
TNL-1504
2015-04-17 17:23:16 -04:00
Usman Khalid
e6c3644bd7 Quality fixes. 2015-04-17 17:23:15 -04:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar.
TNL-1516
2015-04-17 17:23:15 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page.
TNL-1535
2015-04-17 17:23:15 -04:00
muzaffaryousaf
a378995f85 If user is not above age limit, show restricted learner profile.
TNL-1658
2015-04-17 17:23:15 -04:00