Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,339 Commits 1 Branch 0 Tags
06b3b401eaae329c3b80a06c9984f8b86809f708
Commit Graph

15316 Commits

Author SHA1 Message Date
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
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
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
Brian Jacobel
09947ab094 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 18:35:51 -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
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
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
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
muhammad-ammar
753d78210a single search request to fetch notes for HTML components per unit 
TNL-4163
 2016-11-09 01:28:13 +05:00
sanfordstudent
1c5d1f1c0d Merge pull request #13867 from edx/efischer/grades_bug_bash 
Update course grade query parameters and check scores when updating subsection grade
 2016-11-08 15:16:47 -05:00
Brian Jacobel
f796cf7262 Merge pull request #13860 from edx/bjacobel/susy 
Update to UXPL 0.17 (grids compilation performance work)
 2016-11-08 15:15:45 -05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
alisan617
e80d9b5792 Refactor discussion tab UI code into parts to be reusable for inline discussions 
TNL-5669
 2016-11-08 14:17:01 -05:00
Sanford Student
6e52fd791f fixes from robust grades bug bash 
Update course grade query parameters and check scores when updating subsection grade

For TNL-5861
 2016-11-08 14:16:03 -05:00
Jesse Zoldak
3027db4b5b Revert "Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field" 2016-11-08 13:31:14 -05:00
Clinton Blackburn
fd0880ae23 Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field 2016-11-08 11:38:27 -05:00
Gregory Martin
08c5a35899 Merge pull request #13923 from edx/yro_fix-PR-13794 
Yro fix PR 13794
 2016-11-08 10:06:16 -05:00
Noraiz
bc3cbf57b5 Video download button does not appear in course (TNL-5769) 2016-11-08 12:39:03 +05:00
Gregory Martin
e05cb31b87 fix leading zero bok choy 2016-11-07 18:43:16 -05:00
Brian Jacobel
697ec3402d Migrate Discussions, Certificates and Programs to susy-less grids 2016-11-07 17:13:58 -05:00
Gregory Martin
f0cd29f02a Revert "Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil" 
This reverts commit d59ab18b27, reversing
changes made to 0ebab35e89.
 2016-11-07 17:04:13 -05:00
sanfordstudent
8ffc9197e8 Merge pull request #13881 from edx/efischer/tnl-5314 
Dashboard Final Grade Updates
 2016-11-07 16:08:06 -05:00
Sanford Student
54df702630 Dashboard final grade display uses PersistedCourseGrade 
Will fall back to stored certificate grade if needed as we've discussed.

TNL-5314
 2016-11-07 14:00:27 -05:00
J. Cliff Dyer
9366c43a83 Fix issues with RequestFactory used as Request. 
* Centralize creation of quick request objects.
* Isolate caches to individual tests to prevent test ordering
  dependencies.

TNL-5811
 2016-11-07 10:51:04 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
stv
9c5fcfac17 Fallback to default ZENDESK_URL when not in JSON 
This line previously departed from the convention of coalescing down to
the original value specified in `lms/envs/common.py`.

Now, the setting can fall back to its default value from `common.py`,
instead of only respecting the value loaded from JSON (or `None` if not
defined).
 2016-11-04 16:04:55 -07:00
Ben Patterson
d59ab18b27 Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil 
Revert "Implement DateUtils in LMS"
 2016-11-04 10:44:59 -04:00
Matthew Piatetsky
586c9480a8 Merge pull request #13896 from edx/ECOM-5769_enable_jwt 
ECOM-5769 Add JWT auth and hidden flag to course_api for retrieving hidden courses
 2016-11-04 10:26:57 -04:00
Cliff Dyer
f258e053b1 Merge pull request #13909 from edx/release 
Merge to master for patch/2016-11-03
 2016-11-04 09:34:41 -04:00