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

9975 Commits

Author SHA1 Message Date
Ben Patterson
cdca3fcbc2 Merge pull request #6208 from edx/clintonb/release-fix 
Corrected Import Statement
 2014-12-09 21:29:46 -05:00
Ben Patterson
6e1471edc4 Fix import statement. 2014-12-09 21:20:00 -05:00
Nimisha Asthagiri
c6f991fc8f Merge pull request #6172 from edx/mobile/update-analytics 
MA-157 Move context back into properties.
 2014-12-09 20:25:06 -05:00
Clinton Blackburn
947064f6ab Corrected Import Statement 2014-12-09 20:19:00 -05:00
Nimisha Asthagiri
a6003991a5 MA-157 Mobile analytics end-to-end. 
Move app-generated context back into properties.
Ignore BI events through segment's webhook.
Ignore events without Data in Properties.
 2014-12-09 18:44:06 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
John Eskew
2c09c5674a Fix assert. 
Assert mistakenly had comma instead of double-equal - now correct.
 2014-12-09 15:57:56 -05:00
John Eskew
755241f5eb Upon fail-over check, change asset metadata document to new format. 2014-12-09 11:24:30 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164 
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
 2014-12-09 09:25:46 -05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
Clinton Blackburn
97bc506b45 Merge pull request #6179 from edx/sanchez/email_optin_third_party 
3rd-party pipeline supports updating email optin
 2014-12-08 14:56:30 -05:00
Clinton Blackburn
71bc536c6d Merge pull request #6183 from edx/renzo/email-opt-in-copy 
Improved support for multiple organization names
 2014-12-08 14:55:06 -05:00
stephensanchez
7ab0cb0730 3rd-party pipeline supports updating email optin 
Fix all the 3rd party auth scenarios.

Update pipeline to preserve parameters.

Updating tests
 2014-12-08 19:52:06 +00:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Adam Palay
27c710b85d don't export draft children of orphaned drafted (TNL-923) 2014-12-08 14:14:38 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names 
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
 2014-12-08 14:10:09 -05:00
Ben Patterson
89397d00f9 Revert "Jarv/config refactor wip" 2014-12-08 13:40:49 -05:00
John Jarvis
cc6111181d Merge pull request #6096 from edx/jarv/config-refactor-wip 
Jarv/config refactor wip
 2014-12-08 13:19:29 -05:00
John Eskew
72dbeb7fc3 Merge pull request #6166 from edx/jeskew/modulestore_asset_md_format_changes 
Make changes to the Mongo modulestore format for asset metadata.

https://openedx.atlassian.net/browse/PLAT-301
 2014-12-08 11:34:25 -05:00
Will Daly
1511851abf Merge pull request #6170 from edx/will/old-login-register-email-opt-in 
Add email opt in to old login and register pages
 2014-12-08 11:15:01 -05:00
Waqas Khalid
c88a017dea Merge pull request #5244 from mlkwaqas/waqas/tnl152-stop-voting-on-closed-thread 
Don't allow voting while the thread is closed
 2014-12-08 20:15:33 +05:00
Will Daly
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Adam
896b191503 Merge pull request #6161 from edx/adam/fix-openended-draft-export 
fix export for openassessment drafts (PLAT-249)
 2014-12-08 09:25:09 -05:00
Xavier Antoviaque
f561e79a3e Merge pull request #6033 from edx-solutions/content-libraries 
Modulestore Support for Content libraries (Part of SOL-1, SOL-2, SOL-3)
 2014-12-08 10:31:15 +01:00
John Eskew
05ec8989de Make changes to the Mongo modulestore format for asset metadata. 
Move the asset types under a top-level 'assets' dict to allow for
future arbitrary asset types.
Change 'basename' to 'pathname', since the attr is for storing the path.
 2014-12-07 16:33:05 -05:00
Adam Palay
bd6897894c fix export for openassessment drafts (PLAT-249) 2014-12-05 15:19:51 -05:00
John Jarvis
c711ed5091 moving the convert_tokens function to a common file 2014-12-05 14:00:25 -05:00
Will Daly
1c6d197bd0 Merge pull request #6156 from edx/will/revert-logistration-enablement 
Revert enable login/registration
 2014-12-05 13:06:44 -05:00
Don Mitchell
3e1e4a4b25 Merge pull request #6123 from mitocw/bdero/move-course-role-check-to-student 
Moved has_course_access from CMS to student.auth (common)
 2014-12-05 11:35:16 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page." 
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
 2014-12-05 10:41:42 -05:00
Andy Armstrong
eced849db0 Add group_access field to all xblocks 
TNL-670
 2014-12-05 09:55:00 -05:00
jsa
f24f01d217 Add support for user partitioning based on cohort. 
JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
 2014-12-05 09:53:44 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
Sarina Canelake
699b3d08f0 Merge pull request #6065 from stvstnfrd/debt/xml-cleanup 
Remove antiquated cleanup script
 2014-12-05 09:24:37 -05:00
Waqas Khalid
1efa1b3169 Don't allow voting while the thread is closed 
When someone closes thread there is still option
to add vote which cause error when click on add
vote button. User shouldn't be able to add vote
while the thread is closed.

TNL-152
 2014-12-05 15:59:07 +05:00
Renzo Lucioni
b97400eb07 Merge pull request #6137 from edx/renzo/missing-checkbox-absent-preference 
Refrain from setting email opt-in preference when checkbox is missing
 2014-12-05 01:11:02 -05:00
Renzo Lucioni
a22f120a18 Merge pull request #6133 from edx/renzo/track-email-opt-in 
Add BI events for tracking email opt-ins
 2014-12-04 17:37:48 -05:00
Renzo Lucioni
5e41a34dd1 Refrain from setting email opt-in preference when checkbox is missing 2014-12-04 17:35:19 -05:00
christopher lee
212598e649 Merge branch 'release' 
Conflicts:
	lms/djangoapps/mobile_api/course_info/tests.py
 2014-12-04 16:39:37 -05:00
Renzo Lucioni
5e80389b33 Add BI events for tracking email opt-ins 2014-12-04 16:06:28 -05:00
Stephen Sanchez
db9bb20c25 Merge pull request #6138 from edx/sanchez/fix_register_email_opt_in 
Allowing email optin to work on register.
 2014-12-04 14:08:57 -05:00
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups 
Cdodge/shopping cart touchups
 2014-12-04 14:02:19 -05:00
Will Daly
3c5da9d3ea Merge pull request #6077 from edx/will/enable-logistration 
Login/Registration A/B test cleanup
 2014-12-04 11:47:20 -05:00
stephensanchez
7c78a0999a Code review comments 2014-12-04 16:16:32 +00:00
Braden MacDonald
0ded669909 Split mongo support for libraries and Library XBlock 2014-12-04 21:39:10 +07:00
Will Daly
988753395f Add support for external auth on the combined login/registration page 
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
 2014-12-04 09:34:51 -05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00
stephensanchez
79ca56c3db Allowing email optin to work on register. 2014-12-03 22:47:40 +00:00
Akiva Leffert
66f41e1d9f Make static URLs absolute in handouts, updates, and about for mobile API 
JIRA: MA-147
 2014-12-03 16:25:48 -05:00
christopher lee
b89113e114 Revert "Make static URLs absolute in handouts, updates, and about for mobile API" 
This reverts commit fb6579abfdb6fc9fb8bc9233554ff5c6e9215659.
 2014-12-03 16:24:27 -05:00