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

12795 Commits

Author SHA1 Message Date
Usman Khalid
dc7b57f459 Cleanup some settings. 2015-11-20 18:18:32 +05:00
Nimisha Asthagiri
a2675fe0b4 Merge pull request #10649 from edx/jia/MA-1190 
MA-1190; patch 'read' attribute for thread
 2015-11-19 15:27:50 -05:00
Alison Hodges
02b43c05fc Merge pull request #10562 from edx/ahodges/DOC-2390 
Updates the example locations to split format
 2015-11-19 14:55:29 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
Matt Drayer
42c2cc4dbe Merge pull request #10618 from edx/ziafazal/SOL-1386 
SOL-1386: refactored cert web view code
 2015-11-19 09:46:57 -05:00
wajeeha-khalid
e662e869d6 MA-1190; patch 'read' attribute for thread 2015-11-19 15:33:35 +05:00
Peter Fogg
60f6bbe929 Add correct payment processor messages. 
(facepalm)
 2015-11-18 14:05:37 -05:00
Peter Fogg
9d1290a180 Merge pull request #10662 from edx/peter-fogg/payment-processor-switches 
Display an error message if no payment processors are available.
 2015-11-18 14:00:37 -05:00
Peter Fogg
284dc7a3c6 Display an error message if no payment processors are available. 
Otto is gaining the ability to temporarily disable payment
processors. If all are disabled, no checkout buttons will appear on
the payment page, and so we need to communicate to the user that they
cann't pay right now but should try again later.

ECOM-2346
 2015-11-18 12:55:09 -05:00
Sven Marnach
3dcc3c4aae Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app. 
The preferred form is to use CourseKey.from_string() instead of
SlashSeparatedCourseKey.from_deprecated_string().
 2015-11-18 16:37:57 +01:00
Sven Marnach
ef563e4285 Add tests for the discussion forum vote events. 2015-11-18 16:22:59 +01:00
Sven Marnach
cf5d276aea Emit events when users vote on forum posts. 2015-11-18 16:21:50 +01: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
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
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
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
Nimisha Asthagiri
521568937d MA-1624 Unit tests for User Partition Transformer. 2015-11-16 16:30:38 -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
Peter Fogg
c8fbadb24a Show a message when logging in with no internet connection. 
ECOM-2890
 2015-11-13 15:58:14 -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
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
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
Muhammad Ammar
bfb69e560d fix DRF format query param issue 
TNL-3787
 2015-11-13 20:06:59 +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
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
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -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
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
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
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
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
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
Amir Qayyum Khan
44b409ebff Added pagination on grade book. 2015-11-10 15:18:15 +05:00
Saleem Latif
094ed32176 Added ability to regenerate certificates from Instructor Dashboard 2015-11-10 15:14:55 +05:00
Afeef Janjua
ed6e46453c allow reverification for pending status ('must_retry', 'submitted') 2015-11-10 13:23:52 +05:00