Eric Fischer
12130c8006
Fixing CohortMembership and ATOMIC_REQUESTS issue
...
What had been happening was related to the fact that ATOMIC_REQUESTS is now on,
preventing writing to the database until a request is completed.
The problem with that was that CohortMemberships, with their explicit
transaction handling, were breaking that rule and touching the database.
The CohortMembership needs to also touch the database to update the
underlying course_user_groups information, to prevent the database from
getting into a strange state.
After this commit, every time a CohortMembership is updated or created, the
corresponding course_user_groups are also updated and explicitly written to
the database. This occurs atomically with the CohortMembership, and does not
wait for the end of the request.
2015-11-30 13:04:42 -05:00
Kevin Falcone
fba6b4db7d
Merge pull request #10726 from edx/jibsheet/bump-django-version
...
Upgrade to Django 1.8.7
2015-11-24 16:31:15 -05:00
chrisndodge
df4b0a078f
Merge pull request #10728 from edx/cdodge/edx-proctoring-0-11-6
...
Use edx-proctoring 0.11.6
2015-11-24 16:15:59 -05:00
chrisndodge
dd1d680d4f
Use edx-proctoring 0.11.6
2015-11-24 13:55:51 -05:00
Kevin Falcone
e33a446cc7
Ugrade to 1.8.7
2015-11-24 13:44:16 -05:00
Carol Tong
933a2b343a
Merge pull request #10715 from edx/carol/doc/StudioHelpUpdates
...
DOC: Studio Help -- update config.ini file with new paths to B&R Guide
2015-11-24 13:18:40 -05:00
Carol Tong
163e6f0a19
Update config.ini file with new paths
2015-11-24 12:27:27 -05:00
Christine Lytwynec
0100e50669
Merge pull request #10666 from edx/clytwynec/ac-239
...
remove unneeded aria-describedby and aria-hidden attrs on studio modal
2015-11-24 12:14:44 -05:00
Cliff Dyer
c8a791abf0
Merge pull request #10576 from edx/cdyer/course-list-api
...
Added new Course Catalog API
https://openedx.atlassian.net/browse/MA-1625
2015-11-24 11:38:14 -05:00
Sarina Canelake
00ea617412
Merge pull request #10721 from edx/sarina/20151124-update-translations
...
Update translations (autogenerated message)
2015-11-24 11:27:52 -05:00
Michael Frey
29b6ccf5e4
Added new Course List API.
2015-11-24 15:54:03 +00:00
Christine Lytwynec
9a361b6b8a
remove unneeded aria-describedby and aria-hidden attrs on studio modal
2015-11-24 10:42:04 -05:00
Peter Pinch
1b8349994e
Merge pull request #10619 from mitocw/fix/aq/dates_of_problems
...
Overridden start and due dates of problems to control due date of a unit from ccx schedule
2015-11-24 10:38:59 -05:00
Andy Armstrong
7731f3d8f8
Merge pull request #10718 from edx/andya/new-ora-release
...
Use the latest ORA and submissions API
2015-11-24 10:31:22 -05:00
chrisndodge
0ccb017408
Merge pull request #10713 from edx/cdodge/fix-zero-seat-invoices
...
Cdodge/fix zero seat invoices
2015-11-24 10:28:42 -05:00
Sarina Canelake
7d2aa28ef8
Update translations (autogenerated message)
2015-11-24 10:26:03 -05:00
Sarina Canelake
4f4a0895ea
Merge pull request #6279 from edx/ned/add-officemix-xblock
...
Add the Microsoft Office Mix XBlock
2015-11-24 10:01:28 -05:00
Chris Dodge
e534e5d588
fix broken report when there is a zero seat invoice
...
fix quality error
2015-11-24 09:42:54 -05:00
Ahsan Ulhaq
d729e97f50
Merge pull request #10658 from edx/ahsan/ECOM-2897-Update-help-text-for-Name-field-in-edx-registration
...
Update help text for Name field in edx registration
2015-11-24 19:41:00 +05:00
David Baumgold
e48e250b1b
Merge pull request #10712 from edx/github-capital-h
...
GitHub has a capital H
2015-11-24 09:26:55 -05:00
Ned Batchelder
e16fad3540
Add the Microsoft Office Mix XBlock
2015-11-24 09:04:12 -05:00
Sarina Canelake
bb625770b4
Merge pull request #10716 from edx/ned/update-i18n-tools
...
Use 0.1.4 of i18n-tools so Django 1.8 will work. PLAT-919
2015-11-24 08:40:02 -05:00
Amir Qayyum Khan
a1f2f395a0
overriden start and due dates for problems to controll due date of a unit from ccx schedule
2015-11-24 18:23:09 +05:00
chrisndodge
236d251e6e
Merge pull request #10691 from edx/cdodge/add-attempt-code-to-report
...
Add in the attempt_code field to the proctoring report
2015-11-24 07:18:11 -05:00
Ahsan Ulhaq
73eb9bd9df
Update help text for Name field in edx registration
...
ECOM-2897
2015-11-24 12:47:42 +05:00
Andy Armstrong
fbbf3380b8
Use the latest ORA and submissions API
2015-11-24 00:41:12 -05:00
Ned Batchelder
3ae92b9f02
Use 0.1.4 of i18n-tools so Django 1.8 will work
2015-11-23 21:59:26 -05:00
Ned Batchelder
a7e21bf188
Merge pull request #10707 from edx/ned/fix-pylint-c7630-violations
...
Fix pylint C7630 (literal used as attribute) violations
2015-11-23 16:58:54 -05:00
Feanil Patel
995a214c95
Merge pull request #10710 from edx/feanil/upgrade_pymongo
...
Upgrade to latest 2.x version of pymongo.
2015-11-23 15:50:23 -05:00
Ned Batchelder
0872732cf0
Fix pylint C7630 (literal used as attribute) violations
...
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
2015-11-23 15:32:54 -05:00
David Baumgold
2e71a66daa
GitHub has a capital H
2015-11-23 15:06:33 -05:00
Christine Lytwynec
29b719f394
Merge pull request #10527 from edx/clytwynec/ac-230
...
Navigation dropdown link should be button
2015-11-23 15:06:02 -05:00
Christine Lytwynec
c6f4afc9c9
Header a.dropdown --> button.dropdown
2015-11-23 13:51:00 -05:00
Feanil Patel
6f0e7c5116
Upgrade to latest 2.x version of pymongo.
...
Release Notes: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=14795
Mostly backports to prep for moving to 3.0
2015-11-23 12:26:03 -05:00
Christine Lytwynec
6a92d4cb2b
Merge pull request #10639 from edx/clytwynec/remove-firefox-focus-outline-override
...
remove reset style for button outlines in firefox
2015-11-23 11:55:00 -05:00
Ned Batchelder
5634692f6c
Merge pull request #10708 from edx/ned/fix-wiki-0002-migration
...
Update the django-wiki reference
2015-11-23 10:46:06 -05:00
Ned Batchelder
68e30f5dee
Update the django-wiki reference
...
Django-wiki had an incorrect migration. This gets the right one.
2015-11-23 10:01:08 -05:00
Peter Pinch
d4d63ece1f
Merge pull request #10647 from mitocw/enhancement/aq/email_notification_setting_ccx_enrollment
...
Added auto-enroll and email student check boxes to enrollment tab ccx coach dashboard
2015-11-23 08:18:41 -05:00
Ned Batchelder
dcc86a3b1b
Merge pull request #10703 from edx/ned/remove-useless-pylint-suppression
...
Remove useless pylint suppressions. TOOLS-124
2015-11-23 07:00:26 -05:00
Ned Batchelder
f5d0f3ff55
Remove useless pylint suppressions
2015-11-22 07:41:19 -05:00
Akiva Leffert
7a858b6e09
Merge pull request #10405 from edx/aleffert/block-wrapping
...
Force wrapping for long content like hyperlinks.
2015-11-20 19:17:41 -05:00
Akiva Leffert
bb43407586
Force wrapping for long content like hyperlinks.
...
Content that doesn't fit on the screen was causing the viewport to be
the wrong size on mobile devices resulting. This forces wrapping for
long content instead of letting it force the viewport size.
JIRA: https://openedx.atlassian.net/browse/MA-1236
2015-11-20 17:47:58 -05:00
Kevin Falcone
dffcc25bcc
Merge pull request #10694 from edx/hotfix-2015-11-20-conflict
...
Hotfix 2015 11 20 conflict
2015-11-20 15:10:28 -05:00
Christine Lytwynec
b96cd65a14
remove reset style for button outlines in firefox
2015-11-20 14:26:16 -05:00
Kevin Falcone
80614a2798
Merge branch 'release' into hotfix-2015-11-20-conflict
2015-11-20 13:13:05 -05:00
Kevin Falcone
37dbbf4197
Merge pull request #10674 from edx/hotfix/2015-11-19
...
Fix login redirect when user is logged out while answering a question…
2015-11-20 12:28:15 -05:00
chrisndodge
7c7c0b6809
Merge pull request #10670 from edx/cdodge/fix-unenrollment-audit-data
...
Cdodge/fix unenrollment audit data
2015-11-20 12:07:14 -05:00
Chris Dodge
21c2d3f7bd
Add in the attempt_code field to the proctoring report
2015-11-20 12:05:49 -05:00
Kevin Falcone
24d72883b2
Merge pull request #10684 from edx/jibsheet/force_publish-arg-parsing
...
Jibsheet/force publish arg parsing
2015-11-20 11:00:31 -05:00
Usman Khalid
c22d0de9fb
Merge pull request #10690 from edx/usman/fix-settings
...
Cleanup some settings.
2015-11-20 20:41:59 +05:00
