Commit Graph

38416 Commits

Author SHA1 Message Date
Awais Jibran
91c1049b24 Merge pull request #13390 from edx/aj/improve-registration-activation-logging
Aj/improve registration activation logging
2016-09-06 13:02:18 +05:00
Awais Jibran
0bc4f4e026 Merge pull request #13357 from edx/aj/ECOM-5405-update-bulk-enroll-mgm
Update each enrollment in atomic transaction not all
2016-09-05 20:22:50 +05:00
Andy Armstrong
79085fff73 Merge pull request #13345 from edx/andya/buttons-not-links
Make discussion links into buttons for a11y
2016-09-02 21:50:16 -04:00
Andy Armstrong
f1bad0721f Make discussion links into buttons for a11y
TNL-4640
2016-09-02 16:34:15 -04:00
sanfordstudent
b7ac081e49 Merge pull request #13329 from edx/sstudent/TNL-5382-part-1
creating django admin settings for subsection grades
2016-09-02 10:52:51 -04:00
Douglas Hall
83e780e48f Merge pull request #13393 from edx/ibrahimahmed443/MAYN-314-survey-template-fix
safe template escaping of the mailto link in the survey template
2016-09-02 10:51:58 -04:00
Eugeny Kolpakov
2fcc463338 Merge pull request #13389 from open-craft/ekolpakov/drag_and_drop_v2_hash_update
Dependency version update: Drag and Drop  v2.0.9
2016-09-02 17:32:13 +03:00
Douglas Hall
43580bc573 Merge pull request #13358 from edx/saleem-latif/MAYN-207-transition-to-theming
MAYN-207: Migrate WL sites to comprehensive theming for LMS
2016-09-02 10:21:21 -04:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Ibrahim
acf4c94c49 safe template escaping of the mailto link in the survey template 2016-09-02 09:22:45 -04:00
Nimisha Asthagiri
b8f465d788 Merge pull request #13388 from edx/tnl/bstructure-delay-retry-task
Make BlockStructure tasks more resilient against failures
2016-09-02 09:02:17 -04:00
Nimisha Asthagiri
c7c609041b Merge pull request #13384 from edx/ormsbee/csm_nl_fix_2
Script to remove course_ids with \n from CSM
2016-09-02 09:01:45 -04:00
E. Kolpakov
23c13c1833 Dependency version update: Drag and Drop v2.0.9 2016-09-02 15:48:01 +03:00
Adam
e1cd58dcd4 Merge pull request #13385 from edx/release
Release
2016-09-02 08:41:17 -04:00
Nimisha Asthagiri
b37d2d739a Make BlockStructure tasks more resilient against failures.
https://openedx.atlassian.net/browse/TNL-5041
2016-09-02 08:02:49 -04:00
Awais Jibran
98f01ebc56 Add logging to better monitor and determine root cause for email sending failures. 2016-09-02 16:10:45 +05:00
Douglas Hall
c03026c5ee Merge pull request #13374 from edx/douglashall/WL-589/site_cache_timeout
WIP WL-589 Upgrade to edx-django-sites-extensions 2.1.0
2016-09-02 06:26:22 -04:00
Awais Jibran
896b3cb170 Do not to run all enrollment updates in a single atomic transaction, but separate.
ECOM-5405
2016-09-02 10:31:50 +05:00
David Ormsbee
75f9a522dc Script to remove course_ids with \n from CSM
Some StudentModule entries were written with newlines at the end of the
course_id. This script finds those entries within a given time range,
archive them, and merges records if necessary (capa problems).
2016-09-01 22:28:06 -04:00
Douglas Hall
b620f07084 Upgrade to edx-django-sites-extensions 2.1.0 to take advantage of site cache timeout 2016-09-01 16:38:41 -04:00
Ned Batchelder
2932023a51 Merge pull request #13375 from edx/ned/update-translations
Update translations (autogenerated message)
2016-09-01 15:16:55 -04:00
Adam
b3d29fd425 Merge pull request #13380 from edx/hotfix/tnl-5410
Handle scoreable blocks without defined weight
2016-09-01 14:17:59 -04:00
Peter Desjardins
b525fe0eac Merge pull request #13215 from edx/pdesjardins/DOC-2748
Add a help link to the LMS header - and configuration to select Open edX or edX partner doc
2016-09-01 13:43:19 -04:00
J. Cliff Dyer
6bda334b99 Handle scoreable blocks without defined weight
Default weight to 1.0.

TNL-5410
2016-09-01 15:56:17 +00:00
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04:00
Ned Batchelder
caa7b472b9 Update translations (autogenerated message) 2016-09-01 11:24:52 +00:00
Saleem Latif
f974347dcb Update theming to have priority over microsites. 2016-09-01 14:57:52 +05:00
Clinton Blackburn
33ae93ec5b Merge pull request #13321 from edx/clintonb/userinfo-cookie
Updated User Info Cookie
2016-08-31 21:31:44 -04:00
George Song
7ba9048a39 Merge pull request #13371 from edx/george/disable-ddt-profile-panel
Disable debug-toolbar ProfilingPanel
2016-08-31 17:14:03 -07:00
Clinton Blackburn
33636db966 Updating user info cookie when user loads the dashboard
Updating this cookie here helps ensure the marketing site has the most up-to-date enrollment details.

ECOM-4895
2016-08-31 19:40:00 -04:00
Clinton Blackburn
09f7b6145f Updated logon user info cookie
- Cookie now includes users' enrollment info
- Removed user email address from cookie
- Refactored functions so that we can update this cookie on other pages
- Added six to ensure new code is compatible with Python 3.x

ECOM-4896
2016-08-31 19:40:00 -04:00
Clinton Blackburn
2159b71870 Factory Cleanup
- Corrected import ordering
- Using a constant for the User password

ECOM-4896
2016-08-31 19:40:00 -04:00
George Song
5811b92e6e Disable debug-toolbar ProfilingPanel
There's a [bug](https://github.com/jazzband/django-debug-toolbar/issues/792)
that prevents wrapped views from working properly with the profiling panel.

Disable it by default.
2016-08-31 13:38:28 -07:00
Adam
35c1654643 Merge pull request #13103 from edx/dump-to-neo4j-py2neo
dump item information to neo4j
2016-08-31 16:36:20 -04:00
Chris
0c63680421 Merge pull request #13341 from edx/clrux/word-cloud-variable-cleanup
Removing unused variable from recent word cloud updates
2016-08-31 14:40:25 -04:00
David Baumgold
783f9b695b Merge pull request #13364 from edx/revert-13353-update-pa11ycrawler
Revert pa11ycrawler back to 1.3.0
2016-08-31 13:32:54 -04:00
Chris Rodriguez
be470adb03 Removing unused variable from recent word cloud updates 2016-08-31 12:44:31 -04:00
Douglas Hall
f915befe93 Merge pull request #13359 from edx/release
Merging rc/2016-08-31 into master
2016-08-31 11:41:51 -04:00
George Song
4954928215 Merge pull request #13352 from edx/george/update-django-debug-toolbar
Update to latest `django-debug-toolbar`
2016-08-31 07:15:45 -07:00
David Baumgold
f672de65bf Revert "pa11ycrawler 1.4.0" 2016-08-31 09:59:59 -04:00
Douglas Hall
27f263e4b4 Merge pull request #13338 from edx/rc/2016-08-30
Release Candidate rc/2016-08-30
2016-08-31 06:57:06 -04:00
Carol Tong
54ddede0e0 Merge pull request #13332 from edx/carol/DOC-3245
DOC-2546: Remove refs to Hangouts; fix RTD URLs
2016-08-30 19:11:24 -04:00
Chris
5b9df80123 Merge pull request #13322 from edx/clrux/ac-570-courseware-search-contrast
AC-570 courseware search contrast enhancement
2016-08-30 17:03:13 -04:00
Nimisha Asthagiri
c0eba5d474 Merge pull request #13285 from mitocw/gdm_current_grade_implementation
Current Grade Rest API implementation
2016-08-30 15:42:34 -04:00
David Baumgold
096ae039ef Merge pull request #13353 from singingwolfboy/update-pa11ycrawler
pa11ycrawler 1.4.0
2016-08-30 15:07:18 -04:00
Adam Palay
10bd4ef6bf dump item information to neo4j
clear request cache to avoid memory leak

update to use https

delete courses in the same transaction as writing them

python3 compatibility
2016-08-30 14:59:00 -04:00
Chris Rodriguez
37b42941f8 AC-570 courseware search contrast enhancement 2016-08-30 14:51:54 -04:00
George Song
194ace0ff0 Update to latest django-debug-toolbar
Also make sure we set the recommended settings according to
<https://django-debug-toolbar.readthedocs.io/en/stable/installation.html#explicit-setup>
2016-08-30 11:33:05 -07:00
David Baumgold
ede6dbb3b9 pa11ycrawler 1.4.0 2016-08-30 14:24:27 -04:00
Awais Jibran
c7df4ed072 Merge pull request #13348 from edx/aj/improve-registration-logging
Improve logging for email sending while registering.
2016-08-30 23:11:16 +05:00