John Eskew
b7830de618
Merge pull request #10659 from edx/dj18-release-merge
...
Django18 release merge
2015-11-19 14:42:07 -05:00
Brian Beggs
141e0a93c7
Merge branch 'master' into dj18-release-merge
2015-11-19 13:36:13 -05:00
John Eskew
0e66fad1f2
Merge pull request #10667 from edx/dj18/update_all_repo_versions
...
Update the Django 1.8-upgraded repo versions.
2015-11-19 13:26:47 -05:00
Ned Batchelder
26a4670cea
Update version of django-splash
2015-11-19 12:34:42 -05:00
John Eskew
e4d8b58412
Bump tag & version of edx-organizations
2015-11-19 11:56:32 -05:00
Ned Batchelder
a65d599fae
Update XBlock version
2015-11-19 11:43:12 -05:00
John Eskew
698cea3f87
Remove errant 'and is'
2015-11-19 11:27:07 -05:00
John Eskew
6a58a9c120
edx-organizations
2015-11-19 11:18:40 -05:00
Ned Batchelder
66cbc6a6d1
Update django-wiki reference
2015-11-19 11:17:09 -05:00
Muhammad Ammar
11a183855c
update submissions and ora2 versions
2015-11-19 20:56:52 +05:00
Brian Beggs
0eabdcbfde
reverting ora2 tag in github.txt
2015-11-19 10:24:55 -05:00
Christine Lytwynec
290de4550d
Merge pull request #10671 from edx/clytwynec/jshint-diff
...
Fix paths for diff quality jshint comparison
2015-11-19 09:59:26 -05:00
Matt Drayer
794e403bf5
Merge pull request #10635 from edx/asadiqbal08/SOL-1416
...
asadiqbal08/SOL-1416 Certs: Remove Restriction on Date Setting
2015-11-19 09:48:20 -05:00
Matt Drayer
42c2cc4dbe
Merge pull request #10618 from edx/ziafazal/SOL-1386
...
SOL-1386: refactored cert web view code
2015-11-19 09:46:57 -05:00
Usman Khalid
219a2083ad
Tag lettuce
2015-11-19 19:35:12 +05:00
Brian Beggs
705bdaaace
updated edx-proctoring tag
2015-11-19 09:31:59 -05:00
John Eskew
6eda0f3410
Change django-oauth2-provider to match version
2015-11-19 09:29:30 -05:00
Ben Patterson
943fbdd4ca
Merge pull request #10665 from edx/benp/shard-7-rebal
...
Rebalance shard 7.
2015-11-19 09:21:13 -05:00
Usman Khalid
bc22f592c6
Merge pull request #10664 from edx/usman/regenerate-db-cache
...
Recreate db caches for bokchoy and lettuce
2015-11-19 19:20:21 +05:00
Usman Khalid
2ab255a304
Tag event-tracking.
2015-11-19 18:07:06 +05:00
John Eskew
a160f10797
Add version back to django-oauth2-provider
2015-11-18 15:54:31 -05:00
Christine Lytwynec
01d8a9bcad
Fix paths for diff quality jshint comparison
2015-11-18 15:52:27 -05:00
John Eskew
2408c0f0c7
django-pyfs
2015-11-18 15:50:01 -05:00
Ben Patterson
0d68cd01bf
Rebalance shard 7.
2015-11-18 15:30:50 -05:00
John Eskew
73bf93eefd
django-openid-auth
2015-11-18 15:27:16 -05:00
Brian Beggs
2977419fa6
Updated edx-val tag
2015-11-18 14:57:35 -05:00
Peter Fogg
7c4ac3dab3
Merge pull request #10668 from edx/peter-fogg/correct-payment-message
...
Add correct payment processor messages.
2015-11-18 14:56:11 -05:00
Brian Beggs
ece43db411
Updated edx-oauth2-provider tag
2015-11-18 14:55:43 -05:00
Brian Beggs
ecd0b5f244
set tag for edx-search
2015-11-18 14:41:32 -05:00
Brian Beggs
647c1257dd
updated edx-milestones to tag release-2015-11-17
2015-11-18 14:34:10 -05:00
John Eskew
41e9fd187b
django-oauth-provider take 2
2015-11-18 14:17:09 -05:00
Brian Beggs
8594896621
updated edx-reverification tag
2015-11-18 14:12:31 -05:00
Peter Fogg
60f6bbe929
Add correct payment processor messages.
...
(facepalm)
2015-11-18 14:05:37 -05:00
Peter Fogg
9d1290a180
Merge pull request #10662 from edx/peter-fogg/payment-processor-switches
...
Display an error message if no payment processors are available.
2015-11-18 14:00:37 -05:00
John Eskew
e3bb5137ea
django-oauth2-provider
2015-11-18 13:57:29 -05:00
Brian Beggs
ceaff54fcb
updated edx-organizations with django 1.8 release tag
2015-11-18 13:54:37 -05:00
Peter Fogg
284dc7a3c6
Display an error message if no payment processors are available.
...
Otto is gaining the ability to temporarily disable payment
processors. If all are disabled, no checkout buttons will appear on
the payment page, and so we need to communicate to the user that they
cann't pay right now but should try again later.
ECOM-2346
2015-11-18 12:55:09 -05:00
Sven Marnach
0054db103f
Merge pull request #10660 from open-craft/smarnach/coursekey-cleanup
...
Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app.
2015-11-18 17:27:18 +01:00
Usman Khalid
d8fd8ed678
Recreate db caches for bokchoy and lettuce
2015-11-18 21:08:05 +05:00
Brian Beggs
3e8bf6df47
Merge pull request #10661 from edx/dj18-release-merge-fixes
...
Django18 release merge fixes
2015-11-18 10:56:04 -05:00
Sven Marnach
3dcc3c4aae
Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app.
...
The preferred form is to use CourseKey.from_string() instead of
SlashSeparatedCourseKey.from_deprecated_string().
2015-11-18 16:37:57 +01:00
Sven Marnach
8f2ea979eb
Merge pull request #9616 from open-craft/smarnach/forum-vote-events
...
Emit analytics events when users vote on forum posts.
2015-11-18 16:36:08 +01:00
Sven Marnach
ef563e4285
Add tests for the discussion forum vote events.
2015-11-18 16:22:59 +01:00
Sven Marnach
cf5d276aea
Emit events when users vote on forum posts.
2015-11-18 16:21:50 +01:00
raeeschachar
3f76da0bef
Merge pull request #10657 from edx/raees/chrome-bok-choy-EditVisibilityModalTest
...
Fixed Chrome Bok Choy tests
2015-11-18 20:04:50 +05:00
muhammad-ammar
29acc3acfc
resolve merge conflicts
...
test fixes
2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201
Merge remote-tracking branch 'origin/release' into dj18-release-merge
...
Conflicts:
common/djangoapps/util/testing.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/teams/tests/test_views.py
openedx/core/djangoapps/programs/models.py
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
requirements/edx/github.txt
2015-11-18 17:53:44 +05:00
raeeschachar
dfa0fe2db7
Fixed Chrome Bok Choy tests
2015-11-18 17:24:22 +05:00
Awais Qureshi
06cd352e00
Merge pull request #10596 from edx/awais786/ECOM-2832-cache-programs-data
...
Awais786/ecom 2832 cache programs data
2015-11-18 12:40:21 +05:00
asadiqbal
88ae4ce257
SOL-1416
2015-11-18 11:56:49 +05:00
