Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
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
Matt Drayer
7a7cd6e660 Merge pull request #10459 from edx/ziafazal/SOL-1346 
SOL-1346:convert string to bytestring before passing it to urllib.quote_plus
 2015-11-04 17:07:46 -05:00
Robert Raposa
b76981234d Merge pull request #10484 from edx/robrap/TNL-2646 
TNL-2646: Escape json in Studio
 2015-11-04 14:28:25 -05:00
Peter Fogg
acf5bb57cb Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes 
Course pacing template changes.
 2015-11-04 14:11:49 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00
Peter Pinch
01f1c3a160 Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx 
Disabled auto enroll in ccx coach's enrollment tab
 2015-11-04 11:28:01 -05:00
Peter Fogg
5bd6e829e7 Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure 
Fix `withData` and `withConfiguration` helpers.
 2015-11-04 10:21:30 -05:00
Peter Fogg
b98c89117c Course pacing template changes. 
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
 2015-11-04 09:59:58 -05:00
Renzo Lucioni
2f0e663581 Use ugettext_noop instead of lambdas assigned to the underscore 
Replaces instances of an old hack with the more clear ugettext_noop.
 2015-11-04 09:17:18 -05:00
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Zia Fazal
fbc8a13410 convert string to bytestring before passing it to urllib.quote_plus 
further improvement in handling of unicode data
 2015-11-04 11:22:36 +05:00
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat 
Remove chat feature
 2015-11-03 11:11:23 -05:00