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

13132 Commits

Author SHA1 Message Date
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
Matt Drayer
4d7be021e5 Merge pull request #11140 from edx/saleem-latif/SOL-1431 
SOL-1431: Remove no-op translations from devstack.py
 2016-01-07 10:40:20 -05:00
Matt Drayer
b7b8c745d6 Merge pull request #11139 from edx/asadiqbal08/WL-242 
asadiqbal08/WL-242 - Marked strings on shopping cart pages for translations
 2016-01-07 10:32:40 -05:00
Piotr Mitros
e87fabe45e Merge pull request #8289 from edx/danielli/pyfs_xblocks 
Add setting for pyfs xblock service to devstack.py
 2016-01-06 17:21:30 -05:00
Adam
4c5c8c18a3 Merge pull request #10648 from OmarIthawi/edraak/calculator-fixups 
Calculator layout and help popup fixes
 2016-01-06 15:32:58 -05:00
Matt Drayer
083ff7f0ef Merge pull request #11150 from edx/release 
2016-01-06 Release
 2016-01-06 13:51:49 -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
swdanielli
ac66b4a8cd Add setting for pyfs xblock service 2016-01-05 23:09:09 +00:00
Nimisha Asthagiri
59605159b4 Course Blocks API: support for all blocks when no username 2016-01-05 15:06:55 -05:00
Kelketek
7af7553175 Merge pull request #10413 from edx/register-dropdown 
Add custom fields to registration menu.
 2016-01-05 13:44:11 -06:00
Toby Lawrence
56fe511a81 Merge pull request #11025 from edx/PERF-224 
[PERF-224] Serve course assets from a CDN
 2016-01-05 13:40:54 -05:00
Jonathan Piacenti
acc0161c0f Add custom registration form extension feature. 2016-01-05 10:14:28 -06:00
Toby Lawrence
77343df0d9 [PERF-224] Support to serve static assets from a CDN. 
A base URL can now be configured which is, potentially, prepended to an
asset URL.  This allows a CDN, or caching server, to front static asset
requests, taking load off of the contentstore and speeding up page load
times.

Asset URL generation respects locked vs unlocked assets, and will not
generate links to locked assets that would traverse a CDN (even though
the authorization component of the contentserver middleware wouldn't
allow those links to work anyways).
 2016-01-05 10:24:44 -05:00
Christine Lytwynec
b1e31c133f Merge pull request #11098 from edx/clytwynec/ac-303 
remove aria-hidden from staff lms controls
 2016-01-05 10:09:21 -05:00
Douglas Hall
e7dc6fcfe5 Rolling back template inheritance change that was causing child templates to break 2016-01-05 09:40:34 -05:00
Ayub-Khan
96e64464b5 -fix TNL-3556 Instructor tool "View as Specific Student" doesn't work on the course updates page. 
-Added test for TNL-3556.
 2016-01-05 17:50:23 +05:00
asadiqbal
47827ecb6f WL-242 2016-01-05 14:25:22 +05:00
Saleem Latif
e3edb4e9f5 remove no-op translations from devstack.py 2016-01-05 13:33:51 +05:00
Carol Tong
e7dab0dfbb Merge pull request #11126 from edx/carol/doc/cohort_help_target 
Fix cohort doc help targets in Instructor Dashboard
 2016-01-04 17:02:31 -05:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
David Baumgold
c6ed893df9 Merge pull request #11109 from ovnicraft/patch-1 
Remove duplicate import
 2016-01-04 14:36:58 -05:00
Peter Fogg
c0fa05e2ae Merge pull request #11107 from edx/peter-fogg/enrollment-support-email 
Allow searching enrollments by email as well as username.
 2016-01-04 12:57:36 -05:00
Arbab Nazar
8576a180b5 Merge pull request #11114 from edx/arbab/devops-3388 
DEVOPS-3388 Remove unused setting from edxapp configuration
 2016-01-04 21:21:12 +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
arbabnazar
49d8ec3543 DEVOPS-3388 Remove unused setting from edxapp configuration 2016-01-01 12:50:42 +05:00
Cristian Salamea
c7c542d7da Remove duplicate import 2015-12-30 21:51:14 -05:00
Peter Fogg
b96a8bf6ff Allow searching enrollments by email as well as username. 
This brings the enrollment support tool's UI in line with the other
support tools.
 2015-12-30 16:53:31 -05:00
Peter Fogg
51a89cab29 Merge pull request #11102 from edx/peter-fogg/active-email-text-change 
Add mailing address to activation email form.
 2015-12-30 15:19:32 -05:00
Peter Fogg
238968c3cd Add mailing address to activation email form. 
ECOM-3318
 2015-12-30 13:30:43 -05:00
Peter Fogg
69432015f3 Allow removing upgrade deadlines through the Commerce API. 2015-12-30 12:22:22 -05:00
Peter Fogg
45bff268ae Allow removing a verification deadline through the Commerce API. 
ECOM-3268
 2015-12-30 11:25:52 -05:00
Christine Lytwynec
c2e325020f remove aria-hidden from staff lms controls 2015-12-30 11:11:36 -05:00
Peter Fogg
d2392b451f Merge pull request #11089 from edx/peter-fogg/update-account-settings-name-label 
Update name label on account settings page.
 2015-12-30 09:49:10 -05:00
Christine Lytwynec
00b1e2155b Merge pull request #11090 from edx/clytwynec/ac-250 
add sr text for show/hide answer button
 2015-12-30 09:28:30 -05:00
Christine Lytwynec
bb329c7b6f add sr text for show/hide answer button 2015-12-29 17:03:32 -05:00
Peter Fogg
bd50186fb9 Update name label on account settings page. 
ECOM-3130
 2015-12-29 16:19:22 -05:00
aamir-khan
3fbdebcd30 ECOM-3107: Updated the progress page to not display the eligibility if user is not enrolled as credit mode 2015-12-29 17:34:34 +05:00
Nimisha Asthagiri
a00c2a7c47 Course API: Change field name from course_id to id 2015-12-28 16:24:54 -05:00
Nimisha Asthagiri
6bbc46b1b5 Merge pull request #11049 from edx/mobile/catalog-api-overview-field 
Update Course Catalog API to support About Overview field
 2015-12-28 16:09:15 -05:00
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -05:00
Chris Dodge
0b4f3599b3 Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running 2015-12-27 19:18:07 -05:00
Nimisha Asthagiri
44abf7a9a2 Performance enhancement in see_exists: reverse order of checks 2015-12-23 16:40:38 -05:00
Nimisha Asthagiri
8e3f4e058d Update Course Catalog API to support filters 2015-12-23 12:31:31 -05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -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
Peter Desjardins
2bf25b2f51 Merge pull request #11043 from edx/pdesjardins/DOC-2543-b 
Edit text strings in default template for web certificates to make them more generally applicable
 2015-12-22 08:56:57 -05:00