Commit Graph

13711 Commits

Author SHA1 Message Date
Jesse Zoldak
4a1bc53862 Wait for the transcript file chooser input field to be visible 2016-08-16 11:55:44 -04:00
M. Rehan
ffbaf1fe54 Merge pull request #12813 from edx/aj/TNL4826-lib-problems-not-update-with-import
Refersh library children for the block during import.
2016-08-16 00:52:58 +05:00
Syed Hasan raza
290b902941 Merge pull request #13219 from edx/shr/bug/PLAT-1036-export-fails-with-poll-module
Escape characters for poll-module export
2016-08-15 23:38:41 +05:00
Ayub khan
1d83abc7d3 Merge pull request #13164 from edx/shr/bug/ECOM-5140-multiple-refunds-dashboard-page
Handle MultipleObjectsReturned exception for dashboardpage
2016-08-15 23:04:03 +05:00
Qubad786
aca82be335 Move fix to importer module and fix branch_setting in MixedModuleStore. 2016-08-15 18:50:50 +05:00
Syed Hassan Raza
3c9b399314 Handle MultipleObjectsReturned exception for dashboardpage 2016-08-15 17:58:20 +05:00
Awais Jibran
210f9328da Refersh library children for the block during import.
TNL-4826
2016-08-15 17:13:58 +05:00
Brian Jacobel
add4d3bce3 Merge pull request #13214 from edx/bjacobel/TNL-5198
Fix discussion markdown previews
2016-08-12 11:10:42 -04:00
Brian Jacobel
71a048a631 Add bok choy tests for discussions editor preview pane 2016-08-12 10:24:21 -04:00
Syed Hassan Raza
a32d48cfa9 Escape characters for poll-module 2016-08-12 18:58:00 +05:00
Awais Jibran
72549cf366 Merge pull request #13185 from edx/aj/ECOM5081-hide-credit-btn
Hide credit button from  audit track students
2016-08-12 11:53:40 +05:00
Awais Jibran
511de4c606 Hide credit button from audit track students
ECOM-5081
2016-08-11 23:20:01 +05:00
Albert (AJ) St. Aubin
28922ca688 Merge pull request #13197 from edx/aj/TNL-5051_CourseInfoAcctptanceTest
Aj/tnl 5051 course info acctptance test
2016-08-11 11:40:31 -04:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs
Display programs of all categories on the student dashboard
2016-08-11 10:06:15 -04:00
Albert St. Aubin
b63bfbd5dd Replaced lettuce tests with bokchoy tests for the course updates page and improved flaky test issues.
TNL-5051
2016-08-11 10:04:57 -04:00
alisan617
b7c9ef9bfe Merge pull request #13210 from edx/alisan/fix-TNL-4584-trailing-text
[TNL-4584] capa numerical input trailing text
2016-08-11 09:29:55 -04:00
sanfordstudent
3bbf30fe85 Merge pull request #13213 from edx/sstudent/TNL-4763
show English among transcript language options
2016-08-11 09:09:28 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
2016-08-11 09:00:23 -04:00
alisan617
9a9db99720 trailing text positioning in num input type question TNL-4584 2016-08-10 18:55:27 -04:00
Brian Jacobel
d347492cb1 Fix discussion markdown previews
TNL-5198
2016-08-10 15:51:11 -04:00
Sanford Student
c6877aa39e one liner 2016-08-10 14:11:52 -04:00
Awais Jibran
878b9124ab Merge pull request #13111 from edx/aj/ECOM4890-make-studio-case-insensitive-for-create-course
Make studio case-insensitive for course keys for creating courses.
2016-08-10 16:20:36 +05:00
Awais Jibran
4bc5ded768 Make studio case-insensitive for course keys for creating courses.
ECOM-4890
2016-08-10 14:34:35 +05:00
Ned Batchelder
220cf1b48b Merge pull request #13186 from edx/ned/pin-scipy-etc
Pin versions of numpy and scipy
2016-08-09 22:09:28 -04:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance
Maintenance app RequireJS
2016-08-09 23:52:01 +05:00
sanfordstudent
1c81bd146d Merge pull request #13078 from edx/sstudent/test_hide_subsection
bokchoy test for hiding subsection after due date
2016-08-09 12:27:16 -04:00
Brian Jacobel
ab04f537c7 Merge pull request #13200 from edx/bjacobel/abort-discussion-request
Fix discussions error with unabortable jqXHRs
2016-08-09 12:21:00 -04:00
Brian Jacobel
98b20d1fc4 Merge pull request #13171 from edx/bjacobel/autofix-common
Run ESLint autofixer in common
2016-08-09 11:38:46 -04:00
Brian Jacobel
994c6caa79 Bring a bugfix from discussions feature branch over 2016-08-09 10:54:38 -04:00
Sanford Student
1289b7a6e8 bok choy test for hide subsection after due date 2016-08-09 10:01:50 -04:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Brian Jacobel
163ff84699 Run eslint autofixer on /common 2016-08-08 15:59:18 -04:00
Ned Batchelder
0e4b816cb1 Pin versions of numpy and scipy 2016-08-08 09:11:25 -04:00
sanfordstudent
095bae1a2c Merge pull request #13129 from edx/sstudent/TNL-5099
WIP: initial re-add with no extra work beyond merge conflicts
2016-08-05 09:47:27 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Calen Pennington
8582da4a97 Merge pull request #12286 from cpennington/shards-as-valued-attributes
Shards as valued attributes
2016-08-04 11:13:32 -04:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Nimisha Asthagiri
be5940e6f4 Robust Grades refactor
Adds ENABLE_SUBSECTION_GRADES_SAVED feature flag to both lms and cms. Also
installs the wiring that will allow robust grades to be used for courses
that enable it. This functionality is still gated by the feature flag
and should not be used until the remaining robust grades work is finished.
2016-08-03 15:47:16 -04:00
Chris
e641c0dcee Merge pull request #13134 from edx/clrux/ac-549
AC-549 updating pink
2016-08-03 14:34:30 -04:00
Ned Batchelder
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8aae7bcee7 Fix redefined-function errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
e3cd261e99 Fix 2 unnecessary-pass errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
1905f0c517 Fix simplifiable-range errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
ef4c69881c Fix literal-used-as-attribute error 2016-08-03 12:44:41 -04:00
Ned Batchelder
9e6a63b68e Fix translation-of-non-string errors 2016-08-03 12:44:41 -04:00
Chris Rodriguez
edfd0d6aa0 AC-549 updating pink 2016-08-03 11:10:05 -04:00