Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

35515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Braden MacDonald
244b8ab9de Merge pull request #10302 from open-craft/sso-login-unactivated 
SSO - Allow users to sign in with unactivated accounts (SOL-1324)
 2015-11-17 18:37:40 -08:00
Brian Beggs
69dc51859e Merge branch 'django-upgrade/1.8' into release 2015-11-17 15:57:48 -05:00
Nimisha Asthagiri
1870d4e55a Merge pull request #10613 from edx/mobile/unit-test-MA-1624 
MA-1624 Unit tests for User Partition Transformer
 2015-11-17 11:08:27 -05:00
Awais
86c66f5534 Adding cache implementation for the programs api. 
ECOM-2832
 2015-11-17 20:25:27 +05:00
Matt Drayer
bb91aeabcb Merge pull request #10646 from edx/asadiqbal08/SOL-1380-release-tag 
SOL-1380 release tag update in github.txt
 2015-11-17 10:12:17 -05:00
wajeeha-khalid
3287e811db Merge pull request #10567 from edx/jia/MA-860 
MA-860; No moderator permissions on closed thread
 2015-11-17 18:24:48 +05:00
Usman Khalid
9c2eb1f04a Merge pull request #10640 from edx/usman/wiki-preview-fix 
Use new django-pipeline tags.
 2015-11-17 15:59:07 +05:00
Zia Fazal
c5912ea367 refactored code as described in SOL-1386 
further code refactoring and added test

fixed tests and internationalisation issues

added translators comment and pulled text to same line

changes based on feedback

updated doctoring to make it more unstandable

further optimizations
 2015-11-17 15:44:46 +05:00
wajeeha-khalid
7de5882372 MA-860; No moderator permissions on closed thread 2015-11-17 14:02:35 +05:00
asadiqbal
290e577ea7 SOL-1380 release tag update in github.txt 2015-11-17 13:35:31 +05:00
wajeeha-khalid
9fcc1c32a1 Merge pull request #10586 from edx/jia/MA-862 
MA-862; accept application/merge-patch+json for comment/thread update
 2015-11-17 11:01:37 +05:00
Braden MacDonald
9ccf78ed06 Add some asserts and explanations, per review 2015-11-16 17:18:54 -08:00
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