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

27296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
ea18e5c356 Merge pull request #6203 from edx/jeskew/fix_pylint_error 
Fix assert.
 2014-12-09 16:02:07 -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
Clinton Blackburn
9a309448b6 Merge pull request #6200 from edx/jeskew/fix_500_error_mongo_fmt_change 
Upon fail-over check, change asset metadata document to new format.
 2014-12-09 12:15:59 -05:00
John Eskew
755241f5eb Upon fail-over check, change asset metadata document to new format. 2014-12-09 11:24:30 -05:00
Clinton Blackburn
5110632ecf Merge pull request #6197 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: removing un-needed utility Sass mixin from calc styling
 2014-12-09 09:55:06 -05:00
Brian Talbot
39125bcc0a LMS: removing un-needed utility Sass mixin from calc styling 2014-12-09 09:41:57 -05:00
Will Daly
26dfb3b346 Merge pull request #6194 from edx/will/ecom-757 
ECOM-757: Fix reference error with emailOptIn variable
 2014-12-09 09:04:26 -05:00
Will Daly
0fd6dddbae Fix reference error with emailOptIn variable 2014-12-09 08:31:03 -05:00
Clinton Blackburn
4a502c2964 Merge pull request #6185 from edx/adam/update-codejail 
update codejail for better logging (TNL-835)
 2014-12-08 16:04:54 -05:00
Adam Palay
b85a4655c4 update codejail for better logging (TNL-835) 2014-12-08 16:01:02 -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
Clinton Blackburn
5b0b967376 Merge pull request #6184 from edx/adam/dont-export-ophan-draft-children 
don't export draft children of orphaned drafted (TNL-923)
 2014-12-08 14:27:48 -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
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
Sarina Canelake
43ff734382 Merge pull request #6171 from edx/sarina/20141208-translation-update 
Update translations (autogenerated message)
 2014-12-08 11:23:18 -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
Sarina Canelake
dca161ccea Merge pull request #6168 from fmyzjs/patch-6 
Support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 11:12:04 -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
Jason Zhu
7391f359dd Support unicode ANALYTICS_DASHBOARD_NAME 
I open this pull to support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 23:10:27 +08:00
Christine Lytwynec
6821fd4093 Merge pull request #6122 from edx/clytwynec/dont-fail-diff-quality-for-todo 
Clytwynec/dont fail diff quality for todo
 2014-12-08 10:00:26 -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
Christine Lytwynec
25d76da4ef add disable fixme to pylintrc 2014-12-08 09:19:19 -05:00
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
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
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
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
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