Commit aafea493 authored by Carsten Schoenert's avatar Carsten Schoenert

Imported Upstream version 2.2.0

parent b8357a06

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -12,10 +12,24 @@ php_flag magic_quotes_runtime off
php_value post_max_size 31M
php_value upload_max_filesize 30M
# we need short-open-tags
php_flag short_open_tag on
# For debugging only
# make sure apache/php can write this file, or else no errors are logged!
php_flag log_errors on
php_value error_log errors.txt
# Deny access to config.php, config.php.dist, debug.php, debug.php.dist, defaults.php
# because they could become a security vulnerability when accessible
# Better safe then sorry
<IfVersion < 2.4>
<FilesMatch "^(config|debug|defaults|init)\.php">
Deny from all
</FilesMatch>
</IfVersion>
<IfVersion >= 2.4>
<FilesMatch "^(config|debug|defaults|init)\.php">
<RequireAll>
Require all denied
</RequireAll>
</FilesMatch>
</IfVersion>
......@@ -659,51 +659,3 @@ specific requirements.
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
---
Copyright 2005 - 2014 Zarafa B.V.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License, version 3,
as published by the Free Software Foundation with the following additional
term according to sec. 7:
According to sec. 7 of the GNU Affero General Public License, version
3, the terms of the AGPL are supplemented with the following terms:
"Zarafa" is a registered trademark of Zarafa B.V. The licensing of
the Program under the AGPL does not imply a trademark license.
Therefore any rights, title and interest in our trademarks remain
entirely with us.
However, if you propagate an unmodified version of the Program you are
allowed to use the term "Zarafa" to indicate that you distribute the
Program. Furthermore you may use our trademarks where it is necessary
to indicate the intended purpose of a product or service provided you
use it in accordance with honest practices in industrial or commercial
matters. If you want to propagate modified versions of the Program
under the name "Zarafa" or "Zarafa Server", you may only do so if you
have a written permission by Zarafa B.V. (to acquire a permission
please contact Zarafa at trademark@zarafa.com).
The interactive user interface of the software displays an attribution
notice containing the term "Zarafa" and/or the logo of Zarafa.
Interactive user interfaces of unmodified and modified versions must
display Appropriate Legal Notices according to sec. 5 of the GNU
Affero General Public License, version 3, when you propagate
unmodified or modified versions of the Program. In accordance with
sec. 7 b) of the GNU Affero General Public License, version 3, these
Appropriate Legal Notices must retain the logo of Zarafa or display
the words "Initial Development by Zarafa" if the display of the logo
is not reasonably feasible for technical reasons. The use of the logo
of Zarafa in Legal Notices is allowed for unmodified and modified
versions of the software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
......@@ -7,16 +7,14 @@
<property name="plugins" value="${basedir}/plugins"/>
<property name="client" value="${basedir}/client"/>
<property name="server" value="${basedir}/server"/>
<property name="mapi" value="${basedir}/mapi"/>
<property name="doc" value="${basedir}/doc"/>
<!-- Meta build target -->
<target name="all" depends="tools, server, mapi, client"/>
<target name="all" depends="tools, server, client"/>
<!-- Clean the entire build system -->
<target name="clean">
<ant dir="${server}" target="clean"/>
<ant dir="${mapi}" target="clean"/>
<ant dir="${client}" target="clean"/>
<ant dir="${test}" target="clean"/>
<ant dir="${tools}" target="clean"/>
......@@ -75,7 +73,6 @@
<ant dir="${client}" target="deploy"/>
<ant dir="${server}" target="deploy"/>
<ant dir="${mapi}" target="deploy"/>
<!-- copy files -->
<copy todir="${targetdir}">
......
......@@ -41,6 +41,11 @@
<property name="thirdparty-debugfile" value="ux-thirdparty-debug.js"/>
<property name="thirdparty-file" value="ux-thirdparty.js"/>
<!-- The fingerprint script -->
<property name="fingerprint-folder" value=""/>
<property name="fingerprint-debugfile" value="fingerprint-debug.js"/>
<property name="fingerprint-file" value="fingerprint.js"/>
<!-- Third-party plugins CSS files -->
<property name="thirdparty-css-folder" value="${thirdparty-folder}/resources/css"/>
<property name="thirdparty-css-file" value="ux-thirdparty.css"/>
......@@ -53,6 +58,16 @@
<!-- The Zarafa CSS files -->
<property name="zarafa-css-folder" value="resources/css"/>
<property name="zarafa-css-file" value="zarafa.css"/>
<property name="zarafa-design2015-css-folder" value="resources/design2015/css"/>
<property name="zarafa-design2015-css-file" value="design2015.css"/>
<!-- The Zarafa images -->
<property name="zarafa-images-folder" value="resources/images"/>
<property name="zarafa-design2015-images-folder" value="resources/design2015/images"/>
<!-- The Zarafa themes -->
<property name="zarafa-themes-folder" value="zarafa/core/themes"/>
<property name="zarafa-themes-target-folder" value="themes"/>
<!-- Meta target -->
<target name="all" depends="prepare, concat, compress"/>
......@@ -85,6 +100,11 @@
<include name="**/*.*"/>
</fileset>
<!-- Delete the fingerprint script -->
<fileset dir="${target-folder}/${fingerprint-folder}">
<include name="${fingerprint-file}"/>
</fileset>
<!-- Delete the Extjs-mod files -->
<fileset dir="${target-folder}/${extjs-mod-folder}">
<include name="${extjs-mod-debugfile}"/>
......@@ -101,6 +121,9 @@
<include name="${zarafa-debugfile}"/>
</fileset>
</delete>
<!-- Delete the Zarafa themes -->
<delete dir="${target-folder}/${zarafa-themes-target-folder}"/>
</target>
<!-- Prepare build, copy ExtJs files to target folder -->
......@@ -121,6 +144,7 @@
<include name="${ux-all-file}"/>
</fileset>
</copy>
<copy file="${fingerprint-file}" tofile="${target-folder}/${fingerprint-folder}/${fingerprint-debugfile}"></copy>
<copy todir="${target-folder}/${tinymce-folder}">
<fileset dir="${tinymce-folder}">
<include name="**/*.*"/>
......@@ -170,13 +194,26 @@
<fileset dir="zarafa" includes="**/*.js" />
</concatfiles>
</zConcat>
<!-- Compile SASS files -->
<!-- FIXME: throw error when compass is not found
<echo message="Compiling: ${zarafa-design2015-css-file}"/>
<exec executable="compass" failonerror="true" logError="true">
<arg value="compile" />
<arg value="-\-boring" />
<arg value="-c" />
<arg value="${zarafa-design2015-css-folder}/../config.rb" />
<arg value="${zarafa-design2015-css-folder}/../"/>
</exec>
-->
<!-- Concatenate zarafa CSS files -->
<mkdir dir="${target-folder}/${zarafa-css-folder}"/>
<echo message="Concatenating: ${zarafa-css-file}"/>
<zConcat outputFolder="${target-folder}/${zarafa-css-folder}" outputFile="${zarafa-css-file}">
<concatfiles>
<fileset dir="${zarafa-css-folder}" includes="**/*.css" />
<!--<fileset dir="${zarafa-css-folder}" includes="**/*.css" />-->
<fileset dir="${zarafa-design2015-css-folder}" includes="**/*.css" excludes="external/**/*.css" />
</concatfiles>
</zConcat>
</target>
......@@ -214,6 +251,14 @@
</externs>
</zCompile>
<echo message="Compiling: ${fingerprint-file}" />
<zCompile inputFolder="${target-folder}/${fingerprint-folder}" inputFile="${fingerprint-debugfile}" outputFolder="${target-folder}/${fingerprint-folder}" outputFile="${fingerprint-file}" warningLevel="default">
<externs>
var Ext = {};
var console = {};
</externs>
</zCompile>
<echo message="Compiling: ${thirdparty-file}" />
<zCompile inputFolder="${target-folder}/${thirdparty-folder}" inputFile="${thirdparty-debugfile}" outputFolder="${target-folder}/${thirdparty-folder}" outputFile="${thirdparty-file}" warningLevel="default">
<externs>
......@@ -246,6 +291,7 @@
var ngettext = function(msgid, msgid_plural, count) {};
var npgettext = function(msgctxt, msgid, msgid_plural, count) {};
var pgettext = function(msgctxt, msgid) {};
var onResize = function() {};
</externs>
</zCompile>
</target>
......@@ -272,6 +318,35 @@
<!-- CSS is generated during build -->
<exclude name="resources/css/*.*"/>
<exclude name="third-party/resources/css/*.*"/>
<!-- exclude new design images and scss -->
<include name="resources/design2015/css/external/*.css" />
<exclude name="resources/design2015/**/*" />
</fileset>
</copy>
<!-- copy files -->
<copy todir="${target-folder}">
<fileset dir=".">
<include name="resources/design2015/css/external/*.css" />
<include name="resources/design2015/images/*" />
</fileset>
</copy>
<!-- Copy the images of the new design to the images folder -->
<echo message="Copying ${zarafa-design2015-images-folder}"/>
<copy todir="${target-folder}/${zarafa-images-folder}">
<fileset dir="${zarafa-design2015-images-folder}">
<include name="*.png"/>
<include name="*.gif"/>
</fileset>
</copy>
<!-- Copy the themes -->
<echo message="Copying ${zarafa-themes-folder} to ${target-folder}/${zarafa-themes-target-folder}"/>
<copy todir="${target-folder}/${zarafa-themes-target-folder}" includeEmptyDirs="false">
<fileset dir="${zarafa-themes-folder}">
<exclude name="**/*.js"/>
</fileset>
</copy>
</target>
......
This diff is collapsed.
This diff is collapsed.
......@@ -15,6 +15,7 @@
var orig_update = Ext.DatePicker.prototype.update;
var orig_beforeDestroy = Ext.DatePicker.prototype.beforeDestroy;
var orig_initComponent = Ext.DatePicker.prototype.initComponent;
var orig_selectToday = Ext.DatePicker.prototype.selectToday;
Ext.override(Ext.DatePicker, {
/**
* @cfg {number} width width of the datepicker (defaults to auto)
......@@ -35,6 +36,14 @@
*/