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

38237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brian Jacobel
c4e5b2019d Separate reading and hover states a bit 2016-08-17 16:20:44 -04:00
Brian Jacobel
ce310f6a61 Fix reading view state for discussion thread listing 2016-08-17 16:20:44 -04:00
Diana Huang
8ca5739f0f Open the topic list by default. 2016-08-17 16:20:43 -04:00
Diana Huang
a39f22d982 Merge pull request #13132 from edx/andya/update-proctoring-version 
Update to use new edx-proctoring version
 2016-08-17 15:05:09 -04:00
Diana Huang
273db610fe Merge pull request #13258 from edx/diana/update-proctoring 
Update proctoring version for testing purposes.
 2016-08-17 13:13:03 -04:00
Andy Armstrong
4772c61dee Update to use new edx-proctoring version 2016-08-17 13:10:48 -04:00
Diana Huang
e439c44419 Update proctoring version for testing purposes. 2016-08-17 13:01:59 -04:00
Albert (AJ) St. Aubin
8adf87f9d0 Merge pull request #13254 from edx/release 
Release
 2016-08-17 11:30:41 -04:00
Albert (AJ) St. Aubin
82a1e5ec2d Merge pull request #13230 from edx/rc/2016-08-16 
Release Candidate rc/2016-08-16
 2016-08-17 09:47:36 -04:00
David Baumgold
2c66a22010 Merge pull request #13251 from singingwolfboy/update-pa11ycrawler 
pa11ycrawler 1.1.3
 2016-08-16 16:39:45 -04:00
David Baumgold
8cb53ae83a pa11ycrawler 1.1.3 2016-08-16 16:35:14 -04:00
David Baumgold
ad3d5d470c Merge pull request #13250 from singingwolfboy/update-pa11ycrawler 
Update pa11ycrawler to 1.1.2
 2016-08-16 15:34:27 -04:00
Jesse Zoldak
3565217695 Merge pull request #13249 from edx/zoldak/fix-flaky-video-test 
Wait for the transcript file chooser input field to be visible
 2016-08-16 15:04:12 -04:00
David Baumgold
c2f2e4c615 Update pa11ycrawler to 1.1.2 2016-08-16 14:50:23 -04:00
Tim Krones
98a03f68e8 Merge pull request #13194 from open-craft/mtyaka/hide-instructor-tools 
Hide 'Reset Attempts' and 'Rescore Problem' on unsupported blocks.
 2016-08-16 19:00:01 +02:00
Renzo Lucioni
fbabef2d77 Merge pull request #13248 from edx/renzo/dashboard-a11y 
Add related programs preface to default tab order
 2016-08-16 12:46:49 -04:00
Jesse Zoldak
4a1bc53862 Wait for the transcript file chooser input field to be visible 2016-08-16 11:55:44 -04:00
Renzo Lucioni
9bf094d68b Add related programs preface to default tab order 2016-08-16 11:01:59 -04:00
Calen Pennington
545c9cbb95 Merge pull request #13232 from cpennington/upgrade-flaky 
Upgrade the flaky library, so that py.test (used by oep2 reporting) w…
 2016-08-16 09:39:48 -04:00
Diana Huang
854d0bd360 Merge pull request #13237 from edx/diana/fix-drop-down 
Fix discussion dropdown padding issue.
 2016-08-16 09:30:16 -04:00
David Baumgold
307abcad5b Merge pull request #13225 from singingwolfboy/update-pa11ycrawler 
Use updated, simplifed version of pa11ycrawler
 2016-08-16 08:51:05 -04:00
Matt Drayer
e8d1ea062e Merge pull request #13243 from edx/saleem-latif/gitignore-update 
Add auto-generated discussion css files to gitignore
 2016-08-16 07:50:10 -04:00
Saleem Latif
a276f1c67c Add auto-generated discussion css files tio gitignore 2016-08-16 12:33:48 +05:00
David Baumgold
e0cddf9750 Fix Jenkins test failure 2016-08-15 16:53:06 -04:00
Diana Huang
a74e4e5294 Fix topic styling issues. 2016-08-15 16:22:24 -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
David Baumgold
7f60fa5e25 Make data-dir explicit for pa11ycrawler 2016-08-15 15:46:10 -04: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
David Baumgold
18500472c6 Use updated, simplifed version of pa11ycrawler 2016-08-15 14:24:17 -04: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
Eugeny Kolpakov
535b272c59 Merge pull request #13241 from open-craft/rc/2016-08-16-dndv2-v2.0.8 
Version update: Drag and Drop v2
 2016-08-15 20:46:39 +03:00
Eric Fischer
376f5aea9d Merge pull request #13067 from edx/efischer/hidden_content2 
Hide after due warning language update
 2016-08-15 13:23:29 -04:00
Eric Fischer
501fc69d7f Messaging update to hide after due warning 2016-08-15 12:20:11 -04:00
E. Kolpakov
b24ae0d61d Version update: Drag and Drop v2 2016-08-15 18:48:01 +03:00
Asad Iqbal
1a179289ab Merge pull request #13220 from edx/asadiqbal08/OLIVE-75 
OLIVE-75 - CourseID Term not rendering correctly.
 2016-08-15 19:19:06 +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
asadiqbal
1e938162db OLIVE-75 - CourseID Term not rendering correctly 2016-08-15 17:48:25 +05:00
Awais Jibran
210f9328da Refersh library children for the block during import. 
TNL-4826
 2016-08-15 17:13:58 +05:00
Douglas Hall
fa136937dc Merge pull request #13229 from edx/hasnain-naveed/SOL-1951 
Profile page dropdown fix
 2016-08-15 07:35:59 -04:00
Andy Armstrong
5e8a62faa1 Merge pull request #13206 from EDUlib/bugfix-moment 
common.py incorrect moment.js for locales
 2016-08-12 16:34:45 -04:00
Pierre Mailhot
d2042f72c1 moment-with-locales.min.js must be used for locales other than en 2016-08-12 14:54:48 -04:00
Calen Pennington
38dfedca52 Upgrade the flaky library, so that py.test (used by oep2 reporting) works correctly 2016-08-12 12:07:59 -04: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