Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5315 Commits

Author SHA1 Message Date
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
clrux
519e292d82 Merge pull request #11294 from edx/clrux/ac-323 
Adjusting .sr mixins for NVDA/JAWS on Windows
 2016-01-25 11:53:11 -05:00
David Ormsbee
2904da0e2e Remove unused scss files. 
We have some Sass files that basically generate duplicates of other
Sass files and are no longer referenced from any pages. This looks
like it might have been stuff that never got cleaned up when
comprehensive themeing was done.

List of removed files and what they were replaced by:

    application.scss ->  lms-main.scss
    application-rtl.scss -> lms-main-rtl.scss
    course.scss -> lms-course.scss
    course-rtl.scss -> lms-course-rtl.scss

This should help speed up the Sass compile.
 2016-01-25 11:20:54 -05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Chris Rodriguez
a0a9617a86 Replacing height and width in lieu of word-wrap 2016-01-21 15:18:05 -05:00
Chris Rodriguez
33f967c04b Adjusting .sr mixins for NVDA/JAWS on Windows 2016-01-21 12:42:58 -05:00
Daniel Naranjo
a639846a26 Reemplace property min-width value 
The min-width property accept only values <length> | <percentage> | inherit. to reset better set to 0.
Properties documentation: https://www.w3.org/TR/CSS2/visudet.html#min-max-widths

This error generates an invalid style, and, therefore, this value is set to 760px by: https://github.com/edx/edx-platform/blob/master/lms/static/sass/course/courseware/_courseware.scss#L50
 2016-01-21 09:50:35 -05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
AlasdairSwan
a82d582568 Merge pull request #11169 from edx/alasdair/ECOM-2967-xseries-dashboard-GA-events 
ECOM-2967 adding GA events for dashboard XSeries messages
 2016-01-14 14:27:25 -05:00
AlasdairSwan
2676098b02 ECOM-2967 adding GA events for dashboard XSeries messages 2016-01-14 12:37:48 -05:00
Toby Lawrence
2c40454db0 Merge pull request #11223 from edx/perf/crush-all-the-imgs 
Crush down images.
 2016-01-14 09:42:17 -05:00
Toby Lawrence
368acafad4 Adding optimized images in batches [18/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
8d8f282a5a Adding optimized images in batches [17/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
1e8263f325 Adding optimized images in batches [16/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
0009d53c53 Adding optimized images in batches [15/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
451b0a9c66 Revert "Crush down images." 
This reverts commit 8402be3b20.
 2016-01-13 19:12:13 -05:00
Toby Lawrence
8402be3b20 Crush down images. 
Ran these suckers through ImageOptim, which crunched 'em down real nice.
 2016-01-13 18:29:00 -05:00
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00
Christina Roberts
6f66483876 Merge pull request #11202 from edx/release 
Release for Jan 12, 2016
 2016-01-12 11:29:42 -05:00
muzaffaryousaf
b4189784da Fixed POST bookmarks bug when display_name is None. 
Added tests & general message to js when parsing fails.

TNL-3989
 2016-01-12 09:47:51 -05:00
Adam
e4ab6dc2c3 Revert "Calculator layout and help popup fixes" 2016-01-11 12:47:05 -05:00
muzaffaryousaf
cc6024e97b Disable button while adding/removing bookmark to a unit. 
TNL-4004
 2016-01-11 19:31:05 +05:00
Calen Pennington
bd7e4dd3ab Shrink images using trimage 
lms/static/images/wmd-buttons-transparent.png       | Bin 9698 -> 7046 bytes
 lms/static/images/wmd-buttons.png                   | Bin 7465 -> 5970 bytes
 .../credit_notifications/edx-logo-header.png        | Bin 1894 -> 1225 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_120.jpg        | Bin 3168 -> 2752 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_30.jpg         | Bin 957 -> 648 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_50.jpg         | Bin 1362 -> 1048 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_500.jpg        | Bin 15852 -> 13940 bytes
 .../f0d065035a5c4d32df318fbc54138765_120.jpg        | Bin 3168 -> 2752 bytes
 .../f0d065035a5c4d32df318fbc54138765_30.jpg         | Bin 957 -> 648 bytes
 .../f0d065035a5c4d32df318fbc54138765_50.jpg         | Bin 1362 -> 1048 bytes
 .../f0d065035a5c4d32df318fbc54138765_500.jpg        | Bin 15852 -> 13940 bytes
 themes/edge.edx.org/lms/static/images/logo.png      | Bin 7465 -> 4574 bytes
 themes/edx.org/cms/static/images/studio-logo.png    | Bin 4782 -> 4779 bytes
 themes/edx.org/lms/static/images/logo-large.png     | Bin 4581 -> 3367 bytes
 themes/edx.org/lms/static/images/logo.png           | Bin 1244 -> 1184 bytes
 .../lms/static/images/profiles/default_120.png      | Bin 6398 -> 3252 bytes
 .../lms/static/images/profiles/default_30.png       | Bin 993 -> 522 bytes
 .../lms/static/images/profiles/default_50.png       | Bin 2068 -> 1035 bytes
 .../lms/static/images/profiles/default_500.png      | Bin 91560 -> 0 bytes
 themes/red-theme/lms/static/images/logo.png         | Bin 909 -> 559 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:43 -05:00
Calen Pennington
0dfb9870c9 Shrink images using trimage 
lms/static/images/linkedin_add_to_profile.png    | Bin 139290 -> 1320 bytes
 lms/static/images/logo-large.png                 | Bin 20342 -> 8447 bytes
 lms/static/images/logo.png                       | Bin 4243 -> 885 bytes
 lms/static/images/opencourseware.png             | Bin 13203 -> 11395 bytes
 lms/static/images/openedx-logo-tag-dark.png      | Bin 2539 -> 1624 bytes
 lms/static/images/openedx-logo-tag-light.png     | Bin 2702 -> 1776 bytes
 lms/static/images/openedx-logo-tag.png           | Bin 2596 -> 1607 bytes
 lms/static/images/pencils.jpg                    | Bin 30064 -> 25607 bytes
 lms/static/images/play.png                       | Bin 2966 -> 1729 bytes
 lms/static/images/problem-editor-icons.png       | Bin 2307 -> 2304 bytes
 lms/static/images/profiles/default_120.png       | Bin 2690 -> 1133 bytes
 lms/static/images/profiles/default_30.png        | Bin 576 -> 274 bytes
 lms/static/images/profiles/default_50.png        | Bin 1023 -> 449 bytes
 lms/static/images/profiles/default_500.png       | Bin 17594 -> 5671 bytes
 lms/static/images/search-icon.png                | Bin 1195 -> 423 bytes
 lms/static/images/show-hide-discussion-icon.png  | Bin 1610 -> 771 bytes
 lms/static/images/small-header-home-icon.png     | Bin 1128 -> 276 bytes
 lms/static/images/social/google-plus-sharing.png | Bin 1161 -> 1046 bytes
 lms/static/images/textbook/textbook-left.png     | Bin 783 -> 705 bytes
 lms/static/images/textbook/textbook-right.png    | Bin 822 -> 690 bytes
 lms/static/images/ui-icons_222222_256x240.png    | Bin 4369 -> 3714 bytes
 lms/static/images/vcert-ribbon-s.png             | Bin 4843 -> 3147 bytes
 lms/static/images/verified-ribbon.png            | Bin 1791 -> 751 bytes
 lms/static/images/white-error-icon.png           | Bin 1107 -> 344 bytes
 lms/static/images/wiki-icons.png                 | Bin 2410 -> 1464 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:42 -05:00
Calen Pennington
d3da2585c4 Shrink images using trimage 
.../images/bulk_email/GooglePlusIcon_gray.png       | Bin 680 -> 678 bytes
 lms/static/images/bulk_email/LinkedInIcon.png       | Bin 751 -> 417 bytes
 lms/static/images/bulk_email/MeetupIcon.png         | Bin 1283 -> 679 bytes
 lms/static/images/bulk_email/MeetupIcon_gray.png    | Bin 685 -> 678 bytes
 lms/static/images/bulk_email/TwitterIcon.png        | Bin 998 -> 517 bytes
 lms/static/images/bulk_email/TwitterIcon_gray.png   | Bin 518 -> 515 bytes
 lms/static/images/bulk_email/VKontakteIcon.png      | Bin 2480 -> 1272 bytes
 lms/static/images/bulk_email/VKontakteIcon_gray.png | Bin 3099 -> 3092 bytes
 lms/static/images/bulk_email/YoutubeIcon.png        | Bin 1964 -> 1856 bytes
 lms/static/images/bulk_email/YoutubeIcon_gray.png   | Bin 1961 -> 1878 bytes
 lms/static/images/bulk_email/edXHeaderImage.jpg     | Bin 25814 -> 24906 bytes
 lms/static/images/bullet-closed.png                 | Bin 230 -> 191 bytes
 lms/static/images/bullet-open.png                   | Bin 219 -> 188 bytes
 lms/static/images/default-badges/honor.png          | Bin 20814 -> 13316 bytes
 lms/static/images/default-badges/professional.png   | Bin 21855 -> 14603 bytes
 lms/static/images/default-badges/verified.png       | Bin 21855 -> 14603 bytes
 lms/static/images/edx-theme/edx-logo-77x36.png      | Bin 5139 -> 3674 bytes
 lms/static/images/green-pointer.png                 | Bin 3474 -> 887 bytes
 lms/static/images/homepage-hero-video-thumb.jpg     | Bin 4537 -> 4517 bytes
 lms/static/images/honor-ribbon.png                  | Bin 5956 -> 4251 bytes
 lms/static/images/icon-sm-professional.png          | Bin 2892 -> 1883 bytes
 lms/static/images/icon-sm-verified.png              | Bin 3247 -> 776 bytes
 lms/static/images/icon-sm-xseries-white.png         | Bin 706 -> 475 bytes
 lms/static/images/large-white-error-icon.png        | Bin 1800 -> 951 bytes
 lms/static/images/link-icon.png                     | Bin 326 -> 296 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:41 -05:00
Calen Pennington
9daaa35d8d Shrink images using trimage 
common/test/data/xml_dag/static/just_a_test.jpg    | Bin 547 -> 517 bytes
 .../test_microsite/images/background-image.jpg     | Bin 160660 -> 160625 bytes
 .../test_microsite/images/header-logo.png          | Bin 1215 -> 1212 bytes
 docs/en_us/architecture/locator_ubiquity.jpg       | Bin 51876 -> 47455 bytes
 docs/en_us/architecture/presplit.jpg               | Bin 43129 -> 38944 bytes
 docs/en_us/architecture/studio mapping.jpg         | Bin 48247 -> 43786 bytes
 .../enrollment_api/source/_static/homepage-bg.jpg  | Bin 160660 -> 160625 bytes
 docs/en_us/internal/test_pyramid.png               | Bin 24698 -> 17598 bytes
 .../platform_api/source/_static/homepage-bg.jpg    | Bin 160660 -> 160625 bytes
 .../shared/images/Announcement_subscriptions.png   | Bin 43413 -> 15474 bytes
 lms/static/certificates/images/backpack-logo.png   | Bin 2107 -> 1112 bytes
 lms/static/certificates/images/backpack-ui.png     | Bin 76558 -> 54810 bytes
 lms/static/certificates/images/bg-verified.png     | Bin 25152 -> 5169 bytes
 lms/static/certificates/images/demo-sig1.png       | Bin 3852 -> 2099 bytes
 lms/static/certificates/images/demo-sig2.png       | Bin 3695 -> 1990 bytes
 lms/static/certificates/images/demo-sig3.png       | Bin 7315 -> 3721 bytes
 .../certificates/images/demo-user-profile.png      | Bin 61749 -> 40719 bytes
 lms/static/certificates/images/ico-honor.png       | Bin 59443 -> 35743 bytes
 .../certificates/images/ico-mozillaopenbadges.png  | Bin 3638 -> 1870 bytes
 lms/static/certificates/images/ico-verified.png    | Bin 59571 -> 35713 bytes
 lms/static/images/app/google_play_badge_45.png     | Bin 8913 -> 4548 bytes
 lms/static/images/bg-footer-divider.jpg            | Bin 416 -> 390 bytes
 lms/static/images/bg-texture.png                   | Bin 10028 -> 2092 bytes
 lms/static/images/bulk_email/FacebookIcon.png      | Bin 550 -> 333 bytes
 lms/static/images/bulk_email/GooglePlusIcon.png    | Bin 1286 -> 679 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:40 -05:00
Omar Al-Ithawi
e21505b76a Fixed issues in the calculator help 
- Corrected the direction of the English equations
  - TNL-3798: Removed the greek letters
  - The equal (=) button is now the default submit button in the calculator, instead of the help button
  - TNL-3798: Removed the subscript note
  - Added some comments for the translators in the calculator
  - Using `fixed` position for the calculator for best mobile/desktop look
 2016-01-06 17:52:44 +02:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529 
SOL-1529: Allow PMs to Invalidate Certificates
 2016-01-04 10:46:27 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
Peter Fogg
bd50186fb9 Update name label on account settings page. 
ECOM-3130
 2015-12-29 16:19:22 -05:00
Peter Fogg
72ed155c8a Merge pull request #11046 from edx/merge-release-into-master 
Merge release into master
 2015-12-22 09:11:43 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Usman Khalid
a93ef10f8c Merge pull request #11016 from edx/ekafeel/bookmarks-limit 
Limit the number of bookmarks a learner can add in a course
 2015-12-22 11:52:17 +05:00
Peter Fogg
39de6e828f Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-12-21 15:22:02 -05:00
clrux
ddc6b5ac6f Merge pull request #11041 from edx/clrux/ac-295 
LMS: Adding missing third topic state
 2015-12-21 13:11:43 -05:00
Saleem Latif
268db9080a Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-21 12:56:42 -05:00
ehtesham
3385d1e128 TNL-2810 backend implementation to limit the maximum bookmarks per course 2015-12-21 22:17:58 +05:00
Chris Rodriguez
c603380a0b LMS: Adding missing third topic state 2015-12-21 12:13:47 -05:00
Matt Drayer
cf9468eaf0 Merge pull request #11007 from edx/asadiqbal08/SOL-1492 
asadiqbal08/SOL-1492 - WebCerts: Generate Cert from Support Tool
 2015-12-21 09:50:41 -05:00
Frances Botsford
7338f4bf31 adjust empty courseware search spacing 2015-12-21 09:26:32 -05:00
Usman Khalid
839b9484d7 Layout fixes required due to styling changes. 2015-12-21 15:42:29 +05:00
asadiqbal
37aebaa73b SOL-1492 2015-12-18 18:19:17 +05:00
umar-nawaz
132068eafb Merge pull request #10998 from edx/unawaz/swat-97-align 
[SWAT-97] Logistration alignment and padding.
 2015-12-18 15:58:53 +05:00
Peter Fogg
30f25105e9 Support tool for changing enrollments. 
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
 2015-12-17 16:03:58 -05:00
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156 
leanModal fixes
 2015-12-17 15:17:51 -05:00
Frances Botsford
0b9da334e2 adjusted styles for bookmarking 2015-12-17 12:25:09 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Frances Botsford
53eb9e605b layout fixes 2015-12-17 22:10:22 +05:00
Usman Khalid
1c387e4f41 Address review feedback. 2015-12-17 22:10:21 +05:00