Peter Pinch
fd8b757c90
Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook
...
Added pagination on grade book.
2015-11-13 12:37:34 -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
Ben Patterson
f81b7cefc9
Merge pull request #10582 from edx/saleem-latif/SOL-1384
...
saleem-latif/SOL-1384: Refactor certificates bok-choy pages to use PageObject
2015-11-13 12:23:11 -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
Peter Pinch
6687aa1a66
Merge pull request #10538 from mitocw/fix/aq/error/validation_on_start_time
...
Added validations for start and due date in Schedule tab inside CCX coach dashboard
2015-11-13 11:09:51 -05:00
Diana Huang
b3b1b7e476
Merge pull request #10610 from edx/diana/flaky-pdf-testbook-test-control
...
Start running the PDF Textbook test again.
2015-11-13 10:52:23 -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
Amir Qayyum Khan
3ee5acfc00
Added error message incase user specified start or due date without time and also added start date and due date comparison validation in ccx coach dashboard validation.
2015-11-13 20:25:19 +05:00
Peter Fogg
c5fac6ce68
Update LMS footer links.
...
SWAT-92
2015-11-13 10:08:10 -05:00
Muhammad Ammar
bfb69e560d
fix DRF format query param issue
...
TNL-3787
2015-11-13 20:06:59 +05:00
Diana Huang
de47bcde7e
Start running the PDF Textbook test again.
...
Remove redundant and skipped video test.
2015-11-13 10:02:51 -05:00
Matt Drayer
04c0b3aea9
Merge pull request #10595 from edx/saleem-latif/SOL-1333-feedback-changes
...
saleem-latif/SOL-1333: Invalidate Generated Certificates before regeneration
2015-11-13 09:18:54 -05:00
Matt Drayer
b932a202d8
Merge pull request #10593 from edx/asadiqbal08/SOL-1385
...
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
2015-11-13 09:15:18 -05:00
clrux
1587178525
Merge pull request #9974 from edx/clrux/ac-187
...
Video player (1 of 2): refreshing the UI
2015-11-13 08:06:43 -05:00
Saleem Latif
195178aa41
Refactor certificates bok-choy pages to use PageObject
2015-11-13 16:32:13 +05:00
asadiqbal
35d04bff89
SOL-1385
2015-11-13 15:23:02 +05:00
wajeeha-khalid
4ea70aeb19
MA-862; accept application/merge-patch+json for comment/thread update
2015-11-13 12:52:21 +05:00
Saleem Latif
15380a00f7
invalidate Generated Certificates before regeneration
2015-11-13 12:26:19 +05:00
Ben Patterson
dcc9172e7b
Use upstream nose instead of a fork.
...
The multiprocessing issues we had seen previously do not appear
when we use our combination of plugin settings for multiprocessing.
This makes it unnecessary to use a fork.
2015-11-12 20:34:55 -05:00
Chris Rodriguez
78c6a38ca6
LMS: new UI for video player + AFontGarde iconfonts
2015-11-12 16:37:29 -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
David Baumgold
685572cbee
Merge pull request #10581 from open-craft/courseware-error-stray-quotemark
...
Remove stray quotation mark from courseware-error text.
2015-11-12 14:58:21 -05:00
Matt Drayer
9cf0ab5be7
Merge pull request #10587 from edx/saleem-latif/SOL-1387
...
saleem-latif/SOL-1387: Custom 500 error message should only be seen for Preview
2015-11-12 13:16:15 -05:00
Saleem Latif
c068bc95cf
Custom 500 error message should only be seen for Preview
2015-11-12 11:31:25 +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
Davorin Šego
a8cca47cc9
Merge pull request #10455 from edx/search/optimization
...
Search performance (SOL-1030, SOL-1031)
2015-11-11 10:41:33 +01: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
Davorin Sego
a62e403ed8
Search optimization
...
Remove filtering by partition, course and user
Rewrite the LMS result processor to use the course blocks api
2015-11-11 09:38:00 +01:00
Matjaz Gregoric
fc2594e37b
Remove stray quotation mark from courseware-error text.
2015-11-11 09:02:50 +01: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
Cliff Dyer
ce99ca63fa
Merge pull request #10561 from edx/release
...
Verify patched fix merge back into master.
2015-11-10 14:10:05 -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
Matt Drayer
31c5b94548
Merge pull request #10518 from edx/saleem-latif/SOL-1333
...
SOL-1333: Add Cert Regenerate UI on Instructor Dash
2015-11-10 12:20:07 -05:00
Matt Drayer
fab6e00313
Merge pull request #10417 from edx/ziafazal/SOL-1358
...
ziafazal/SOL-1358: enabled web certs by default for all new courses
2015-11-10 10:56:13 -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
Zia Fazal
cbc57aae6b
enabled web certs by default
...
changing default value instead of setting it via fields
fixed broken test
fixed quality violation
following another approach
2015-11-10 18:51:14 +05:00
