Commit Graph

45731 Commits

Author SHA1 Message Date
Brian Beggs
555619906a Merge pull request #15751 from edx/bbeggs/PLAT-1656
Add forums URL default for docker devstack
2017-08-04 15:25:59 -04:00
Brian Beggs
7b54cf5603 Modify COMMENTS_SERVICE_URL for bokchoy docker settings 2017-08-04 15:17:01 -04:00
Brian Beggs
54695d84fb Add forums URL default for docker devstack 2017-08-04 15:07:10 -04:00
Douglas Hall
0a81e6c226 Merge pull request #15748 from edx/douglashall/upgrade_enterprise_0_39_7
Upgrade edx-enterprise package to 0.39.7.
2017-08-04 15:01:01 -04:00
Michael Youngstrom
129428bb53 Merge pull request #15749 from edx/revert-14836-teltek/i18n_certificate_date
Revert "Add i18n to date in certificate web"
2017-08-04 14:48:05 -04:00
George Song
53ccd15850 Merge pull request #15742 from edx/george/fix-breaking-test
Strip `c` from `.pyc` for error message comparison
2017-08-04 11:20:49 -07:00
George Song
fab9ddba6a Merge pull request #15737 from caesar2164/fix-library-content-import-upstream
Fix attrib check code for library_content import
2017-08-04 10:58:01 -07:00
Michael Youngstrom
ca1ca99abf Revert "Add i18n to date in certificate web" 2017-08-04 13:55:17 -04:00
Giulio Gratta
2ad885b726 Fix attrib check code for library_content import
Attributes come in as a list of dicts with strings as keys and values.
Implicitly casting each result as a tuple causes the code to split the key string into it's characters.
This yields a list of characters, the first two of which are placed into the variables "attr_name" and "attr_value".
This is not only wrong, but because keys tend to be more than 2 characters, the net result is:

"ValueError: too many values to unpack"
2017-08-04 10:47:05 -07:00
George Song
69b2116d85 Merge pull request #14836 from pepeportela/teltek/i18n_certificate_date
Add i18n to date in certificate web
2017-08-04 09:24:44 -07:00
pepeportela
1ff5333bc0 Add space between arguments 2017-08-04 18:16:39 +02:00
Douglas Hall
a3c0e54cf2 Upgrade edx-enterprise package to 0.39.7.
https://github.com/edx/edx-enterprise/compare/0.39.6...0.39.7
2017-08-04 11:57:07 -04:00
George Song
f3faad7ebc Strip c from .pyc for error message comparison
In Python 2.7, `__file__` returns `.pyc` by default, this breaks our
comparison so let's strip out the trailing `c`.
2017-08-04 08:41:23 -07:00
jportela
54a26cfff4 Add i18n month with strftime_localized in certificate views 2017-08-04 17:38:51 +02:00
Tyler Hallada
8a851b3ec1 Color the override notice differently 2017-08-04 11:28:09 -04:00
Douglas Hall
198dbc1e61 Merge pull request #15738 from edx/douglashall/upgrade_enterprise_0_39_6
Upgrading edx-enterprise to 0.39.6.
2017-08-04 09:41:04 -04:00
jportela
a35e974457 Fix typo introduced in commit b841176 2017-08-04 14:31:55 +02:00
jportela
b841176e9c Add i18n month dict to certificate using @amangano-edx solution in PR #14836 2017-08-04 14:27:43 +02:00
jportela
2646858cad Add i18n to date in certificate web 2017-08-04 14:11:34 +02:00
Douglas Hall
8812664384 Upgrading edx-enterprise to 0.39.6.
https://github.com/edx/edx-enterprise/compare/0.39.5...0.39.6
2017-08-03 17:11:25 -04:00
Tyler Hallada
05de4a485b Add override notice to progress page 2017-08-03 16:32:17 -04:00
Alex Dusenbery
aafd4d9c61 Turn down grades logging; put policy change regrade behind a waffle killswitch. 2017-08-03 14:06:17 -04:00
Tyler Hallada
503aff2518 Address PR comments 2017-08-03 13:30:53 -04:00
Brittney Exline
d8a974b678 Merge pull request #15715 from edx/saleem-latif/ENT-555
ENT-555: Continue button is not appearing on registration page.
2017-08-03 11:05:34 -04:00
Michael Roytman
0dddf9eb1a Merge pull request #15660 from edx/mroytman/PLAT_1495_django_1.11_upgrade_django-debug-toolbar
update django-debug-toolbar from 1.5 to 1.8
2017-08-03 10:10:34 -04:00
Tasawer Nawaz
8463dd49aa Merge pull request #15724 from edx/tasawer/learner-2167/fix-lms-dashboard-errors
Fix LMS dashboard error, if HttpServerError occurs on ecommerce
2017-08-03 17:49:22 +05:00
tasawernawaz
b645af424a Fix lms dashboard error, if HttpServerError occurs on ecommerce
LEARNER-2167
2017-08-03 16:48:21 +05:00
Noraiz Anwar
993ba5f2d7 Merge pull request #15543 from edx/noraiz/EDUCATOR-444
Throw error if celery task creation is not successfully completed.
2017-08-03 16:15:04 +05:00
Waheed Ahmed
fcba934122 Merge pull request #15719 from edx/waheed/LEARNER-1801-lerner-fulfilment-error
Added new signal to refund on un-enrollment from LMS dashboard.
2017-08-03 15:34:19 +05:00
Waheed Ahmed
c74cd970ad Added new signal to refund on un-enrollment from LMS dashboard.
LEARNER-1801
2017-08-03 14:39:05 +05:00
Aamish Baloch
6f3ef7c9c9 YONK-725: PARENTAL_CONSENT_AGE_LIMIT set to be configurable 2017-08-03 14:28:56 +05:00
noraiz-anwar
d1da044520 Throw error if messaging queue is not available 2017-08-03 14:11:25 +05:00
Tasawer Nawaz
3e7243ea67 Merge pull request #15699 from edx/tasawer/learner-1494/add-password-complexity-on-reset-page
length complexity added on password reset page
2017-08-03 13:54:50 +05:00
Saleem Latif
04c11cc176 Continue button is not appearing on registration page. 2017-08-03 13:36:39 +05:00
Aamish Baloch
4777cf717a Merge pull request #15718 from edx/aamishbaloch/group_image_settings
PROFILE_IMAGE_SIZES_MAP grouped with the similar settings
2017-08-03 13:24:55 +05:00
tasawernawaz
9b50b816f5 length complexity added on password reset page
LEARNER-1492
2017-08-03 12:50:42 +05:00
Aamish Baloch
ac84fd39b6 PROFILE_IMAGE_SIZES_MAP grouped with the similar settings 2017-08-03 12:30:52 +05:00
Douglas Hall
75021b3578 Merge pull request #15725 from edx/bexline/enterprise_version_bump
ENT-581 Upgrade enterprise package to 0.39.5
2017-08-02 19:50:12 -04:00
Uman Shahzad
4c41b7777c Merge pull request #15375 from open-craft/uman/ent-334
[ENT-334] Add client-side registration form validation.
2017-08-02 17:09:02 -04:00
Uman Shahzad
4b47d4af75 Fix broken test. 2017-08-03 00:22:25 +05:00
Uman Shahzad
1103a334a3 Update i18n. 2017-08-03 00:22:25 +05:00
Uman Shahzad
30b95eef35 Disable positive validations on form submission. 2017-08-03 00:22:25 +05:00
Uman Shahzad
cb034d4f2f Implement client-side registration form validation.
Input forms that need validation will have AJAX requests
performed to get validation decisions live.

All but a few important and common form fields perform
generic validation; these will need a back-end handler
in the future in order to have them validated through AJAX requests.

Information is conveyed on focus and blur for both
errors and successes.
2017-08-03 00:22:25 +05:00
Uman Shahzad
39ac333b5d Add backend AJAX API endpoint for client-side form validation.
In particular, implement a validation API for registration,
where a client makes AJAX calls to the endpoints requesting
validation decisions on each input. Responses are strings
dependent on the type of validation error; if no error,
then empty string to indicate OK.
2017-08-03 00:22:25 +05:00
Michael Roytman
54f4a9dee1 remove is_ajax condition and JQUERY initialization from lms/cms devstack env files
Please enter the commit message for your changes. Lines starting
2017-08-02 15:12:13 -04:00
Michael Roytman
c565e2624e update django-debug-toolbar from 1.5 to 1.8 2017-08-02 15:12:13 -04:00
Brittney Exline
3c21041224 ENT-581 Upgrade enterprise package to 0.39.5 2017-08-02 14:52:19 -04:00
George Song
78708e41e9 Merge pull request #15683 from open-craft/smarnach/notify-default
Bug fix: Reset "Notify users by email" check box to initial state.
2017-08-02 11:48:44 -07:00
Matthew Piatetsky
c871804df1 Merge pull request #15710 from edx/LEARNER-2016b
LEARNER-2016 Removed waffle flag and added test for utm params on redirect
2017-08-02 14:44:59 -04:00
Tyler Hallada
81e8f906a5 Add override_deleted to subsection override event 2017-08-02 14:31:30 -04:00