Commit Graph

13728 Commits

Author SHA1 Message Date
alisan617
90d7141c20 Merge pull request #12853 from eduNEXT/Bound3R/TNL-3717
resolve byte-sized bug TNL-3717
2016-08-18 14:31:41 -04:00
Brian Jacobel
7e12a1f7ae Merge pull request #12771 from edx/discussion-forums-ui-update
Discussion forums UI update feature branch
2016-08-18 12:58:54 -04:00
Albert (AJ) St. Aubin
2926400798 Merge pull request #13269 from edx/TNL-5298_flaky_test
Update to deal with flaky test
2016-08-18 12:23:25 -04:00
Renzo Lucioni
40ca3efd6c Merge pull request #13272 from edx/release
Merge release into master
2016-08-18 12:04:39 -04:00
Albert St. Aubin
7a5b618ed0 Update to deal with flaky test
TNL-5298
2016-08-18 10:39:04 -04:00
Renzo Lucioni
de2608009f Fix Unicode error on dashboard
Programs with Unicode in their name would prevent the dashboard from loading. ECOM-5293.
2016-08-17 19:21:39 -04:00
Brian Jacobel
9b4f306142 Fix an issue where focus could become trapped 2016-08-17 16:57:34 -04:00
Brian Jacobel
df35415ec1 Remove forum-nav-header and wire breadcrumbs to replace it
TNL-5186
2016-08-17 16:21:13 -04:00
Andy Armstrong
5e9fd04126 Clean up UX for read and unread posts
TNL-4557
2016-08-17 16:21:13 -04:00
Brian Jacobel
1f2c843f23 Move search box to header. Add search results to breadcrumbs when you search 2016-08-17 16:21:12 -04:00
Brian Jacobel
4c4476a720 Fix lint issues on feature branch 2016-08-17 16:21:12 -04:00
Brian Jacobel
a60d456f28 Add breadcrumbs to discussion forums header 2016-08-17 16:21:12 -04:00
Andy Armstrong
6c54035197 Add a content header to the discussion board 2016-08-17 16:20:45 -04:00
Andy Armstrong
89f93df46e Refactor out a new discussions Django app 2016-08-17 16:20:45 -04:00
Diana Huang
8ca5739f0f Open the topic list by default. 2016-08-17 16:20:43 -04:00
Jesse Zoldak
a007050cb3 Mark test as flaky TNL-5298 2016-08-17 16:18:46 -04:00
Bound3R
3c5b0a9f73 resolve byte-sized bug TNL-3717
small fix for align text and radio/checkbox

alinged checbox and radio inputs.

create silent class for Choice Text Group

clean up

change px to em
2016-08-17 11:43:51 -05:00
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