Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Greg Price
b99dca987e Merge pull request #6131 from edx/gprice/fix-paver-test-js 
Fix paver test_js task to work without -p flag
 2014-12-03 16:58:18 -05: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
Akiva Leffert
1088855d0b Make static URLs absolute in handouts, updates, and about for mobile API 
JIRA: MA-147
 2014-12-03 16:18:39 -05:00
Brian Talbot
8d947f0215 LMS: revising styling of calculator tooltip content 2014-12-03 16:09:07 -05:00
Brian Talbot
a9daaff17b LMS: revising semantic markup of calculator tooltip content 2014-12-03 16:08:33 -05:00
Calen Pennington
e01ffcc27e Merge pull request #6129 from cpennington/fewer-queries-in-field-data-cache 
Don't query for the user every time in FieldDataCache, just use the user_id instead
 2014-12-03 16:08:24 -05:00
stephensanchez
f993a48490 Only allow users who turned 13 before this year began to opt in. 2014-12-03 20:36:28 +00:00
Greg Price
bc41b65c18 Fix paver test_js task to work without -p flag 2014-12-03 14:55:18 -05:00
christopher lee
3c99912213 Merge branch 'release' 2014-12-03 14:46:40 -05:00
Ben Patterson
c09f0ea4c0 Merge pull request #6080 from edx/benp/find-deprecated-tracker 
Enforce pylint violation when using old event tracker.
 2014-12-03 14:03:58 -05:00
Christopher Lee
fd2891edc9 Merge pull request #6128 from edx/adam/fix-upgrade-text 
fix typo on course payment page (ECOM-714)
 2014-12-03 11:04:49 -05:00
Calen Pennington
14e6f3cc2b Don't query for the user every time in FieldDataCache, just use the user_id instead 2014-12-03 11:00:03 -05:00
Adam Palay
c0b87d87ab fix typo on course payment page (ECOM-714) 2014-12-03 10:52:34 -05:00
Will Daly
f0e6cdd3d7 Merge pull request #6110 from edx/will/email-opt-in-analytics 
Add management command to create the email opt-in list.
 2014-12-03 09:20:47 -05:00
Sarina Canelake
c74b05e978 Merge pull request #5917 from edx/sarina/fix-i18n 
Fix Solutions i18n issues
 2014-12-03 08:03:14 -05:00
Will Daly
f40447b3c8 If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page. 2014-12-03 08:00:33 -05:00
Will Daly
61ecae9871 Add management command to create the email opt-in list. 2014-12-03 07:54:38 -05:00
Brandon DeRosier
046e295322 Change has_course_access definition and doc string 
- has_course_access renamed to has_course_author_access for clarity
- Changed doc string to clearly state that it determines whether or not
  a user has write access to a course
 2014-12-02 22:08:58 -05:00
Sarina Canelake
dc972eb2d6 Add additional context for translators 2014-12-02 20:56:08 -05:00
Sarina Canelake
6539a6e0fc Keep closing lines of email together for translation purposes 2014-12-02 20:56:07 -05:00
Sarina Canelake
98b9fb09cd Fix dashboard i18n 2014-12-02 20:56:07 -05:00
Brandon DeRosier
bdc64a7c70 Moved has_course_access from CMS to student.auth (common) 2014-12-02 19:36:38 -05:00
Christine Lytwynec
97d357cd16 Merge pull request #6121 from edx/clytwynec/revert-not-editable-mode 
Revert "Do not install requirements from github.txt in editable mode"
 2014-12-02 17:01:13 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course 
Student verification status
 2014-12-02 16:08:25 -05:00
Christine Lytwynec
d852bc9251 Revert "Do not install requirements from github.txt in editable mode" 
This reverts commit 61cf1d6edb.

Conflicts:
	requirements/edx/github.txt
 2014-12-02 15:52:53 -05:00
AlasdairSwan
500a33db58 Merge pull request #6115 from edx/alasdair/email-opt-out 
Added styles for email opt in/out checkbox label
 2014-12-02 14:27:20 -05:00
AlasdairSwan
96afb82dbd Added styles for email opt in/out checkbox label 2014-12-02 11:50:31 -05:00