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

5067 Commits

Author SHA1 Message Date
muzaffaryousaf
f5de0bbf43 Enable unit preview by default. 
TNL-1261
 2015-05-06 12:40:44 +05:00
zubair-arbi
7a1060cf56 Merge pull request #7849 from edx/zub/story/reverification-sevice-get-attempts-method 
add 'get_attempts' method for 'ReverificationService'
 2015-05-04 12:49:01 +05:00
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update 
Updated Receipt Page for Oscar
 2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
E. Kolpakov
6db974c8ee Fixes for course import-export: 
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
 2015-05-01 18:36:14 +03:00
Greg Price
c006befdaf Merge pull request #7767 from edx/gprice/discussion-api-topics 
Add discussion topic API
 2015-04-30 18:05:08 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Greg Price
ebff94af3f Add discussion topic API 
This is the first stage of the new Discussion API.

JIRA: MA-604
 2015-04-30 14:25:05 -04:00
Ned Batchelder
6fd60f21b5 Merge pull request #7358 from edx/ned/add_dunder_init_files 
Add missing __init__.py files
 2015-04-30 10:50:49 -04:00
Awais Qureshi
e465733778 Merge pull request #7811 from edx/awais786/ECOM-1284-re-generate-certs 
ECOM-1284  enabling re-generate certs.
 2015-04-30 18:46:12 +05:00
zubair-arbi
9edec96fb8 update django admin for 'verify_student' app 2015-04-30 18:02:24 +05:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
zubair-arbi
96d4a895f0 add 'get_attempts' method for 'ReverificationService' 2015-04-30 15:50:12 +05:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
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
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
zubair-arbi
da94aca522 add location_id field for the Reverification XBlock in VerificationStatus model 
ECOM-1477
 2015-04-29 18:41:30 +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
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
jsa
efde11d552 Use ecommerce api v2. 
XCOM-213 XCOM-214
 2015-04-27 16:57:17 -04:00
muzaffaryousaf
d0db373456 Fixing the micro-sites naming issues for profile page. 
TNL-2072
 2015-04-27 15:04:45 -04:00
Phil McGachey
31790ab415 [LTI Provider] Wiring up LTI views to the courseware template 2015-04-27 11:52:26 -04:00
Chris Dodge
1b39e4b93e Add an additional sentance (per customer) on how the survey information will be used 2015-04-27 10:24:47 -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
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
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05: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
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
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
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
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
Andy Armstrong
f03841a6bb Add client-side events for viewing pages 
TNL-1504
 2015-04-17 17:23:16 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page. 
TNL-1535
 2015-04-17 17:23:15 -04:00
muzaffaryousaf
67848ff67b Link to learner profile page from username in discussions. 
TNL-1503
 2015-04-17 17:23:15 -04:00