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

6531 Commits

Author SHA1 Message Date
Toby Lawrence
944725e35b Adding optimized images in batches [01/19] 2016-01-13 20:37:48 -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
Calen Pennington
96478f823d Merge pull request #11163 from cpennington/shrink-images 
Shrink images
 2016-01-08 13:13:02 -05:00
asadiqbal
323b9193d6 WL-269 used gettext in .underscores 2016-01-08 12:35:24 +05:00
jsa
5ae8f5be23 add username to program app config attrs in DOM. 2016-01-07 16:21:19 -05:00
Calen Pennington
9265dc007c Shrink images using trimage 
cms/static/images/bg-micro-stripes.png              | Bin 117 -> 102 bytes
 cms/static/images/choice-example.png                | Bin 2751 -> 1544 bytes
 cms/static/images/drag-handles.png                  | Bin 954 -> 103 bytes
 cms/static/images/explanation-example.png           | Bin 4772 -> 4671 bytes
 cms/static/images/header-example.png                | Bin 6639 -> 385 bytes
 cms/static/images/hiw-feature1.png                  | Bin 67031 -> 66798 bytes
 cms/static/images/hiw-feature2.png                  | Bin 17027 -> 16408 bytes
 cms/static/images/hiw-feature3.png                  | Bin 15092 -> 14775 bytes
 cms/static/images/large-video-icon.png              | Bin 234 -> 128 bytes
 cms/static/images/multi-example.png                 | Bin 2875 -> 1519 bytes
 cms/static/images/number-example.png                | Bin 1430 -> 515 bytes
 cms/static/images/preview-lms-staticpages.png       | Bin 61450 -> 53417 bytes
 cms/static/images/problem-editor-icons.png          | Bin 2307 -> 2304 bytes
 cms/static/images/search-icon.png                   | Bin 1196 -> 423 bytes
 cms/static/images/select-example.png                | Bin 1961 -> 1006 bytes
 cms/static/images/string-example.png                | Bin 1458 -> 574 bytes
 cms/static/images/studio-logo.png                   | Bin 4243 -> 885 bytes
 cms/static/images/thumb-hiw-feature1.png            | Bin 16516 -> 16311 bytes
 cms/static/images/thumb-hiw-feature2.png            | Bin 12956 -> 12821 bytes
 cms/static/images/thumb-hiw-feature3.png            | Bin 16616 -> 16395 bytes
 common/static/css/vendor/ova/video-js.fw.png        | Bin 78899 -> 74914 bytes
 .../css/vendor/pdfjs/images/loading-small.png       | Bin 7402 -> 613 bytes
 .../css/vendor/pdfjs/images/loading-small@2x.png    | Bin 16131 -> 1324 bytes
 .../secondaryToolbarButton-documentProperties.png   | Bin 403 -> 402 bytes
 .../css/vendor/slickgrid/images/drag-handle.png     | Bin 1130 -> 94 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:32 -05:00
Matt Drayer
3d30bb11ab Merge pull request #11161 from edx/asadiqbal08/WL-270 
WL-270 used gettext in javascript files
 2016-01-07 10:45:12 -05:00
asadiqbal
7f38c1a3c9 WL-270 used gettext in javascript files 2016-01-07 18:08:15 +05:00
asadiqbal
eca0cd1139 WL-268 String Internationalization 2016-01-07 17:50:47 +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
Christina Roberts
4d2a8dbbf4 Merge pull request #11152 from edx/christina/course-outline 
Delete lettuce tests already converted to bok choy.
 2016-01-06 15:21:06 -05:00
cahrens
85ff219e1d Delete lettuce tests already converted to bok choy. 
TNL-3915
 2016-01-06 14:22:10 -05:00
AlasdairSwan
f25d8a16ee ECOM-3319 loading edx-icons fonts in studio programming author tool 2016-01-06 12:08:47 -05:00
swdanielli
ac66b4a8cd Add setting for pyfs xblock service 2016-01-05 23:09:09 +00: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
Syed Hasan raza
6a24fd66cc Merge pull request #11005 from edx/shr/bug/TNL-2622-course_import_status_message_fix_test 
Shr/bug/tnl 2622 course import status message fix test
 2016-01-04 12:33:45 +05:00
Syed Hasan raza
482e0e457f Merge pull request #10978 from edx/shr/bug/TNL-3809-Sign-in-mutiple-clicks 
Shr/bug/tnl-3809-sign-in-mutiple-clicks
 2016-01-04 12:32:45 +05:00
arbabnazar
49d8ec3543 DEVOPS-3388 Remove unused setting from edxapp configuration 2016-01-01 12:50:42 +05:00
Syed Hassan Raza
912e012bb7 Add Disabled class to Sign In button 2015-12-31 15:21:29 +05:00
Syed Hassan Raza
fe0740b91e set path explicitly for storing cookie 2015-12-31 15:19:40 +05:00
AlasdairSwan
da7830db99 Merge pull request #11101 from edx/alasdair/ECOM-3047-programs-ida-integration-update 
ECOM-3047 update DOM to include the data-attributes that the programs…
 2015-12-30 16:43:07 -05:00
AlasdairSwan
a1d81ed781 ECOM-3047 update DOM to include the data-attributes that the programs IDA expects 2015-12-30 14:43:52 -05:00
Awais Jibran
4f185abc33 Merge pull request #10749 from edx/aj/tnl3779-use-get-courses-summaries-for-staff 
Render CMS course listing Using CourseSummary class for staff
 2015-12-30 11:49:55 +05:00
Awais Jibran
c32823dfa6 Render cms course listing using CourseSummary class. 2015-12-29 17:35:12 +05:00
asadiqbal
624b2ba406 SOL-1358 2015-12-29 16:40:27 +05:00
Ben Patterson
d460eb62a9 Merge pull request #11075 from edx/benp/fix-flaky-hello 
Fix flaky condition.
 2015-12-28 13:34:58 -05:00
Ben Patterson
056158d72b Fix flaky condition in lettuce test. 2015-12-28 10:50:45 -05:00
Ben Patterson
d522068265 Fix flaky condition. TNL-3937. 2015-12-26 19:42:59 -05:00
Usman Khalid
766c3dca71 Merge pull request #11051 from Ayub-Khan/ayubkhan/TNL-3822 
Fix escaping in studio editor
 2015-12-23 14:57:50 +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
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Ibrahim Ahmed
5832b579be Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment 
Ibrahimahmed443/sol 1479 change time allotment
 2015-12-21 21:55:30 +05:00
ibrahimahmed443
f3d43ab5db SOL-1479 set max time limit to 99:59 hours; add jasmine tests to validate time limit 2015-12-21 19:30:49 +05:00
Ayub-Khan
2f6b1f9b84 -new code according to document. 2015-12-21 11:56:50 +05:00
Ayub-Khan
a6fd6ca5ec fix html escape error 
TNL-3822
 2015-12-18 16:02:29 +05:00
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156 
leanModal fixes
 2015-12-17 15:17:51 -05:00
Bill DeRusha
e63f0f922c Merge pull request #10984 from edx/bderusha/studio-audit-cert 
Disable certificate template creation for audit only courses
 2015-12-17 14:53:40 -05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Bill DeRusha
08d1268c28 Disable cert generation for audit only courses 2015-12-17 13:23:38 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
Usman Khalid
4304c66c54 Performance optimizations and cache to keep the bookmarks info updated. 
The cache uses the bookmarks.XBlockCache model.

TNL-1945
 2015-12-17 22:07:34 +05:00
muzaffaryousaf
7413484b8d Resolving the moment.js issues 
TNL-1958
 2015-12-17 22:07:33 +05:00
Diana Huang
ba526f4f39 Merge pull request #11008 from edx/release 
Release
 2015-12-16 12:05:20 -05:00
Renzo Lucioni
a8a88390eb Merge pull request #11000 from edx/renzo/kill-it-with-fire 
Delete dead SUBDOMAIN_BRANDING setting.
 2015-12-16 11:09:12 -05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -05:00
Muhammad Shoaib
788cece45e PHX-161 
- added the new field review_rules for software secure
- added a new tab name "Additional Settings" for the proctored/timed exams
 2015-12-15 14:27:29 -05:00
Jesse Zoldak
83f7ffd743 Revert "set path explicitly for storing cookie" 2015-12-15 13:26:51 -05:00
Sven Marnach
d35effc8d2 Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES. 2015-12-15 13:58:06 +01:00