Peter Fogg
1c910cfbbb
Merge pull request #9631 from edx/peter-fogg/teams-ajax-errors
...
Respond to AJAX errors in Teams UI.
2015-09-09 18:49:39 -04:00
Peter Fogg
95339311b0
Respond to AJAX errors in Teams UI.
...
TNL-3042
2015-09-09 17:04:23 -04:00
chrisndodge
34e01581c1
Merge pull request #9680 from edx/cdodge/only-show-proctoring-download-when-enabled
...
only show proctoring download button when the course has proctoring e…
2015-09-09 15:01:18 -04:00
chrisndodge
0afa0ab764
Merge pull request #9674 from edx/muhhshoaib/PHX-141-proctoring-timer-count-down-acccessibility
...
PHX-141
2015-09-09 14:28:43 -04:00
Clinton Blackburn
b5d6b210fd
Merge pull request #9681 from edx/release
...
Release 2015-09-09
2015-09-09 12:38:15 -04:00
chrisndodge
f5057b841c
Merge pull request #9597 from edx/cdodge/adjust-log-level
...
reduce logging severity from exception to error
2015-09-09 12:29:43 -04:00
Chris Dodge
5591101a18
only show proctoring download button when the course has proctoring enabled
2015-09-09 12:06:58 -04:00
Clinton Blackburn
020e16495d
Merge pull request #9630 from edx/rc/2015-09-09
...
Release 2015-09-09
2015-09-09 11:04:27 -04:00
Sarina Canelake
7eb41ed840
Merge pull request #9590 from openfun/openfun/fix-dropdown-problem-template
...
Fix correct answer position in dropdown problem template.
2015-09-09 10:15:06 -04:00
Sarina Canelake
c5bca132bd
Merge pull request #9670 from edx/sarina/fix-inherited-tests
...
Fix Pylint warning for monkey_patch tests
2015-09-09 10:06:21 -04:00
Christine Lytwynec
8d0bc488e1
Merge pull request #9664 from edx/clytwynec/AC-166
...
Remove unicode quotes in courseware html attrs
2015-09-09 09:43:37 -04:00
Sarina Canelake
b19a0e71d3
Fix pylint issues in spoc_gradebook test
2015-09-09 09:13:29 -04:00
Sarina Canelake
3a05726eaf
Fix Pylint warning for monkey_patch tests
2015-09-09 09:13:29 -04:00
Muhammad Shoaib
24195c12ea
PHX-141
...
added the accessibility element for timer count down
2015-09-09 15:51:14 +05:00
Muzaffar yousaf
4aa38330b8
Merge pull request #9622 from edx/muzaffar/upgrade-django-sekizai
...
Upgrading django-sekizai
2015-09-09 15:41:20 +05:00
muzaffaryousaf
e33d1dc563
Upgrading django-sekizai
...
TNL-2811
2015-09-09 14:33:13 +05:00
Muzaffar yousaf
d17bff1cbb
Merge pull request #9645 from edx/muzaffar/upgrade-django-ses
...
Upgrading django-ses
2015-09-09 14:19:40 +05:00
jpaille
b8c33e7b30
Add Julien Paillé to AUTHORS.
2015-09-09 09:12:29 +00:00
jpaille
ef2a855e93
Fix dropdown problem (optioninput) template.
...
The correct answer is now correctly displayed after `show answer` is pressed.
2015-09-09 09:11:33 +00:00
muzaffaryousaf
86553c2f13
Upgrading django-ses
...
TNL-2811
2015-09-09 12:56:44 +05:00
Muzaffar yousaf
0ee2112b78
Merge pull request #9573 from edx/muzaffar/upgrade-mock-django
...
Upgrade mock-django in platform & released version for edx-search.
2015-09-09 12:40:50 +05:00
Ahsan Ulhaq
de6d49701b
Merge pull request #9447 from edx/ahsan/ECOM-2118-Credit-Eligible-Assessments-Appear-in-Incorrect-Order
...
Credit-Eligible Assessments Appearing in Incorrect Order
2015-09-09 12:28:54 +05:00
muzaffaryousaf
0ed729b0ca
Upgrading edx-search version in platform
...
TNL-3136
2015-09-09 11:49:15 +05:00
muzaffaryousaf
6be65f6595
Upgrade mock-django to 0.6.9.
2015-09-09 11:49:12 +05:00
Muzaffar yousaf
4c2dc816bb
Merge pull request #9617 from edx/muzaffar/django-upgrade-simple-history
...
Upgrading django-simple-history to 1.6.3
2015-09-09 11:38:23 +05:00
Bill DeRusha
6c09ceaef9
Merge pull request #9669 from edx/bderusha/teams-search-flag
...
Add ENABLE_SEARCH_TEAMS flag to tests
2015-09-08 20:58:30 -04:00
Brian Beggs
bc685451ea
Merge pull request #9568 from edx/bbeggs/lettuce-1.8-upgrade
...
Update lettuce to work with Django 1.4 - 1.8
2015-09-08 20:30:52 -04:00
Bill DeRusha
8bfa4e9c21
Add ENABLE_SEARCH_TEAMS flag to tests
2015-09-08 19:12:48 -04:00
Bill DeRusha
fb874f4805
Merge pull request #9665 from edx/bderusha/teams-search-config
...
Add search specific feature flag in front of search features
2015-09-08 17:39:07 -04:00
Bill DeRusha
49807ab6a5
Add search specific feature flag in front of search features
2015-09-08 17:13:30 -04:00
Andy Armstrong
a08fe9fb06
Merge pull request #9059 from edx/andya/faster-update-assets
...
Don't package or optimize assets on devstack
2015-09-08 16:48:11 -04:00
Kevin Falcone
ee7d47c7ec
Merge pull request #9640 from edx/jibsheet/lti-consumer-default-token
...
Use the oauth provider utils to ship a generated key/secret
2015-09-08 16:15:59 -04:00
Christine Lytwynec
9a45e831ac
Merge pull request #9497 from edx/clytwynec/AC-155
...
Add role="presentation" to .course-wrapper to prevent table
2015-09-08 15:43:46 -04:00
Brian Beggs
b7006533a2
updating lettuce to work with Django 1.4 - 1.8
2015-09-08 15:42:11 -04:00
Christine Lytwynec
3aff77021a
Remove unicode quotes in courseware html attrs
2015-09-08 15:41:31 -04:00
Diana Huang
0b78ffdf83
Merge pull request #9632 from edx/diana/teams-changed-event
...
Add events for tracking when teams are edited.
2015-09-08 15:21:49 -04:00
Brian Beggs
c45b8a1720
Merge pull request #9657 from edx/ammar/remove-django-robots-from-requiremtns.txt
...
Remove django-robots from docs/shared/requirements.txt
2015-09-08 14:52:58 -04:00
Brian Beggs
ef032e9ab4
Merge pull request #9652 from edx/ammar/remove-django-kombu
...
Remove django-kombu
2015-09-08 14:38:23 -04:00
Brian Beggs
2557e4714b
Merge pull request #9644 from edx/ammar/remove-django-masquerade
...
Remove django-masquerade
2015-09-08 14:36:11 -04:00
Chris Dodge
56f0043877
reduce logging severity from exception to error
2015-09-08 14:34:05 -04:00
Bill DeRusha
ade4734308
Merge pull request #9661 from edx/bderusha/teams-search-index
...
Add more defensive code around elasticsearch connection
2015-09-08 14:31:41 -04:00
Brian Beggs
c430422fca
Merge pull request #9643 from edx/ammar/remove-django-settings-context-processor
...
Remove django-settings-context-processor
2015-09-08 14:30:14 -04:00
Brian Beggs
be55e36d65
Merge pull request #9620 from edx/ammar/update-django-ratelimit-backend
...
update django-ratelimit-backend
2015-09-08 14:17:06 -04:00
chrisndodge
815a3d6cf3
Merge pull request #9646 from edx/muhhshoaib/SOL-1171-return-display-string-from-backbone-view
...
SOL-1171
2015-09-08 14:09:06 -04:00
Sarina Canelake
3015c4a51d
Merge pull request #9638 from jolyonb/fixspace
...
Fixing spacing in tooltip
2015-09-08 13:00:05 -04:00
Bill DeRusha
62ef4b5b8f
Add more defensive code around elasticsearch connection
2015-09-08 12:12:05 -04:00
Jesse Zoldak
19b705ac73
Merge pull request #9659 from edx/zoldak/SOL-1183
...
Flag test as flaky SOL-1183
2015-09-08 11:57:27 -04:00
Jesse Zoldak
89ea9885c5
Merge pull request #9662 from edx/zoldak/edx-lint-027
...
Update edx-lint to v0.2.7
2015-09-08 11:54:34 -04:00
Muhammad Shoaib
1b861b9d81
SOL-1171
...
passed the display string to the underscore template so that the word "proctored" is not hard coded in the underscore file.
updated the git tag for proctoring repo
2015-09-08 11:47:33 -04:00
Ned Batchelder
3415b94aa8
Merge pull request #9655 from edx/ned/disable-pip-version-check
...
Disable the pip version check message
2015-09-08 11:39:04 -04:00
