Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,921 Commits 1 Branch 0 Tags
372e52bf08dade77f4e376aec1872eab08051e57
Commit Graph

10832 Commits

Author SHA1 Message Date
zubair-arbi
4d9781aaa7 Merge pull request #7813 from edx/zub/story/ecom-1477-verfication-model-add-itemid 
add location_id field for the Reverification XBlock in VerificationStatu...
 2015-04-30 11:27:22 +05:00
Will Daly
50e9b43512 Merge pull request #7826 from edx/will/update-reverification-flow-copy 
Update copy on reverification flow.
 2015-04-29 10:38:54 -04:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render 
[LTI Provider] Wiring up LTI views to the courseware template
 2015-04-29 10:34:09 -04:00
Sarina Canelake
cd9ce147d0 Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date 
Fixed cross icon issue on set date dialog inside schedule tab
 2015-04-29 09:47:33 -04:00
zubair-arbi
da94aca522 add location_id field for the Reverification XBlock in VerificationStatus model 
ECOM-1477
 2015-04-29 18:41:30 +05:00
amir-qayyum-arbisoft
3e5e6065e4 fixed cross icon issue on set date dialog inside schedule tab 2015-04-29 15:28:21 +05:00
Aamir
dc308d4f28 Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods 
ECOM-1441 additional methods for skip re-verification links.
 2015-04-29 14:13:10 +05:00
Awais
860467e7d2 ECOM-1441 additional methods for skip re-verification links. 2015-04-29 12:17:15 +05:00
Chris
d9e13d22b8 Merge pull request #7763 from edx/clrux/sequence-nav-button-icons 
Changing sequence nav buttons from images to icon fonts
 2015-04-28 14:05:38 -04:00
Chris Rodriguez
74ce5cbb87 Changing sequence nav buttons from images to icon fonts 2015-04-28 11:04:16 -04:00
Phil McGachey
854c9637f1 [LTI Provider] Addressing review comments 2015-04-28 10:35:44 -04:00
Sarina Canelake
b2d9d339d1 Docstrings for mailchimp scripts 2015-04-28 10:23:10 -04:00
Sarina Canelake
2d3dab9936 Remove 'batches' function, since == to 'chunk' 2015-04-28 10:23:10 -04:00
Sarina Canelake
f93073401c Quality fixups for Mailchimp scripts 2015-04-28 10:23:09 -04:00
Feanil Patel
d71433e223 Address comments. 2015-04-28 10:23:09 -04:00
Feanil Patel
934207bf03 Fixes to get it working with master. 2015-04-28 10:23:08 -04:00
Feanil Patel
5c0adf04ad Move mailchimp to a newer version of the edxapp. 2015-04-28 10:23:08 -04:00
Will Daly
d9ed2c024b Update copy on reverifcation flow. 
* Remove course ID and checkpoint name debugging information.
* Update page title.
 2015-04-28 08:10:24 -04: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
Phil McGachey
31790ab415 [LTI Provider] Wiring up LTI views to the courseware template 2015-04-27 11:52:26 -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