Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,380 Commits 1 Branch 0 Tags
41f8d76284b2d0766e4dec7debd28e1bbccbfd6c
Commit Graph

15338 Commits

Author SHA1 Message Date
Nimisha Asthagiri
41f8d76284 Merge pull request #13515 from edx/course_blocks/update_management_command 
Enhancements to generate_course_blocks management command
 2016-11-17 11:45:46 -05:00
Gregory Martin
467dc45556 Merge pull request #13952 from edx/yro_refactor-course-info-page 
Refactor info.html page datetime rendering
 2016-11-17 11:29:45 -05:00
Eric Fischer
6fb5eeb390 Merge pull request #13993 from edx/efischer/tnl-5471 
Remove Extraneous Subsection Grade DatabaseError protection
 2016-11-17 09:42:07 -05:00
Gregory Martin
707371e1d7 Refactor info.html page datetime rendering 2016-11-17 08:54:08 -05:00
Gregory Martin
14c01e3a49 Merge pull request #14007 from edx/release 
Release Nov 16th, 2016
 2016-11-17 08:49:26 -05:00
Albert St. Aubin
866399ba05 Changes for ui correctness state when saving a problem 
TNL-1955
 2016-11-16 12:30:04 -05:00
alisan617
47eee23814 Merge pull request #13999 from edx/alisan/fix-pr-13843-separate-discussion-tab-ui-view 
Fix the Discussion Editing Post error
 2016-11-16 10:14:27 -05:00
Gregory Martin
b814678933 register dateutil_factory in request.js 2016-11-16 07:18:19 -05:00
Douglas Hall
b65d245b29 Merge pull request #13979 from edx/hasnain-naveed/WL-633 
WL-633 | refactor pay_and_verify.html template.
 2016-11-15 16:50:35 -05:00
alisan617
cb14d1598e discussion course settings change 2016-11-15 15:05:28 -05:00
alisan617
57fa123f5e Revert "Revert PR#13843" 2016-11-15 14:46:57 -05:00
sanfordstudent
dd809dfdc3 Merge pull request #13961 from edx/sstudent/TNL-5895 
Add first_attempted to subsection grades data model
 2016-11-15 11:41:19 -05:00
Eric Fischer
b9adb42f23 Remove Extraneous Subsection Grade DatabaseError protection 
These lines are now being run in async tasks anyways, so we can remove this
decorator and rely on the async task to retry itself. Also cleans up a few
pylint violoations noticed in subsection_grade.py.

Tests have been updated to match new behavior.
 2016-11-15 10:49:32 -05:00
Sanford Student
6d50044ec4 adding first attempted timestamp to subsection grades 
for TNL-5895
 2016-11-15 10:01:44 -05:00
Hasnain
3c29ecbf57 WL-633 | refactor pay_and_verify.html template. 2016-11-15 11:01:37 +00:00
wajeeha-khalid
b837427bd5 MA-2554: DiscussionAPI - fixed unread_comment_count 2016-11-15 11:33:07 +05:00
alisan617
18e7322e8d Revert "Refactor discussion tab UI code into parts to be reusable for inline discussions" 
This reverts commit e80d9b5792.
 2016-11-14 21:43:03 -05:00
Gregory Martin
f8b90f2235 Merge pull request #13983 from edx/yro_resolve_translation_settings 
fix concat string for translator
 2016-11-14 18:33:54 -05:00
Gregory Martin
5b4048ddff fix for send to transifex 2016-11-14 14:53:59 -05:00
Gregory Martin
1fa805a052 js bundling error 2016-11-14 14:33:23 -05:00
Clinton Blackburn
b8bc4c8700 Merge pull request #13950 from edx/clintonb/verification-admin-update 
Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for copy_id_photo_from field
 2016-11-14 13:02:19 -05:00
Eugeny Kolpakov
4e773095c3 Merge pull request #13941 from edx/hash-update/drag-and-drop-v2 
Hash update: Bumped DnDv2 to v2.0.12
 2016-11-14 10:17:19 +03:00
wajeeha-khalid
896856fe76 Merge pull request #13874 from edx/jia/MA-2871 
MA-2871: return response_count on thread patch
 2016-11-11 10:22:46 +05:00
Brian Jacobel
09947ab094 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 18:35:51 -05:00
Brian Jacobel
d39f7197c3 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 15:49:33 -05:00
Douglas Hall
b4c61e87aa Merge pull request #13967 from edx/ibrahimahmed443/WL-785-password-reset-message 
make password reset message customizable
 2016-11-10 13:34:13 -05:00
Cliff Dyer
2c86a6ddd6 Merge pull request #13963 from edx/beryl/date-passed 
Add date_passed column to PersistentCourseGrade model
 2016-11-10 11:26:19 -05:00
Ned Batchelder
781d3c9b30 Merge pull request #13925 from stvstnfrd/up/settings/zendesk 
Fallback to default ZENDESK_URL when not in JSON
 2016-11-10 11:12:49 -05:00
J. Cliff Dyer
2bc35396fb Add date_passed column to PersistentCourseGrade model. 
The column is populated with the current timestamp when a passing grade
is persisted for the first time.  "Passing grade" is defined as having a
non-blank value for letter_grade.

TNL-5888
 2016-11-10 10:27:03 -05:00
Awais Jibran
e26849891d Merge pull request #13939 from edx/aj/fix-discussion-user-roles 
Fix discussion user roles
 2016-11-10 18:41:12 +05:00
Ibrahim
daf6314782 make password reset message customizable 2016-11-10 17:18:17 +05:00
Awais Jibran
92b99c7dc3 Fix discussion user roles 2016-11-10 17:11:52 +05:00
Muhammad Ammar
71cc602d93 Merge pull request #13863 from edx/ammar/tnl-4163-reduce-annotatorjs-search-calls 
Single search request to fetch notes per unit
 2016-11-10 16:23:59 +05:00
Clinton Blackburn
5122b27967 Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for copy_id_photo_from field 2016-11-09 20:44:35 -05:00
alisan617
edd66a7f46 Merge pull request #13951 from edx/alisan/fix-minor-wrap-new-post-discussion 
Teams tab inline discussion new post form text wrap
 2016-11-09 20:26:54 -05:00
Ned Batchelder
496aaa5455 Merge pull request #13959 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-11-09 18:18:37 -05:00
Ned Batchelder
8a1825a4d0 Update translations (autogenerated message) 2016-11-09 22:24:10 +00:00
Ned Batchelder
6bf2c37144 Update translations (autogenerated message) 2016-11-09 21:47:55 +00:00
Douglas Hall
92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 
WL-798 Allow for hiding course mode banners on student dashboard
 2016-11-09 14:36:04 -05:00
attiyaishaque
76e1d4a75c TNL-5621 Fix discussion topics in MIT course. 2016-11-09 22:26:48 +05:00
M. Rehan
c873be0f55 Merge pull request #13868 from edx/mrehan/tnl-5721-nonetype-no-attr-course-id 
TNL-5721 – Fix check source module access before appending it to required modules
 2016-11-09 22:19:59 +05:00
Douglas Hall
ec7245537a Allow for not showing course modes on student dashboard 2016-11-09 11:39:29 -05:00
Ned Batchelder
a0c5cc7e4f Update translations (autogenerated message) 2016-11-09 15:55:41 +00:00
Qubad786
c7364a06a4 handle if required module(s) for conditional module are staff only 2016-11-09 20:11:33 +05:00
wajeeha-khalid
7ae05625ee MA-2871: return response_count on thread patch 2016-11-09 15:07:00 +05:00
E. Kolpakov
f6ac90e873 Bumped DnDv2 to v2.0.12 (+fixed grading test, as DnDv2 now properly participates in scoring) 2016-11-09 12:35:57 +03:00
Nimisha Asthagiri
e6240c56fc Update generate_course_blocks management command. 2016-11-08 19:47:21 -05:00
Nimisha Asthagiri
266bfb1ab3 Optimize async grades computation 
TNL-5909
 2016-11-08 19:22:30 -05:00
alisan617
f47b4cd8ff no float 2016-11-08 15:46:09 -05:00
alisan617
371c5a244e Merge pull request #13843 from edx/alisan/testing-discussion 
Refactor discussion tab UI code into parts to be reusable for inline discussions TNL-5669
 2016-11-08 15:30:39 -05:00