Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,918 Commits 1 Branch 0 Tags
72fbcdc606a0a1fb01ac4b8e81868e58cd6d7233
Commit Graph

12250 Commits

Author SHA1 Message Date
Sarina Canelake
256dc5b6f8 Reword default about page questions 2015-11-19 15:44:54 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
Usman Khalid
bc22f592c6 Merge pull request #10664 from edx/usman/regenerate-db-cache 
Recreate db caches for bokchoy and lettuce
 2015-11-19 19:20:21 +05:00
Ben Patterson
0d68cd01bf Rebalance shard 7. 2015-11-18 15:30:50 -05:00
Usman Khalid
d8fd8ed678 Recreate db caches for bokchoy and lettuce 2015-11-18 21:08:05 +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
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
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
Adnan Ghaffar
7dac728ee9 adding fixed tests for chrome 2015-11-16 14:47:12 +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
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
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
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
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
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -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
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
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
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
Ned Batchelder
680271d466 Correct the darklang migration, since many darklang configs can exist. 2015-11-10 21:04:25 -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
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
Cliff Dyer
27b85fb737 Merge pull request #10554 from edx/release 
Verifying release branch for release-2015-11-09
 2015-11-09 13:26:01 -05:00
louyihua
73d8f06499 Fix gettext guidance violation 
1. No string concatenation should be used in the gettext function.
2. Some extra parentheses should be used in coffee script, to avoid the following situation: in coffee script, the call ```gettext "text to be extracted" + "text should not be extracted"``` will be translated into ```gettext("text to be extracted" + "text should not be extracted")``` rather than ```gettext("text to be extracted") + "text should not be extracted"```.
 2015-11-07 13:55:10 +08: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
Christine Lytwynec
1ca0fa2b57 Merge pull request #10328 from edx/clytwynec/custom-a11y-rules-part2 
Clytwynec/custom a11y rules part2
 2015-11-06 11:17:15 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
David Baumgold
8ce94d2bc0 Merge pull request #10523 from edx/db/fix-cc-flaky-tests 
Fix flaky tests related to creative commons
 2015-11-06 09:20:24 -05:00
Syed Hasan raza
ab8aedc298 Merge pull request #9924 from edx/shr/bug/TNL-3168-import_from_youtube_html5_subs 
html5 transcript exists
 2015-11-06 04:28:02 -08:00
Syed Hassan Raza
a8c80535d3 html5 transcript sync 2015-11-06 16:32:13 -08: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
Nimisha Asthagiri
0698076440 Transformer: StudentViewTransformer 2015-11-05 23:29:12 +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
Christine Lytwynec
a40f286ecf Updating a11y tests 2015-11-05 16:09:06 -05:00