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

39279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alisan617
f47b4cd8ff no float 2016-11-08 15:46:09 -05:00
Christopher Lee
8a784eef24 Merge pull request #13949 from edx/release-2016-11-08-conflict 
Release 2016 11 08 conflict
 2016-11-08 15:32:16 -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
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
christopher lee
d3c3a9a63d Merge branch 'release' into release-2016-11-08-conflict 2016-11-08 14:23:57 -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
246bd19ee4 Merge pull request #13948 from edx/revert-13936-clintonb/verification-admin-update 
Revert "Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field"
 2016-11-08 13:33:42 -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
Christopher Lee
af71a2710b Merge pull request #13919 from edx/release-candidate 
Release Candidate rc/2016-11-08
 2016-11-08 12:55:52 -05:00
Clinton Blackburn
ba1aadca99 Merge pull request #13936 from edx/clintonb/verification-admin-update 
Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field
 2016-11-08 12:33:38 -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
Toby Lawrence
f29a508d4f Merge pull request #13928 from edx/bugfix/forums-enable-data-migration 
Provide a default configuration for forums if none already exists.
 2016-11-08 09:16:56 -05:00
Muzaffar yousaf
6f44bbedbc Merge pull request #13912 from edx/mzfr/rmv-form-tnl5402 
Changing form to div for CAPA problem types.
 2016-11-08 17:54:16 +05:00
noraiz-anwar
8c6df4a363 Merge pull request #13878 from edx/TNL-5769 
Video download button does not appear in course (TNL-5769)
 2016-11-08 16:52:47 +05:00
muzaffaryousaf
6b954efabd Changing form to div for CAPA problem types. 
TNL-5402
 2016-11-08 14:47:30 +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
Andy Armstrong
0c5b7ab32d Merge pull request #13883 from edx/andya/long-error-messages 
Introduce a new AcceptanceTest base class
 2016-11-07 18:35:38 -05:00
Brian Jacobel
697ec3402d Migrate Discussions, Certificates and Programs to susy-less grids 2016-11-07 17:13:58 -05:00
Brian Jacobel
a68b37499b Upgrade to UX Pattern Library v0.17 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
Diana Huang
c24cdfb035 Merge pull request #13931 from edx/diana/update-proctoring 
Update to latest proctoring release.
 2016-11-07 15:13:17 -05:00
Toby Lawrence
183d741b9b Merge pull request #13934 from edx/bugfix/forums-enable-data-migration 
Provide a default configuration for forums if none already exists.
 2016-11-07 15:02:28 -05:00
Toby Lawrence
3969f0cad9 Provide a default configuration for forums if none already exists. 2016-11-07 14:02:17 -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
Cliff Dyer
7db6dc7d7f Merge pull request #13895 from edx/cdyer/flaky-request-factory-as-request 
Fix sporadic "'RequestFactory' object has no attribute 'build_absolute_uri'" python test error.
 2016-11-07 13:55:09 -05:00
Adam
332fcd0c9b Merge pull request #13924 from edx/adam/neo4j-lists 
only pass lists of text as iterable neo4j values
 2016-11-07 12:49:41 -05:00
Diana Huang
23a0099f6a Update to latest proctoring release. 2016-11-07 11:11:00 -05:00
Kevin Falcone
9135000a7f Merge pull request #13929 from edx/jibsheet/revert-problem-builder 
Revert "Updates problem-builder version to use 2.6.0"
 2016-11-07 10:57:58 -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
Adam Palay
e4b39c5c42 only pass lists of text as iterable neo4j values 2016-11-07 10:48:42 -05:00
Kevin Falcone
34ee0e050b Revert "Updates problem-builder version to use 2.6.0" 
https://openedx.atlassian.net/browse/TNL-5903

This reverts commit d6787cd13b.
This reverts commit 0016d1af4e.
 2016-11-07 10:31:15 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
Attiya Ishaque
4319a8288a Merge pull request #13816 from edx/atiya/celery-email-sending-on-registration 
ECOM-5281 Adding retries and celery task for sending activation email.
 2016-11-07 14:17:07 +05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
Syed Hasan raza
8234581024 Merge pull request #13853 from edx/shr/bug/TNL-5591-update-orientation-with-None-value 
fix None value for orientation update
 2016-11-06 17:56:04 +05:00
Adam
882b793334 Merge pull request #13921 from edx/adam/neo4j-skip-courses 
add ability to skip courses when dumping to neo4j
 2016-11-04 14:13:35 -04:00
Adam Palay
5b1d0fd3d9 add ability to skip courses when dumping to neo4j 2016-11-04 13:12:55 -04: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
Albert (AJ) St. Aubin
0ebab35e89 Merge pull request #13901 from edx/TNL-5281_labelUpdate 
Updates to correct a11y issues with CodeMirror
 2016-11-04 10:33:54 -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
Eugeny Kolpakov
4c4c5a4db1 Merge pull request #13900 from open-craft/ekolpakov/SOL-2070 
Library creation test is not flaky anymore
 2016-11-04 17:25:51 +03: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
Albert St. Aubin
be0e0b8eec Updates to correct a11y issues with CodeMirror 
TNL-5281
 2016-11-04 09:25:15 -04:00
Jesse Zoldak
ec880138d2 Revert "Implement DateUtils in LMS" 2016-11-04 07:50:26 -04:00