extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into typescript

Browse Source
This commit is contained in:
Hadi Nategh 2020-02-04 16:45:24 +01:00
commit b45a74ac36
7 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@ -1,9 +1,8 @@
language: php language: php
php: php:
- 7.0
- 7.1
- 7.2 - 7.2
- 7.3 - 7.3
- 7.4
# none of our dependencies allow 8.0 # none of our dependencies allow 8.0
# - master # - master
@ -14,11 +13,11 @@ matrix:
services: services:
- memcached - memcached
# - mysql we use mariadb instead installed via addons below - mysql #we use mariadb instead installed via addons below
- postgres # - postgres
addons: #addons:
mariadb: '10.0' # mariadb: '10.0'
sudo: required sudo: required
@ -38,7 +37,7 @@ before_script:
echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
phpenv config-rm xdebug.ini; phpenv config-rm xdebug.ini;
;; ;;
"7.3"|"master") "7.3"|"7.4"|"master")
echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
;; ;;
esac esac
@ -53,7 +52,7 @@ before_script:
composer require --ignore-platform-reqs 'phpunit/phpunit:~7'; composer require --ignore-platform-reqs 'phpunit/phpunit:~7';
;; ;;
esac esac
#- php -m - php -m
- php -i - php -i
- php install-cli.php --ignore-platform-reqs - php install-cli.php --ignore-platform-reqs
# create data directory # create data directory

6
README.md
View File

@ -1,9 +1,9 @@
# EGroupware # EGroupware
| Branch | Status | Tools | Usage | | Branch | Status | Tools | Usage |
| ------ | ------ | ----- | ----- | | ------ | ------ | ----- | ----- |
| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | <img src="https://discourse-cdn-sjc1.com/business4/uploads/travis_ci/original/1X/e8f4998fa50cfd83f42adedbde4b9cca3c80e168.png" width="108" alt="Travis CI"/> | runs unit-tests after each commit | | master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | <img src="https://travis-ci.com/images/logos/TravisCI-Full-Color.png" width="108" alt="Travis CI"/> | runs unit-tests after each commit |
| 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase | | 19.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=19.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase |
| 16.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=16.1)](https://travis-ci.org/EGroupware/egroupware) | <img src="https://p14.zdusercontent.com/attachment/1015988/zGiHOaPFC0e9nG4PJWXZH1Ibe?token=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..i_vov1AU7X1qzPu3nYPL-Q.tdgDtQMrCCHEACS4aXPcYTKf8BeQUVGohG0-UFeEnJwC_d4KvmSz4EaV2NpQmQ9B-m-3Sj9EyfxNVW6XSOksFBd-QZz2CLu5il0ko2KdvC4YjEGFQkmPJOAPfVQfwXcZkg08eaX-4aluvvwBQQv5oXRbCVVX-lMtYE_1OPBTYPRZoBEWEnIlCGix05vC82EOvqzQ2Ht9lGpwfFLMfawIT5l-sCi5vAluKBJKR2pkduFqq3DD_E1Y2YqPA3utD3zDfcU5Zb4Qqd1pfkES3_9L3CnluMmIKG6bY5aFDyLPPUE.KENm6nkdraKqs2JzQIwHpQ" width="110" alt="BrowserStack"/> | manual testing with unusual browser versions or platforms | | 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | <img src="https://p14.zdusercontent.com/attachment/1015988/zGiHOaPFC0e9nG4PJWXZH1Ibe?token=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..i_vov1AU7X1qzPu3nYPL-Q.tdgDtQMrCCHEACS4aXPcYTKf8BeQUVGohG0-UFeEnJwC_d4KvmSz4EaV2NpQmQ9B-m-3Sj9EyfxNVW6XSOksFBd-QZz2CLu5il0ko2KdvC4YjEGFQkmPJOAPfVQfwXcZkg08eaX-4aluvvwBQQv5oXRbCVVX-lMtYE_1OPBTYPRZoBEWEnIlCGix05vC82EOvqzQ2Ht9lGpwfFLMfawIT5l-sCi5vAluKBJKR2pkduFqq3DD_E1Y2YqPA3utD3zDfcU5Zb4Qqd1pfkES3_9L3CnluMmIKG6bY5aFDyLPPUE.KENm6nkdraKqs2JzQIwHpQ" width="110" alt="BrowserStack"/> | manual testing with unusual browser versions or platforms |
### Default and prefered installation method for EGroupware is via your package manager: ### Default and prefered installation method for EGroupware is via your package manager:

2
api/js/etemplate/et2_widget_vfs.js
View File

@ -1262,7 +1262,7 @@ var et2_vfsSelect = (function(){ "use strict"; return et2_inputWidget.extend(
default: default:
if (self.options.method === 'download') submit_value.path = _data.content.download_baseUrl; if (self.options.method === 'download') submit_value.path = _data.content.download_baseUrl;
files = submit_value.path+'/'+submit_value.name; files = submit_value.path+'/'+submit_value.name;
if (self.options.method !== 'download' && !savemode) if (self.options.mode === 'saveas' && !savemode)
{ {
for(var p in _data.content.dir) for(var p in _data.content.dir)
{ {

22
pixelegg/css/pixelegg.css
View File

@ -1363,20 +1363,20 @@ span.ui-icon-search {
box-shadow: -2px 1px 9px 3px #B4B4B4; box-shadow: -2px 1px 9px 3px #B4B4B4;
} }
.ui-dialog .ui-dialog-buttonpane { .ui-dialog .ui-dialog-buttonpane {
padding-left: .8em; padding-left: 0.8em;
padding-right: .8em; padding-right: 0.8em;
padding-top: 0.7em; padding-top: 0.7em;
} }
.ui-dialog .ui-dialog-titlebar { .ui-dialog .ui-dialog-titlebar {
padding-left: .8em; padding-left: 0.8em;
padding-right: .8em; padding-right: 0.8em;
font-size: 12pt; font-size: 12pt;
border: none; border: none;
font-weight: normal; font-weight: normal;
background: white; background: white;
} }
.ui-dialog .ui-dialog-titlebar-close { .ui-dialog .ui-dialog-titlebar-close {
right: .8em; right: 0.8em;
} }
.ui-widget-content { .ui-widget-content {
border: 1px solid #B4B4B4; border: 1px solid #B4B4B4;
@ -3747,7 +3747,7 @@ td.lettersearch {
} }
/*popup Messsage*/ /*popup Messsage*/
div#egwpopup_message { div#egwpopup_message {
background-color: .color_gray_0; background-color: #FFFFFF;
padding: 1em; padding: 1em;
overflow-y: auto; overflow-y: auto;
} }
@ -4137,7 +4137,7 @@ td.message span.message {
padding: 5px 0px 5px 0px; padding: 5px 0px 5px 0px;
} }
#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items .timezone select { #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items .timezone select {
width: calc(80%); width: calc(100% - 20px);
margin-left: 10px; margin-left: 10px;
} }
/* ################################################### /* ###################################################
@ -4499,9 +4499,10 @@ td.message span.message {
padding: 0px 0px 0px 24px; padding: 0px 0px 0px 24px;
line-height: 1em; line-height: 1em;
font-size: 12px; font-size: 12px;
background-image: url(../images/arrow_right.png); background-image: url(../images/arrow_right.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left center; background-position: left center;
background-size: 12px;
} }
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category div.egw_fw_ui_category:nth-last-of-type(-n+3) img.egw_fw_ui_sidemenu_listitem_icon { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category div.egw_fw_ui_category:nth-last-of-type(-n+3) img.egw_fw_ui_sidemenu_listitem_icon {
display: block; display: block;
@ -4516,9 +4517,10 @@ td.message span.message {
color: #f2f2f2; color: #f2f2f2;
} }
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 {
background-image: url(../images/arrow_down_white.png); background-image: url(../images/arrow_down.svg);
line-height: 1em; line-height: 1em;
font-size: 12px; font-size: 12px;
background-size: 12px;
} }
#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a {
color: #FFF; color: #FFF;
@ -6077,7 +6079,7 @@ a.textSidebox {
} }
} }
.egw-loading-prompt-container::before { .egw-loading-prompt-container::before {
opacity: .3; opacity: 0.3;
content: ""; content: "";
background-color: #aaaaaa; background-color: #aaaaaa;
width: 100%; width: 100%;

3
pixelegg/less/layout_messages.less
View File

@ -16,6 +16,7 @@
//############################################################################################################## //##############################################################################################################
#egwpopup { #egwpopup {
top: 46px; top: 46px;
right:0px !important; right:0px !important;
@ -242,7 +243,7 @@
/*popup Messsage*/ /*popup Messsage*/
div#egwpopup_message { div#egwpopup_message {
background-color: .color_gray_0; background-color: @gray_0;
padding: 1em; padding: 1em;
overflow-y: auto; overflow-y: auto;
} }

2
pixelegg/less/layout_raster_header.less
View File

@ -252,7 +252,7 @@
padding: 5px 0px 5px 0px; padding: 5px 0px 5px 0px;
} }
select { select {
width: calc(100% - 20px); width: ~"calc(100% - 20px)";
margin-left: 10px; margin-left: 10px;
} }
} }

6
pixelegg/less/layout_raster_sidebar.less
View File

@ -201,9 +201,10 @@
padding: 0px 0px 0px 24px; padding: 0px 0px 0px 24px;
line-height: 1em; line-height: 1em;
.fontsize_l; .fontsize_l;
background-image:url(../images/arrow_right.png); background-image:url(../images/arrow_right.svg);
background-repeat:no-repeat; background-repeat:no-repeat;
background-position:left center; background-position:left center;
background-size: 12px;
} }
div.egw_fw_ui_category:nth-last-of-type(-n+3) { div.egw_fw_ui_category:nth-last-of-type(-n+3) {
@ -233,9 +234,10 @@
background-color: @egw_color_2_a; background-color: @egw_color_2_a;
.color_5_gray; .color_5_gray;
h1 { h1 {
background-image:url(../images/arrow_down_white.png); background-image:url(../images/arrow_down.svg);
line-height: 1em; line-height: 1em;
font-size: 12px; font-size: 12px;
background-size: 12px;
a { a {
color: #FFF; color: #FFF;
img {.dimension_width_height_s;} img {.dimension_width_height_s;}