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

10849 Commits

Author SHA1 Message Date
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
Ahsan Ulhaq
1e5cbbefe1 Merge pull request #7844 from edx/ahsan/AC-97-aria-describedby-broken-id-ref-sign-in-page 
aria-describedby has broken IDref on Sign in email form
 2015-04-30 11:04:49 -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
Ahsan Ulhaq
6d451ccd47 change three line structure to one line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
3ec676e61b change indentaion and add new line 2015-04-30 18:13:27 +05:00
Ahsan Ulhaq
734ce5e2fb aria-describedby has broken IDref on Sign in email form 
AC-97
 2015-04-30 18:13:27 +05:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04: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
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
Andy Armstrong
001da52af6 Address Sylvia's doc feedback 2015-04-27 16:13:25 -04:00
Andy Armstrong
f439a09e71 Obey microsite configuration for default profile image 
TNL-2073
 2015-04-27 15:04:51 -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
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
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