Commit Graph

6309 Commits

Author SHA1 Message Date
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
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 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
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
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
Saleem Latif
c068bc95cf Custom 500 error message should only be seen for Preview 2015-11-12 11:31:25 +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
Christopher Lee
c5138aae6b Merge pull request #10549 from edx/clee/dapi_allow_inactive_users
Clee/dapi allow inactive users
2015-11-09 13:55:50 -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
christopher lee
0646f9bfcf MA-1637 Discussion API now uses the view_auth_classes for permissions
Added missing unit tests.
2015-11-09 13:05:37 -05:00
Sarina Canelake
2ae8ee2666 Merge pull request #10395 from mitocw/feature/skm/add_max_score#95
Optionally add max and actual score for assignments to get_student_grade_summary_data output.
2015-11-09 12:05:46 -05:00
Cliff Dyer
625b859c21 Merge pull request #10491 from edx/mobile/profile-default-privacy
Mobile/profile default privacy MA-1580
2015-11-06 16:44:00 -05:00
Peter Fogg
e068765d3c Merge pull request #10521 from edx/peter-fogg/update-date-display
Update date summary blocks.
2015-11-06 14:46:37 -05:00
Shawn Milochik
5d8830096a Added max score to output of get_student_grade_summary_data.
This will put the actual score and actual max score in scope for
the the return_csv function, so actual scores can be dumped.

The ultimate goal is to provide this data in the CSV dump that is
passed to Stellar via pylmod.

This is PR #10395 on edX, and issue 95 on mitocw's edx fork.

https://github.com/edx/edx-platform/pull/10395

https://github.com/mitocw/edx-platform/issues/95
2015-11-06 12:49:19 -05:00
J. Cliff Dyer
00b3051b73 Make sure proper logic is used for getting account privacy. 2015-11-06 15:53:08 +00:00
Peter Fogg
270dc22c1f Update display of dates on Course Home page.
Adds UTC time to the "Today's Date" block, and a fuzzy/relative
timestamp to all other displayed dates.

ECOM-2807
2015-11-06 09:54:13 -05:00
Chris Dodge
4216eaf5c3 change 'routing' for some reports which go to potentially backlogged queues 2015-11-06 08:29:17 -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
Nimisha Asthagiri
46523b1061 Transformer: ProctoredExamTransformer 2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
0698076440 Transformer: StudentViewTransformer 2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
ced7fde37f Transformer: BlockNavigationTransformer 2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
9abebe0599 Transformer: BlockDepthTransformer 2015-11-05 23:29:11 +00:00
Nimisha Asthagiri
75a2355b74 Transformer: BlockCountsTransformer 2015-11-05 23:29:11 +00:00
Nimisha Asthagiri
ae4bc5d0c5 Transformer: BlocksAPITransformer 2015-11-05 22:30:44 +00:00
Nimisha Asthagiri
00e9237153 Course Blocks API 2015-11-05 22:30:44 +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
Nimisha Asthagiri
d1674ca85f Transformer: SplitTestTransformer 2015-11-05 16:22:05 -05:00
Nimisha Asthagiri
a1c7c5f7e9 Transformer: UserPartitionTransformer 2015-11-05 16:22:05 -05:00
John Eskew
69e3385c83 Merge pull request #9920 from edx/jeskew/report_request_response_times
Add response times to get_many/set_many/delete_many.
2015-11-05 14:53:55 -05:00
Nimisha Asthagiri
dcdbd53e99 Transformer: StartDateTransformer 2015-11-05 14:41:42 -05:00
Nimisha Asthagiri
3f6baa992d Transformer: VisibilityTransformer 2015-11-05 14:41:41 -05:00
Nimisha Asthagiri
a40d2b65d2 Course Blocks App MA-1556 2015-11-05 14:41:40 -05:00
Peter Fogg
4c934614d2 Merge pull request #10512 from edx/peter-fogg/date-summary-bugfix
Fix date summary blocks for courses without an end date.
2015-11-05 12:09:34 -05:00
Nimisha Asthagiri
7c480f93c6 Merge pull request #10245 from edx/jia/MA-1044
MA-1044 DiscussionTopic - Added bulk operations
2015-11-05 12:08:09 -05:00
Matt Drayer
7256bd1b02 Merge pull request #10522 from edx/ziafazal/SOL-1377
SOL-1377: allow certifcate exception to be added for multiple courses
2015-11-05 11:35:17 -05:00
John Eskew
ac05012d23 Add response times to get_many/set_many/delete_many. 2015-11-05 11:02:49 -05:00
Zia Fazal
941664294e allow exception to be added for multiple courses
added unit test to test certs exception same user different courses scenario
2015-11-05 20:53:18 +05:00
Peter Fogg
445386233e Fix date summary blocks for courses without an end date.
I also took this opportunity to do some small cleanups of the date
summary code, specifically converting some attributes to properties in
order to remove a Pylint directive disabling warnings about missing
docstrings.
2015-11-05 09:11:10 -05:00
wajeeha-khalid
509b2a4453 MA-1044 DiscussionTopic - Added bulk operations 2015-11-05 18:24:20 +05:00
Tasawer
06a91979e1 Added checkout error page.
ECOM-2516
2015-11-05 07:26:13 +00:00