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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
dc6926bb2d Update translations (autogenerated message) 2014-12-08 08:56:07 -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
Sarina Canelake
d2b4a6ea5b Merge pull request #5874 from stvstnfrd/up/course/about 
Create helper function to remove duplicate code
 2014-12-05 16:07:18 -05:00
Adam Palay
bd6897894c fix export for openassessment drafts (PLAT-249) 2014-12-05 15:19:51 -05:00
Chris
50152abb09 Merge pull request #5966 from Stanford-Online/kluo/help-modal-id 
Fix help modal css selector
 2014-12-05 14:45:07 -05:00
stv
04b97a3ae1 Create helper function to remove duplicate code 
This repetitive code is especially pronounced in Stanford's fork, where
we have extended the About page to include several additional fields.

This pays down some technical debt by refactoring into a shared helper.
 2014-12-05 11:13:59 -08: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
jsa
de6ca4a7a7 avoid errors when forward-migrating course_groups after south conversion 
JIRA: TNL-937
 2014-12-05 12:33:05 -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
Carson Gee
189284ace6 Pin django-cas to hash 
Move to github.txt and make editable
 2014-12-05 09:25:12 -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
Chris
c45e34bf2e Merge pull request #5842 from Stanford-Online/giulio/prerequisites-style-fixes 
Remove extra prerequisites style and class
 2014-12-05 09:03:14 -05:00
Ben Patterson
f73d92bff3 Merge pull request #6064 from Stanford-Online/kluo/quality-compare-branch-option 
Add compare-branch option to paver run_quality
 2014-12-05 07:30:16 -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
Waheed Ahmed
281be28fc3 Merge pull request #6143 from edx/waheed/tnl890-fix-plus-sign-overall-grade-range 
Fixed plus sign icon for overall grade range add button.
 2014-12-05 13:48:14 +05:00
Waheed Ahmed
2bea9b4b65 Fixed plus sign icon for overall grade range add button. 
TNL-890
 2014-12-05 12:16:11 +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
Brian Talbot
d4154a4bc8 Merge pull request #6149 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: Calculator Toggle Label Display
 2014-12-04 19:47:44 -05:00
Kevin Luo
2262906e0b Add compare-branch option to paver run_quality 2014-12-04 15:13:04 -08:00
John Jarvis
de98bf8fac renaming to use underscores 2014-12-04 18:01:34 -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
Giulio Gratta
54b7a578a2 Remove extra prerequisites style and add classes 2014-12-04 14:25:26 -08:00
John Jarvis
a32f337326 renmaing prod.py and setting more defaults 2014-12-04 16:43:17 -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
christopher lee
526fdf0108 Merge branch 'release' 2014-12-04 16:23:00 -05:00
Christopher Lee
e8ffbb1590 Merge pull request #6134 from edx/hotfix/2014-12-03 
Make static URLs absolute in handouts, updates, and about for mobile API
 2014-12-04 16:16:36 -05:00
Brian Talbot
93c33cdfd8 LMS: fix - visually hiding calculator toggle label 2014-12-04 16:15:46 -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
srpearce
f2e20f333e Merge pull request #5998 from edx/sylvia/docs/1162 
Sylvia/docs/1162
 2014-12-04 12:19:39 -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
Will Daly
27e5c17ef9 Merge pull request #6145 from edx/will/fix-mktg-iframe-redirect 
Fix issue with iframe redirect
 2014-12-04 11:45:34 -05:00
stephensanchez
7c78a0999a Code review comments 2014-12-04 16:16:32 +00:00
Sylvia Pearce
3e779a52f3 Fix minor typo in Trigonometric Functions row 2014-12-04 11:00:37 -05:00
Stephen Sanchez
dd77ec0f22 Merge pull request #6132 from edx/sanchez/fix_age_verification 
Only allow users who turned 13 before this year began to opt in.
 2014-12-04 10:08:15 -05: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
Will Daly
2ef7829fb7 Fix issue with iframe redirect 2014-12-04 08:46:32 -05:00
Waheed Ahmed
150fddd39d Merge pull request #6050 from edx/waheed/tnl558-fix-membership-page-tooltip-issue 
Fixed instructor dashboard tooltip far away issue.
 2014-12-04 14:08:27 +05:00
Waheed Ahmed
c2c40eba1b Fixed instructor dashboard tooltip far away issue. 
TNL-558
 2014-12-04 12:08:13 +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