Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,497 Commits 1 Branch 0 Tags
b839b048ee600aa83aa4c19a38e01cd86ed583ee
Commit Graph

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Braden MacDonald
40448e44fa Address review comments and test failure 2015-11-16 16:11:00 -08:00
Braden MacDonald
f1bfa56884 Clean up integration tests, test logging in without activation 2015-11-16 16:11:00 -08:00
Braden MacDonald
90cdb91391 Allow users to login via third_party_auth even if not activated 2015-11-16 16:10:57 -08:00
Nimisha Asthagiri
521568937d MA-1624 Unit tests for User Partition Transformer. 2015-11-16 16:30:38 -05:00
Christina Roberts
08087861e1 Merge pull request #10643 from edx/christina/fix-remove-icons 
Correct the remove icon.
 2015-11-16 14:13:08 -05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Sarina Canelake
79eea58ba6 Merge pull request #10483 from mitocw/gdm_feature_ccx_api_#122 
Enforced maximum amount of students for CCX
 2015-11-16 11:08:52 -05:00
Usman Khalid
4c608077d7 Use new django-pipeline tags. 2015-11-16 20:57:13 +05:00
Giovanni Di Milia
64acf4846b Enforced maximum amount of students for CCX 
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
 2015-11-16 10:10:37 -05:00
Christine Lytwynec
32d0fc7c26 Merge pull request #10622 from edx/clytwynec/jshint 
Clytwynec/jshint
 2015-11-16 08:59:41 -05:00
Adnan Ghaffar
fb34877212 Merge pull request #10599 from edx/adnan/chrome-bok-choy-fixes 
Adnan/chrome bok choy fixes
 2015-11-16 16:02:16 +05:00
Adnan Ghaffar
7dac728ee9 adding fixed tests for chrome 2015-11-16 14:47:12 +05:00
Peter Fogg
4cba4007fd Merge pull request #10633 from edx/peter-fogg/login-no-internet 
Show a message when logging in with no internet connection.
 2015-11-13 16:51:32 -05:00
Christine Lytwynec
9aa1f2b73f use .jshintignore instead of hardcoded directory list 2015-11-13 16:19:02 -05:00
Peter Fogg
c8fbadb24a Show a message when logging in with no internet connection. 
ECOM-2890
 2015-11-13 15:58:14 -05:00
Ben Patterson
b05c4af41c Merge pull request #10621 from edx/benp/back-to-upstream-nose 
Use upstream nose instead of a fork.
 2015-11-13 13:49:59 -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
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