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

14761 Commits

Author SHA1 Message Date
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
9bf094d68b Add related programs preface to default tab order 2016-08-16 11:01:59 -04:00
Diana Huang
a74e4e5294 Fix topic styling issues. 2016-08-15 16:22:24 -04: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
Hasnain
449a458aed small css fix 2016-08-12 18:56:59 +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
Ned Batchelder
8ee9fcd8b2 Update translations (autogenerated message) 2016-08-11 16:00:22 +00: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
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
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
Christina Roberts
d2788ff2f1 Merge pull request #13207 from edx/christina/tnl-5181 
Silence expected IntegrityErrors.
 2016-08-10 15:46:31 -04:00
Kevin Kim
3af769b4ad Update time zone dropdown in account settings based on user country 2016-08-10 19:15:52 +00:00
Adam Palay
3019bc0501 fix path to swf file for photo verification (ECOM-5149) 2016-08-10 14:01:17 -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
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
cahrens
9d8611374f Silence expected IntegrityErrors. 
TNL-5181
 2016-08-09 21:44:39 -04:00
Brian Beggs
c5c06cf982 Merge pull request #13203 from edx/release 
release 2016-08-09 master merge.
 2016-08-09 16:06:28 -04:00
Cliff Dyer
05bfd80f05 Merge pull request #12934 from open-craft/jill/fix-bulk-email-url-scheme 
Use appropriate URL scheme for bulk emails
 2016-08-09 15:53:14 -04:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance 
Maintenance app RequireJS
 2016-08-09 23:52:01 +05:00
Brian Jacobel
9a367f64fd Merge pull request #13172 from edx/bjacobel/autofix-lms 
Run ESLint autofixer in LMS
 2016-08-09 10:12:39 -04:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00: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
Andy Armstrong
912760a32c Fix contrast issue with "Load More" link in discussions 2016-08-09 09:15:16 -04:00
Matjaz Gregoric
0dd0f1f81d Hide 'Reset Attempts' and 'Rescore Problem' on unsupported blocks. 
CAPA problems have the "Staff Debug Info" button, which allows
instructors to "Reset Attempts" and "Rescore problem" for any individual
student.

XBlocks, such as Drag and Drop v2 do not support those, though the UI
was still present. Clicking any of those links would result in an
"Unknown Error Occurred" message.

This commit hides the two buttons if the associated block does not
support them.
 2016-08-09 16:28:11 +08:00
Eric Fischer
3ba09221c1 Add Logging for CohortMembership 2016-08-05 22:15:50 -04:00
Brian Jacobel
ae8bc20b36 Run eslint autofixer on /lms 2016-08-05 15:29:20 -04:00
Brian Beggs
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -04:00
alisan617
46b94ec6be remove dropdown menu class that has pseudo border that double arrows 2016-08-05 11:46:26 -04:00
Christina Roberts
db9299cc77 Merge pull request #13177 from edx/christina/reduce-retries 
Reduce the number of retries.
 2016-08-05 11:32:02 -04:00
asadiqbal
2ee58ebe92 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-05 19:16:07 +05: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
cahrens
7b92d3ccff Reduce the number of retries. 
This task will get run twice, 5 minutes apart. Because of that, it can run up to 6 times with max_retries set to 2.
 2016-08-05 09:34:33 -04:00
Jesse Zoldak
0e5fb68e3d Revert "asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page" 2016-08-05 09:13:43 -04:00
Asad Iqbal
ffe14bb1fa Merge pull request #13139 from edx/asadiqbal08/SOL-1868 
asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page
 2016-08-05 17:38:40 +05:00
Brian Jacobel
c7042c4879 Merge pull request #13159 from edx/bjacobel/jshint-directives-to-eslint 
JSHint directives to ESLint (WIP)
 2016-08-04 17:11:56 -04:00
Renzo Lucioni
46119aca73 Merge pull request #13169 from edx/renzo/verify-now-btn 
Fix class on dashboard's verify now button
 2016-08-04 16:36:29 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Renzo Lucioni
275a7b8872 Fix class on dashboard's verify now button 2016-08-04 15:02:02 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Ned Batchelder
02f378a6ff Update translations (autogenerated message) 2016-08-04 18:25:47 +00:00
Ned Batchelder
7a0d764ef3 Update translations (autogenerated message) 2016-08-04 17:42:48 +00: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
asadiqbal
839832b4f2 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-04 20:08:41 +05:00
Renzo Lucioni
504f33cfd0 Merge pull request #13162 from edx/renzo/sass-fixes 
Fix program listing and detail page styling
 2016-08-04 10:10:44 -04:00
wajeeha-khalid
ec9845b1c4 MA-2675: Skip null 'endorsed_by' in discussion requested_fields=profile_image 2016-08-04 11:08:08 +05:00