This website requires JavaScript.
5e41a34dd1
Refrain from setting email opt-in preference when checkbox is missing
2014-12-03 17:01:21 -05:00
54b7a578a2
Remove extra prerequisites style and add classes
2014-11-04 13:03:36 -08:00
a32f337326
renmaing prod.py and setting more defaults
2014-12-04 16:43:17 -05:00
212598e649
Merge branch 'release'
2014-12-04 16:39:37 -05:00
526fdf0108
Merge branch 'release'
2014-12-04 16:23:00 -05:00
e8ffbb1590
Merge pull request #6134 from edx/hotfix/2014-12-03
2014-12-04 16:16:36 -05:00
93c33cdfd8
LMS: fix - visually hiding calculator toggle label
2014-12-04 16:15:46 -05:00
5e80389b33
Add BI events for tracking email opt-ins
2014-12-03 15:46:58 -05:00
db9bb20c25
Merge pull request #6138 from edx/sanchez/fix_register_email_opt_in
2014-12-04 14:08:57 -05:00
f7f9bec6ea
Merge pull request #5774 from edx/cdodge/shopping-cart-touchups
2014-12-04 14:02:19 -05:00
f2e20f333e
Merge pull request #5998 from edx/sylvia/docs/1162
2014-12-04 12:19:39 -05:00
3c5da9d3ea
Merge pull request #6077 from edx/will/enable-logistration
2014-12-04 11:47:20 -05:00
27e5c17ef9
Merge pull request #6145 from edx/will/fix-mktg-iframe-redirect
2014-12-04 11:45:34 -05:00
7c78a0999a
Code review comments
2014-12-04 16:16:32 +00:00
3e779a52f3
Fix minor typo in Trigonometric Functions row
2014-12-04 11:00:37 -05:00
dd77ec0f22
Merge pull request #6132 from edx/sanchez/fix_age_verification
2014-12-04 10:08:15 -05:00
0ded669909
Split mongo support for libraries and Library XBlock
2014-10-28 21:53:57 -07:00
988753395f
Add support for external auth on the combined login/registration page
2014-11-28 14:32:30 -05:00
2ef7829fb7
Fix issue with iframe redirect
2014-12-04 08:46:32 -05:00
150fddd39d
Merge pull request #6050 from edx/waheed/tnl558-fix-membership-page-tooltip-issue
2014-12-04 14:08:27 +05:00
c2c40eba1b
Fixed instructor dashboard tooltip far away issue. TNL-558
2014-11-25 18:52:49 +05:00
cd30164b5f
Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122
2014-10-23 15:03:06 +05:00
79ca56c3db
Allowing email optin to work on register.
2014-12-03 22:47:40 +00:00
b99dca987e
Merge pull request #6131 from edx/gprice/fix-paver-test-js
2014-12-03 16:58:18 -05:00
66f41e1d9f
Make static URLs absolute in handouts, updates, and about for mobile API
2014-12-02 12:06:48 -05:00
b89113e114
Revert "Make static URLs absolute in handouts, updates, and about for mobile API"
2014-12-03 16:24:27 -05:00
1088855d0b
Make static URLs absolute in handouts, updates, and about for mobile API
2014-12-02 12:06:48 -05:00
8d947f0215
LMS: revising styling of calculator tooltip content
2014-12-03 16:09:07 -05:00
a9daaff17b
LMS: revising semantic markup of calculator tooltip content
2014-11-26 13:14:24 -05:00
e01ffcc27e
Merge pull request #6129 from cpennington/fewer-queries-in-field-data-cache
2014-12-03 16:08:24 -05:00
f993a48490
Only allow users who turned 13 before this year began to opt in.
2014-12-03 20:36:28 +00:00
bc41b65c18
Fix paver test_js task to work without -p flag
2014-12-03 14:55:18 -05:00
3c99912213
Merge branch 'release'
2014-12-03 14:46:40 -05:00
c09f0ea4c0
Merge pull request #6080 from edx/benp/find-deprecated-tracker
2014-12-03 14:03:58 -05:00
fd2891edc9
Merge pull request #6128 from edx/adam/fix-upgrade-text
2014-12-03 11:04:49 -05:00
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
c0b87d87ab
fix typo on course payment page (ECOM-714)
2014-12-03 10:52:34 -05:00
f0e6cdd3d7
Merge pull request #6110 from edx/will/email-opt-in-analytics
2014-12-03 09:20:47 -05:00
c74b05e978
Merge pull request #5917 from edx/sarina/fix-i18n
2014-12-03 08:03:14 -05:00
f40447b3c8
If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page.
2014-11-26 15:35:29 -05:00
61ecae9871
Add management command to create the email opt-in list.
2014-12-01 08:53:37 -05:00
046e295322
Change has_course_access definition and doc string
2014-12-02 22:08:58 -05:00
dc972eb2d6
Add additional context for translators
2014-11-10 16:38:23 -05:00
6539a6e0fc
Keep closing lines of email together for translation purposes
2014-11-10 16:34:41 -05:00
98b9fb09cd
Fix dashboard i18n
2014-11-10 16:30:48 -05:00
bdc64a7c70
Moved has_course_access from CMS to student.auth (common)
2014-12-02 19:36:38 -05:00
97d357cd16
Merge pull request #6121 from edx/clytwynec/revert-not-editable-mode
2014-12-02 17:01:13 -05:00
84301e7698
Merge pull request #6070 from edx/will/verified-messaging-per-course
2014-12-02 16:08:25 -05:00
d852bc9251
Revert "Do not install requirements from github.txt in editable mode"
2014-12-02 15:52:53 -05:00
500a33db58
Merge pull request #6115 from edx/alasdair/email-opt-out
2014-12-02 14:27:20 -05:00
96afb82dbd
Added styles for email opt in/out checkbox label
2014-12-02 10:06:43 -05:00
46d5593201
Merge pull request #6105 from edx/clintonb/oidc-administrator-claim
2014-12-02 11:11:15 -05:00
5a561f81d4
Added OAuth2 Permissions Scope Handler
2014-12-01 15:01:23 -05:00
1cf9a3a0a0
Merge pull request #6112 from edx/zoldak/fix-pep8
2014-12-02 09:53:08 -05:00
94d3d236fe
Merge pull request #6113 from Shrhawk/shr/bug/TNL-590-encode-error-fixing-pep-8
2014-12-02 19:49:19 +05:00
962dc221d4
ECOM-677 ECOM-678 styled the new messages
2014-12-01 11:33:05 -05:00
464dfcfabc
Show student verification status on the dashboard.
2014-11-25 07:20:04 -05:00
e26a0c4308
Fix pep8 violations in some tests
2014-12-02 09:39:23 -05:00
9aff1d5718
Remove extra line
2014-12-02 19:37:09 +05:00
17379f4079
Merge pull request #6078 from edx/zoldak/modulestore-test-refactor
2014-12-02 08:53:41 -05:00
0f3bce02a0
Merge pull request #5888 from Shrhawk/shr/bug/TNL-590-encode-error
2014-12-02 17:53:47 +05:00
121b31309d
Small fixes to modulestore test refactoring
2014-12-01 14:29:22 -05:00
bf3b87bc64
Clean up all modulestore testcases Move modulestore config for tests to an importable location Disable pylnt warning for lms imports in common tests Refactor all testcases that loaded all xml courses TE-610 TE-489
2014-11-25 13:33:09 -05:00
8c946f8b37
Merge pull request #6104 from edx/zoldak/heartbeat-mock-tests
2014-12-02 06:51:31 -05:00
927249bcdc
Merge pull request #6085 from edx/ammar/update-advance-config
2014-12-02 15:35:57 +05:00
6f1bccd565
Mock the modulestore for the heartbeat tests
2014-12-01 13:47:24 -05:00
9b241fe565
Merge pull request #6098 from edx/db/remove-unused-envs
2014-12-01 18:51:33 -05:00
28186e233c
Merge pull request #6062 from edx/renzo/email-opt-in
2014-12-01 17:22:49 -05:00
8961ec4f35
Update the student views to accept the email_opt_in parameter
2014-11-26 14:18:47 -05:00
7d6dd565db
Merge pull request #6102 from edx/gprice/js-test-port
2014-12-01 15:43:35 -05:00
142c38ed43
Merge pull request #6103 from edx/alasdair/ECOM-691-footer-updates
2014-12-01 14:52:20 -05:00
970a83d41e
removed dev_ike and dev_shared_preview
2014-12-01 11:15:51 -05:00
de1c054187
Merge pull request #6079 from edx/sanchez/logistration-opt-in
2014-12-01 13:57:36 -05:00
a2dd320874
Merge pull request #6101 from edx/sarina/20141201-update-translations
2014-12-01 13:26:47 -05:00
30d4dc44b8
Add paver option to specify js-test-tool port
2014-12-01 13:02:35 -05:00
50fd8f6db2
Merge pull request #6090 from edx/sarina/pylint-cleanup
2014-12-01 12:56:04 -05:00
32c9230cd1
Hooking the logistration page into the new HTTP endpoint for email opt in.
2014-11-26 21:26:01 +00:00
1477929d98
ECOM-691 cleaned up spacing and updated title for about section
2014-12-01 11:54:22 -05:00
767799c9be
Update translations (autogenerated message)
2014-12-01 11:53:35 -05:00
6569d7542b
Clean up pep8 violation
2014-11-30 21:05:50 -05:00
252d6704d0
s/pylint: disable=W0221/pylint: disable=arguments-differ/
2014-11-30 18:16:25 -05:00
547660fd87
Resolve "pointless-string-statement" pylint violation
2014-11-30 18:15:13 -05:00
640353d94a
s/pylint: disable=W0231/pylint: disable=super-init-not-called/
2014-11-30 18:12:52 -05:00
9c7c4c8d26
s/pylint: disable=W0622/pylint: disable=redefined-builtin/
2014-11-30 18:12:01 -05:00
aa04bef9c8
s/pylint: disable=W0223/pylint: disable=abstract-method/
2014-11-30 18:11:03 -05:00
2cbdb50946
s/pylint: disable=W0142/pylint: disable=star-args/
2014-11-30 18:10:16 -05:00
1dd7cf6946
s/pylint: disable=W0603/pylint: disable=global-statement/
2014-11-30 18:08:36 -05:00
3c364193bb
s/pylint: disable=W0104/pylint: disable=pointless-statement/
2014-11-30 18:07:06 -05:00
520935209d
s/pylint: disable=W0402/pylint: disable=deprecated-module/
2014-11-30 18:05:59 -05:00
13946fb844
s/pylint: disable=W0511/pylint: disable=fixme/
2014-11-30 17:50:24 -05:00
f663a7fe8d
s/pylint: disable=W0612/pylint: disable=unused-variable/
2014-11-30 17:48:56 -05:00
7aab4151bb
s/pylint: disable=W0201/pylint: disable=attribute-defined-outside-init/
2014-11-30 17:44:20 -05:00
0c7b60b82b
Remove 'pylint: disable=W0232' because we ignore this warning in pylintrc
2014-11-30 17:26:17 -05:00
7229ef92ee
s/pylint: disable=W0212/pylint: disable=protected-access/
2014-11-30 17:16:42 -05:00
ff18b7d01a
s/pylint: disable=W0611/pylint: disable=unused-import/
2014-11-30 15:08:24 -05:00
d406261e4b
s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/
2014-11-30 15:04:21 -05:00
5f723e8d3c
s/pylint: disable=W0703/pylint: disable=broad-except/
2014-11-30 02:02:01 -05:00
f223ac8404
s/pylint: disable=W0401/pylint: disable=wildcard-import/
2014-11-30 01:57:48 -05:00
c54a71feb5
s/pylint:disable/pylint: disable/ (formatting fix)
2014-11-30 01:51:56 -05:00
c0556a7ef8
s/pylint: disable=W0613/pylint: disable=unused-argument/
2014-11-30 01:49:17 -05:00
Renzo Lucioni