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

43164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
marcotuts
8343918c9f updated copyright setting file 
updated LMS footer to include year in copyright message
 2016-08-15 10:04:24 -04: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
Syed Hassan Raza
a32d48cfa9 Escape characters for poll-module 2016-08-12 18:58:00 +05:00
Hasnain
449a458aed small css fix 2016-08-12 18:56:59 +05:00
Asad Iqbal
09ae2fc0da Merge pull request #13226 from edx/asadiqbal08/update_release_tag_done_xblock 
asadiqbal08/SOL-2020- updated the release tag for DoneXblock in edX-platform
 2016-08-12 17:23:11 +05:00
asadiqbal
c3da31b343 updated the release tag for DoneXblock in edX-platform 2016-08-12 12:35:18 +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
Andy Armstrong
3bf3e0dc8d Merge pull request #13211 from edx/andya/fix-paver-i18n-dummy 
Add --settings parameter for i18n_dummy task
 2016-08-11 16:55:18 -04:00
John Eskew
f33a94539a Merge pull request #13222 from edx/edx-django-release-util/0.1.0 
Change edx-django-release-util version.
 2016-08-11 16:05:38 -04:00
Awais Jibran
511de4c606 Hide credit button from audit track students 
ECOM-5081
 2016-08-11 23:20:01 +05:00
Ned Batchelder
f8cadf7481 Merge pull request #13221 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-08-11 13:59:17 -04:00
John Eskew
10ff516fd9 Updating edx-django-release-util requirement to version 0.1.0 2016-08-11 13:55:05 -04:00
Ned Batchelder
8ee9fcd8b2 Update translations (autogenerated message) 2016-08-11 16:00:22 +00: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
Kevin Kim
635c044332 Merge pull request #13140 from edx/kkim/country_tz_pref 
Time Zone Field Changes Based on Country
 2016-08-11 09:15:08 -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
Adam
8c849c9a3d Merge pull request #13212 from edx/adam/fix-flash-path 
fix path to swf file for photo verification (ECOM-5149)
 2016-08-11 08:21: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
Christina Roberts
d2788ff2f1 Merge pull request #13207 from edx/christina/tnl-5181 
Silence expected IntegrityErrors.
 2016-08-10 15:46:31 -04:00
Renzo Lucioni
5fac6fb103 Merge pull request #13209 from edx/renzo/footer-logo-a11y 
Make edX logo in edx.org footer more accessible
 2016-08-10 15:23:24 -04:00
Kevin Kim
3af769b4ad Update time zone dropdown in account settings based on user country 2016-08-10 19:15:52 +00:00
Sanford Student
c6877aa39e one liner 2016-08-10 14:11:52 -04:00
Adam Palay
3019bc0501 fix path to swf file for photo verification (ECOM-5149) 2016-08-10 14:01:17 -04:00
Andy Armstrong
80e5a610ae Add --settings parameter for i18n_dummy task 2016-08-10 13:34:11 -04:00
Matjaz Gregoric
32fb5517c0 Fix staff debug module field table width. 
The auto-adjusting table layout would get illegible for certain types
of problems that contain a large amount of data because the first column
could get very narrow (down to the width of a single character).

This commit fixes the width of the first column to 25%.
 2016-08-10 23:55:28 +08:00
Brian Beggs
a3f8cafb1d Merge pull request #12998 from mitocw/bdero/cas-django-1.8 
Update django-cas dependency to support Django 1.8
 2016-08-10 11:29:29 -04:00