Kevin Falcone
3c1109fb82
Merge pull request #10686 from edx/jibsheet/pin-edx-submissions-for-release
...
Pin to what we have in production
2015-11-19 19:06:13 -05:00
Kevin Falcone
84328c13f6
Pin to what we have in production
...
This was installing a newer version, with a migration, which we do not
want for a hotfix.
2015-11-19 17:00:18 -05:00
Adam Palay
5b5cf7d3b0
Fix login redirect when user is logged out while answering a question (TNL-3789)
2015-11-19 10:28:58 -05:00
Brian Beggs
69dc51859e
Merge branch 'django-upgrade/1.8' into release
2015-11-17 15:57:48 -05:00
Brian Beggs
2c1f7fd374
Merge pull request #10629 from edx/bbeggs/dj18-linkedin
...
Disable posting to LinkedIn feature for microsites until we can suppo…
2015-11-13 13:13:51 -05:00
Chris Dodge
02550cb368
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-13 12:57:10 -05:00
Ned Batchelder
2f0b8497cb
Merge pull request #10626 from edx/ned/dj18-cms-secret-key
...
Make sure Studio has a secret key
2015-11-13 12:32:54 -05:00
Ned Batchelder
ccc6e5077d
Make sure Studio has a secret key
2015-11-13 12:30:54 -05:00
Ned Batchelder
415d31e96b
Merge pull request #10625 from edx/ned/dj18-use-correct-ora2
...
Use correct version of ora2
2015-11-13 12:16:51 -05:00
Ned Batchelder
707675d720
Use correct version of ora2
2015-11-13 12:06:52 -05:00
Ned Batchelder
1e6c5b7dd6
Merge pull request #10620 from edx/ammar/fix-drf-format-parm-issue
...
Fix DRF format query param issue
2015-11-13 10:52:05 -05:00
Muhammad Ammar
bfb69e560d
fix DRF format query param issue
...
TNL-3787
2015-11-13 20:06:59 +05:00
Ned Batchelder
a09012c26d
Merge pull request #10607 from edx/ned/dj18-disable-wiki-notifications
...
Disable wiki notifications
2015-11-12 16:30:31 -05:00
Ned Batchelder
ca94745c05
Merge pull request #10608 from edx/ned/dj18-fix-django-storages-uninstall
...
Fix the uninstall of django-storages
2015-11-12 15:56:34 -05:00
Ned Batchelder
d3f9e1a7b2
Fix the uninstall of django-storages
2015-11-12 15:53:25 -05:00
Ned Batchelder
0eea9ad48b
Disable wiki notifications
...
This is an expedient fix to a problem with migrations during the Django
1.8 upgrade.
2015-11-12 15:28:54 -05:00
Ned Batchelder
bcf789bdc3
Merge pull request #10590 from edx/ned/dj18-fixed-data-migrations
...
More-correct data migrations
2015-11-11 09:41:56 -05:00
Ned Batchelder
e7fcc743c0
More-correct data migrations
...
We need to be sure the migrations will work even in the presence of data
from the future. get_or_create is a problem, because if the data
already exists, there could be more than one record, even if this
migration only creates one.
2015-11-11 09:03:21 -05:00
Usman Khalid
8bac42a1b7
Merge pull request #10588 from edx/update-expected-version
...
Update expected_version.
2015-11-11 18:47:20 +05:00
Usman Khalid
fb9526b9cd
Update expected_version.
2015-11-11 18:39:55 +05:00
Muhammad Ammar
d8403c1d10
Merge pull request #10583 from edx/ammar/fix-another-RemovedInDjango19Warning
...
Fix RemovedInDjango19Warning
2015-11-11 15:54:01 +05:00
Muhammad Ammar
2bd58aa508
Merge pull request #10584 from edx/ammar/uninstall-django-storages
...
add django-storages into uninstall list
2015-11-11 15:53:28 +05:00
muhammad-ammar
a6ec8cd2a4
add django-storages into uninstall list
2015-11-11 14:20:01 +05:00
muhammad-ammar
f55f9af891
Fix RemovedInDjango19Warning
2015-11-11 13:58:07 +05:00
Ned Batchelder
835eccaf67
Use corrected migrations from edx-submissions
2015-11-10 23:01:38 -05:00
Ned Batchelder
680271d466
Correct the darklang migration, since many darklang configs can exist.
2015-11-10 21:04:25 -05:00
Ned Batchelder
607f3bf43a
Use a branch instead of an unpushed tag for django-splash
2015-11-10 15:42:39 -05:00
Usman Khalid
6cb62f2697
Rebase upgrade Django to v1.8.5
...
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
chrisndodge
3bd9f95ace
Merge pull request #10557 from edx/hotfix/2015-11-10
...
Disable posting to LinkedIn feature for microsites until we can suppo…
2015-11-10 13:04:22 -05:00
Chris Dodge
eeb8c48922
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-10 09:41:43 -05:00
Peter Fogg
7b801c66ca
Remove check for course home page improvements.
2015-11-09 14:43:53 -05:00
Adam
e042ee2325
Merge pull request #10546 from edx/revert-disable-check-button-on-save
...
Revert disable check button on save
2015-11-06 13:22:19 -05:00
Andy Armstrong
a3ff4d50e8
Merge pull request #10534 from edx/andya/fix-studio-videos
...
Fix optimizing of draggabilly and json2
2015-11-06 12:12:44 -05:00
Adam Palay
33d9185d5d
Revert "Disable submit button on save click"
...
This reverts commit 99cca05730
2015-11-06 11:34:33 -05:00
Adam Palay
bc87ec15a9
Revert "add test for disabling check button while clicking save"
...
This reverts commit bc6caea6a6
2015-11-06 11:33:52 -05:00
Clinton Blackburn
7de9252e41
Merge pull request #10535 from edx/clintonb/enrollment-admin-fix
...
Fixed admin issues
2015-11-06 09:56:32 -05:00
chrisndodge
ee29e11ec2
Merge pull request #10533 from edx/cdodge/adjust-report-task-routing
...
change 'routing' for some reports which go to potentially backlogged …
2015-11-06 09:45:20 -05:00
Andy Armstrong
7a1469633f
Fix optimizing of draggabilly and json2
2015-11-06 09:40:20 -05:00
Matt Drayer
10ed76a890
Merge pull request #10543 from edx/asadiqbal08/SOL-1379_point_to_release
...
asadiqbal08/SOL-1379 - Removed the limit on the number of lines in a title.
2015-11-06 09:36:32 -05:00
asadiqbal
13508c7681
SOL-1379
2015-11-06 18:45:36 +05:00
Chris Dodge
4216eaf5c3
change 'routing' for some reports which go to potentially backlogged queues
2015-11-06 08:29:17 -05:00
Clinton Blackburn
afd682e224
Fixed admin issues
...
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
2015-11-06 01:49:22 -05:00
Cliff Dyer
222bdd988b
Merge pull request #10411 from edx/mobile/course-blocks-api
...
Course Blocks API
2015-11-05 19:16:59 -05:00
Nimisha Asthagiri
46523b1061
Transformer: ProctoredExamTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
0698076440
Transformer: StudentViewTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
ced7fde37f
Transformer: BlockNavigationTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
9abebe0599
Transformer: BlockDepthTransformer
2015-11-05 23:29:11 +00:00
Nimisha Asthagiri
75a2355b74
Transformer: BlockCountsTransformer
2015-11-05 23:29:11 +00:00
Nimisha Asthagiri
ae4bc5d0c5
Transformer: BlocksAPITransformer
2015-11-05 22:30:44 +00:00
Nimisha Asthagiri
00e9237153
Course Blocks API
2015-11-05 22:30:44 +00:00
