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 |
|
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 |
|
Nimisha Asthagiri
|
cbf90677b7
|
Merge pull request #10412 from edx/mobile/course-blocks-app
Course Blocks App MA-1556
|
2015-11-05 17:14:32 -05:00 |
|
Nimisha Asthagiri
|
a78b94d83a
|
Transformer: ContentLibraryTransformer
|
2015-11-05 16:22:06 -05:00 |
|
Nimisha Asthagiri
|
d1674ca85f
|
Transformer: SplitTestTransformer
|
2015-11-05 16:22:05 -05:00 |
|
Nimisha Asthagiri
|
a1c7c5f7e9
|
Transformer: UserPartitionTransformer
|
2015-11-05 16:22:05 -05:00 |
|
Ben Patterson
|
7e8d3fdae5
|
Merge pull request #10519 from edx/benp/chrome-fix-certs
Fixes for chrome automation:
|
2015-11-05 15:24:38 -05:00 |
|
John Eskew
|
69e3385c83
|
Merge pull request #9920 from edx/jeskew/report_request_response_times
Add response times to get_many/set_many/delete_many.
|
2015-11-05 14:53:55 -05:00 |
|
Sarina Canelake
|
f4cdf026a4
|
Merge pull request #10526 from edx/sarina/20151105-update-translations
Update translations (autogenerated message)
|
2015-11-05 14:44:13 -05:00 |
|
Nimisha Asthagiri
|
dcdbd53e99
|
Transformer: StartDateTransformer
|
2015-11-05 14:41:42 -05:00 |
|
Nimisha Asthagiri
|
3f6baa992d
|
Transformer: VisibilityTransformer
|
2015-11-05 14:41:41 -05:00 |
|
Nimisha Asthagiri
|
a40d2b65d2
|
Course Blocks App MA-1556
|
2015-11-05 14:41:40 -05:00 |
|
Christine Lytwynec
|
f84ac6f94c
|
Merge pull request #10464 from edx/clytwynec/add-paver-test-a11y
Clytwynec/add paver test a11y
|
2015-11-05 14:35:11 -05:00 |
|
Mark Sadecki
|
e5fd2888b8
|
Merge pull request #10514 from edx/cptvitamin/AC-222
adds an accessible label to the search input and the search button
|
2015-11-05 14:21:12 -05:00 |
|
Sarina Canelake
|
73c4706edc
|
Update translations (autogenerated message)
|
2015-11-05 13:59:25 -05:00 |
|
Christine Lytwynec
|
468864a314
|
add paver test_a11y and a11y_coverage commands
|
2015-11-05 13:55:35 -05:00 |
|
Clinton Blackburn
|
b5718289dd
|
Merge pull request #10525 from edx/clintonb/zendesk-logging
Updated Zendesk error handling
|
2015-11-05 13:35:41 -05:00 |
|
Peter Fogg
|
4c934614d2
|
Merge pull request #10512 from edx/peter-fogg/date-summary-bugfix
Fix date summary blocks for courses without an end date.
|
2015-11-05 12:09:34 -05:00 |
|
Nimisha Asthagiri
|
7c480f93c6
|
Merge pull request #10245 from edx/jia/MA-1044
MA-1044 DiscussionTopic - Added bulk operations
|
2015-11-05 12:08:09 -05:00 |
|
David Baumgold
|
1aac73d614
|
Merge pull request #10493 from edx/db/kill-mitx-features
Remove legacy MITX_FEATURES reference
|
2015-11-05 11:56:35 -05:00 |
|
Clinton Blackburn
|
bb0effb75c
|
Updated Zendesk error handling
Properly logging exceptions so we have the complete stacktrace.
ECOM-2792
|
2015-11-05 11:52:53 -05:00 |
|
Matt Drayer
|
7256bd1b02
|
Merge pull request #10522 from edx/ziafazal/SOL-1377
SOL-1377: allow certifcate exception to be added for multiple courses
|
2015-11-05 11:35:17 -05:00 |
|
tasawernawaz
|
e978bcca96
|
Merge pull request #10502 from edx/tasawer/bugfix/ecom-2516-add-checkout-error-page
Added checkout error page.
|
2015-11-05 21:22:52 +05:00 |
|
John Eskew
|
ac05012d23
|
Add response times to get_many/set_many/delete_many.
|
2015-11-05 11:02:49 -05:00 |
|
Andy Armstrong
|
0785aeb959
|
Merge pull request #10426 from edx/andya/update-draggabilly
Upgrade draggabilly.js to fix Firefox iframe bug
|
2015-11-05 11:01:35 -05:00 |
|
Zia Fazal
|
941664294e
|
allow exception to be added for multiple courses
added unit test to test certs exception same user different courses scenario
|
2015-11-05 20:53:18 +05:00 |
|
Ben Patterson
|
183fce375e
|
Merge pull request #10508 from edx/benp/bokchoy_default_store_envvar
Allow bok-choy default_store to be controlled by env vars.
|
2015-11-05 10:21:42 -05:00 |
|
Andy Armstrong
|
18dabc3312
|
Upgrade draggabilly.js to fix Firefox iframe bug
TNL-3627
|
2015-11-05 10:10:39 -05:00 |
|
Ben Patterson
|
947538bb1f
|
Merge pull request #10507 from edx/benp/mp-learner-profile-events
Refactor for multiprocessing.
|
2015-11-05 09:18:48 -05:00 |
|