tine20
5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Thu, 16 Jun 2016 08:53:08 +0000 (10:53 +0200)]
Merge branch '2014.11' into 2015.11

Conflicts:
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Frontend/iMIP.php
tine20/Sales/Setup/Update/Release8.php

Change-Id: I94ce69a37d81e860f8fdef95fe687d3eb26bf735

5 years ago0011942: MacOSX - GROUP rewrite to INTELLIGROUP
Paul Mehrer [Thu, 2 Jun 2016 10:33:16 +0000 (12:33 +0200)]
0011942: MacOSX - GROUP rewrite to INTELLIGROUP

rewrite attendee cutype 'GROUP' to 'INTELLIGROUP' for export
and vice versa for import due to malbehaviour of ical

https://forge.tine20.org/view.php?id=11942

Change-Id: I83651323a682dae2688a9b34508cbd366bb906eb
Reviewed-on: http://gerrit.tine20.com/customers/3187
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010890: Sales module can not be successfully updated to 2014.09.8
Philipp Schüle [Mon, 13 Jun 2016 11:02:51 +0000 (13:02 +0200)]
0010890: Sales module can not be successfully updated to 2014.09.8

https://forge.tine20.org/view.php?id=10890

Change-Id: Ia213a0ea378824dc91d3b67e9342f344410ecdda
Reviewed-on: http://gerrit.tine20.com/customers/3228
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011890: disallow external attendee status setting for external organizer
Cornelius Weiß [Mon, 30 May 2016 16:00:12 +0000 (18:00 +0200)]
0011890: disallow external attendee status setting for external organizer

Change-Id: I47bc3235431650d786b6798b14b500b62d7addd4
Reviewed-on: http://gerrit.tine20.com/customers/3184
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago'Internal Contacts' container was missing contact model
Philipp Schüle [Tue, 14 Jun 2016 12:09:46 +0000 (14:09 +0200)]
'Internal Contacts' container was missing contact model

Change-Id: Ib380acad54946cf0ac0d5e6bc3b054692a097969
Reviewed-on: http://gerrit.tine20.com/customers/3232
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Tue, 14 Jun 2016 09:11:59 +0000 (11:11 +0200)]
Merge branch '2014.11' into 2015.11

5 years ago0011930: conjunction operator not shown correctly in rule edit dialog
Philipp Schüle [Mon, 13 Jun 2016 09:59:12 +0000 (11:59 +0200)]
0011930: conjunction operator not shown correctly in rule edit dialog

* set operator on record load
* adds translation for 'or' operator

https://forge.tine20.org/view.php?id=11930

Change-Id: I7a0f0fdcb7e3315792460e4883bb5eadce01dd31
Reviewed-on: http://gerrit.tine20.com/customers/3226
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011932: show address and customer data for manual invoices
Philipp Schüle [Mon, 13 Jun 2016 10:39:08 +0000 (12:39 +0200)]
0011932: show address and customer data for manual invoices

* fixes company name and address data display

https://forge.tine20.org/view.php?id=11932

Change-Id: I89301971a531d8adf7020651744fccab03a588e7
Reviewed-on: http://gerrit.tine20.com/customers/3227
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011936: Allow compose Mail for select all pages
sstamer [Tue, 31 May 2016 08:50:55 +0000 (10:50 +0200)]
0011936: Allow compose Mail for select all pages

https://forge.tine20.org/view.php?id=11936

Change-Id: Id2fb6ab0ee872f63493070103e1f09a50938fd99
Reviewed-on: http://gerrit.tine20.com/customers/3230
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoremove external_seq from modlog
Philipp Schüle [Fri, 10 Jun 2016 15:57:31 +0000 (17:57 +0200)]
remove external_seq from modlog

... as the user does not know what this means

Change-Id: I8ed889d8b7812b9d5d6c775be6bdb11159d9462c
Reviewed-on: http://gerrit.tine20.com/customers/3225
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agouse Addressbook list view feature switch to disable query
Paul Mehrer [Fri, 27 May 2016 15:20:47 +0000 (17:20 +0200)]
use Addressbook list view feature switch to disable query

surrounding a query part by a feature switch

Change-Id: If42e2395a785e0499620a9e075bdebc9478e6116
Reviewed-on: http://gerrit.tine20.com/customers/3203
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011904: Disable manage profile if the user has no right
sstamer [Tue, 31 May 2016 12:46:40 +0000 (14:46 +0200)]
0011904: Disable manage profile if the user has no right

https://forge.tine20.org/view.php?id=11904

Change-Id: Ib838e8b8388afc2ddb40475b99ca22c39c49d6b9
Reviewed-on: http://gerrit.tine20.com/customers/3197
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agogetRelations: fixes phpdoc and set fallback for types
Philipp Schüle [Thu, 9 Jun 2016 12:16:28 +0000 (14:16 +0200)]
getRelations: fixes phpdoc and set fallback for types

... as sometimes the clients sends NULL for $type

Change-Id: I58e2b0d5e0cf13df094521a151d15bb0175c25d6
Reviewed-on: http://gerrit.tine20.com/customers/3221
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)]
Merge branch '2014.11' into 2015.11

5 years agoRevert "11888 increase announced own cloud server version"
Philipp Schüle [Wed, 8 Jun 2016 10:53:24 +0000 (12:53 +0200)]
Revert "11888 increase announced own cloud server version"

THIS BREAKS OLDER OWNCLOUD CLIENTS!

This reverts commit 203dadea2feb0f9ac48cbdc185526ee224a26058.

Change-Id: I94e6762b97af35b5114c288fa4dbfe9c4b623087
Reviewed-on: http://gerrit.tine20.com/customers/3205
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Tue, 7 Jun 2016 13:56:55 +0000 (15:56 +0200)]
Merge branch '2014.11' into 2015.11

5 years ago0011906: Fix contact type not sortable
sstamer [Mon, 6 Jun 2016 14:47:32 +0000 (16:47 +0200)]
0011906: Fix contact type not sortable

https://forge.tine20.org/view.php?id=11906

Change-Id: Ica5d727ce709ff090cd3a670a2276f28d648f6f0
Reviewed-on: http://gerrit.tine20.com/customers/3192
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011884: fix expresso css include flaw
Cornelius Weiß [Fri, 27 May 2016 14:08:20 +0000 (16:08 +0200)]
0011884: fix expresso css include flaw

https://forge.tine20.org/view.php?id=11884

Change-Id: Ia9e5b6a63d9c8d581a5993bef74933cf9d6757d4
Reviewed-on: http://gerrit.tine20.com/customers/3181
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11888 increase announced own cloud server version
Cornelius Weiß [Fri, 27 May 2016 18:15:57 +0000 (20:15 +0200)]
11888 increase announced own cloud server version

-> use 9.0.2, latest version

Change-Id: I5d0593abea7c279a362a4c7494e3c39c7c8c79ba
Reviewed-on: http://gerrit.tine20.com/customers/3183
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011872: add imported members to default group
sstamer [Fri, 13 May 2016 10:40:14 +0000 (12:40 +0200)]
0011872: add imported members to default group

https://forge.tine20.org/view.php?id=11872

Change-Id: I463b740103db13590456369025abe1f21d6d859e
Reviewed-on: http://gerrit.tine20.com/customers/3157
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11876: Fix Resource invite for splitview
sstamer [Thu, 19 May 2016 09:28:37 +0000 (11:28 +0200)]
11876: Fix Resource invite for splitview

https://forge.tine20.org/view.php?id=11876

- Type user was forced on resource type attendee

Change-Id: I837e7c4d466a856385a13cd5bc6a072a1e36c1f7
Reviewed-on: http://gerrit.tine20.com/customers/3170
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011870: Tinebase_ActionQueue - 100% CPU worker process
Paul Mehrer [Tue, 17 May 2016 12:19:32 +0000 (14:19 +0200)]
0011870: Tinebase_ActionQueue - 100% CPU worker process

if no proper backend is configured, the worker process
just quits instead of running in an infinite loop

https://forge.tine20.org/view.php?id=11870

Change-Id: I28344d2f5124ad8cd282908d9d9d6186b5c29331
Reviewed-on: http://gerrit.tine20.com/customers/3163
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)]
Merge branch '2014.11' into 2015.11

5 years agoclient expects default container in 'defaultContainer' registry key
Philipp Schüle [Tue, 17 May 2016 15:03:55 +0000 (17:03 +0200)]
client expects default container in 'defaultContainer' registry key

... on CRM lead import

Change-Id: I691886022bb392d82adf08f353766b5ff9bd0a5b
Reviewed-on: http://gerrit.tine20.com/customers/3164
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011844: decodeSid fails for some encoded SIDs
Philipp Schüle [Tue, 10 May 2016 13:43:48 +0000 (15:43 +0200)]
0011844: decodeSid fails for some encoded SIDs

* encoded Sids might contain dashes -.-
* adds a test
* improves logging

https://forge.tine20.org/view.php?id=11844

Change-Id: Ief81024e3d1c4cd862a587e93529717af88c7f79
Reviewed-on: http://gerrit.tine20.com/customers/3139
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011860: Firefox: error message after setup.php login
Philipp Schüle [Fri, 13 May 2016 14:31:43 +0000 (16:31 +0200)]
0011860: Firefox: error message after setup.php login

* skip exception handling when tine is reloading

... this "fixes" the Firefox problem during setup
 which might be caused by a timing issue and stacked
  registry clearing / reloading

 https://forge.tine20.org/view.php?id=11860

Change-Id: I877de443753bf0014d0a7872e4786b00e6b47dff
Reviewed-on: http://gerrit.tine20.com/customers/3161
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011858: renamed fields might break concurrent update
Philipp Schüle [Thu, 12 May 2016 16:07:13 +0000 (18:07 +0200)]
0011858: renamed fields might break concurrent update

* checks if property exists in record with has()
* renames a remaining "price" property to salesprice
 in lead pdf export

https://forge.tine20.org/view.php?id=11858

Change-Id: I27d0aa661a5837498468a28f59c12bc871959a49
Reviewed-on: http://gerrit.tine20.com/customers/3154
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11574: backup should only dump structure of some tables
Paul Mehrer [Tue, 12 Apr 2016 11:18:37 +0000 (13:18 +0200)]
11574: backup should only dump structure of some tables

added <backupStructureOnly> flag to setup.xml

https://forge.tine20.org/view.php?id=11574

Change-Id: I0959a1f5f3c006770c9ffb507d3f7a8e8fe313d3
Reviewed-on: http://gerrit.tine20.com/customers/3159
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011856: setup tests: make phpunitconfig.inc.php optional
Philipp Schüle [Thu, 12 May 2016 15:24:11 +0000 (17:24 +0200)]
0011856: setup tests: make phpunitconfig.inc.php optional

improves setup tests bootstrap

* adds bootstrap.php
* extends "normal" TestServer
* allows to get test credentials from phpunit config
 OR config.inc.php

https://forge.tine20.org/view.php?id=11856

Change-Id: I05104b0bb847d24946d676da84ace6eed0e3335f
Reviewed-on: http://gerrit.tine20.com/customers/3153
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoimproved test config handling
Philipp Schüle [Thu, 12 May 2016 15:22:14 +0000 (17:22 +0200)]
improved test config handling

* adds lazy loading for config
* use test credentials in caldav test
* always use getConfig of TestServer instance

Change-Id: If8e33fcd99030bfdb7a9902d3a103161f6b69f7a
Reviewed-on: http://gerrit.tine20.com/customers/3152
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixed blacklisting of tine20 config
Philipp Schüle [Tue, 10 May 2016 08:45:05 +0000 (10:45 +0200)]
fixed blacklisting of tine20 config

... use subdir /etc/tine20 as all of /etc
 throws "permission denied"

Change-Id: Icd22a199c8d9097951a347fe6acf6820007e73f7
Reviewed-on: http://gerrit.tine20.com/customers/3137
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoremove limitation for order confirmation and contract
sstamer [Fri, 6 May 2016 13:20:59 +0000 (15:20 +0200)]
remove limitation for order confirmation and contract

Change-Id: Ia6a032bfe4dd0fa456823198d841a63245e9e236
Reviewed-on: http://gerrit.tine20.com/customers/3135
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoAdd Debitor and price net, tax, gross to invoice export
sstamer [Fri, 6 May 2016 13:00:51 +0000 (15:00 +0200)]
Add Debitor and price net, tax, gross to invoice export

Change-Id: I4365cbefe0f85940442658d595aea188951abff3
Reviewed-on: http://gerrit.tine20.com/customers/3134
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Mon, 9 May 2016 12:02:00 +0000 (14:02 +0200)]
Merge branch '2014.11' into 2015.11

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)]
Merge branch '2013.10' into 2014.11

5 years ago0011842: import full related record data
Philipp Schüle [Mon, 9 May 2016 10:47:30 +0000 (12:47 +0200)]
0011842: import full related record data

* allows to import all related record (scalar) fields

side effects:
* setRelations(): use existing relations if only relation id is missing
* makes deleteLinkedRelations public (to be able to
 use it in test case cleanup)
* show relations in CRM lead duplicate conflict panel
* improve plugin failure message

https://forge.tine20.org/view.php?id=11842

Change-Id: Ic9e01d3d5797ff009f5bffbb02ef6f7c34be2cd6
Reviewed-on: http://gerrit.tine20.com/customers/3131
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011840: iCal 10.11: problem with recurring events
Paul Mehrer [Tue, 3 May 2016 14:41:57 +0000 (16:41 +0200)]
0011840: iCal 10.11: problem with recurring events

changed href format for invite/user/href

OS X 10.11 ical client doesn't accept a URI formated href
in the invite/user/href tag anymore. Changed format to
urn:uuid

https://forge.tine20.org/view.php?id=11840

Change-Id: I8d59f1da55f3345bfeb1f912e17f8f4b7c753db6
Reviewed-on: http://gerrit.tine20.com/customers/3127
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoblacklist some more files and directories for code coverage
Philipp Schüle [Mon, 2 May 2016 15:10:52 +0000 (17:10 +0200)]
blacklist some more files and directories for code coverage

Change-Id: I9aa2243aafb4fc21297ff17b48b1aa98cbc21210
Reviewed-on: http://gerrit.tine20.com/customers/3123
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodon't create coverage for tests
Philipp Schüle [Mon, 2 May 2016 07:50:38 +0000 (09:50 +0200)]
don't create coverage for tests

Change-Id: I6be8da4194015592e0b62051aef55f7574557d86
Reviewed-on: http://gerrit.tine20.com/customers/3117
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoecho import exceptions in csv hook test
Philipp Schüle [Mon, 2 May 2016 07:54:25 +0000 (09:54 +0200)]
echo import exceptions in csv hook test

Change-Id: I7bde48447aa36eccc562bd7fb8ae7621b07a28c8
Reviewed-on: http://gerrit.tine20.com/customers/3118
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010132: Create Folder inside a folder with the same name
Philipp Schüle [Thu, 28 Apr 2016 11:06:50 +0000 (13:06 +0200)]
0010132: Create Folder inside a folder with the same name

* use array_diff_assoc instead of array_diff ...
* improve robustness of js tree node creation
* fixes test

 https://forge.tine20.org/view.php?id=10132

Change-Id: Ic2e926f8fb1ebfc3ff97a15730eaaa04221f7514
Reviewed-on: http://gerrit.tine20.com/customers/3112
Tested-by: Jenkins CI (http://ci.tine20.com/)
Tested-by: sstamer <s.stamer@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11-develop' into 2015.11
Philipp Schüle [Fri, 29 Apr 2016 10:16:33 +0000 (12:16 +0200)]
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tests/tine20/Tinebase/ControllerTest.php

Change-Id: Ia366fe87ea514e6f879c6b654432da04c1f6ae0e

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years agoadds phpunit.xml for setup tests
Philipp Schüle [Fri, 29 Apr 2016 09:37:24 +0000 (11:37 +0200)]
adds phpunit.xml for setup tests

Change-Id: I211853685c784f5131fe59f6fbb7b7aea2761e73
Reviewed-on: http://gerrit.tine20.com/customers/3114
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds vendor and library dirs to code coverage blacklist
Philipp Schüle [Fri, 29 Apr 2016 08:19:00 +0000 (10:19 +0200)]
adds vendor and library dirs to code coverage blacklist

* ... in phpunit.xml
* it seems that setting this in TestServer is not working
 any longer -> should be investigated

Change-Id: Ib1da96d64a689ad09b1c1bf61cdd67d46f520e2c
Reviewed-on: http://gerrit.tine20.com/customers/3113
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoimproves maintenanceMode test
Philipp Schüle [Mon, 25 Apr 2016 15:06:54 +0000 (17:06 +0200)]
improves maintenanceMode test

Change-Id: Id8a1376cadb0b1785a5b94af6555c087a7ea96eb
Reviewed-on: http://gerrit.tine20.com/customers/3096
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoonly call updateMultiple if something changed
Philipp Schüle [Wed, 27 Apr 2016 09:33:41 +0000 (11:33 +0200)]
only call updateMultiple if something changed

 ... in updateProductLifespan

Change-Id: Idaab6f1d75fc42f1f082e9dfdf9c2d4fa73a6742
Reviewed-on: http://gerrit.tine20.com/customers/3098
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds another sleep(1) to email tests
Philipp Schüle [Thu, 28 Apr 2016 12:49:59 +0000 (14:49 +0200)]
adds another sleep(1) to email tests

.... because mail servers sometimes needs
 more time to send/receive mails

Change-Id: I0c790d9826e973985de222053915b0a62f1c0024
Reviewed-on: http://gerrit.tine20.com/customers/3110
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoallow coverage-* options in phpunit
Philipp Schüle [Thu, 28 Apr 2016 12:43:59 +0000 (14:43 +0200)]
allow coverage-* options in phpunit

Change-Id: I91a3eda9781981e2e68bc993db8559c36c91520a
Reviewed-on: http://gerrit.tine20.com/customers/3109
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix missing extraFreetime Icons
sstamer [Thu, 28 Apr 2016 12:13:42 +0000 (14:13 +0200)]
fix missing extraFreetime Icons

Change-Id: Idc996e34e352ac784cc3c3d60b9f20b195e597cc
Reviewed-on: http://gerrit.tine20.com/customers/3108
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoCrm Demo Data - Out of memory
Paul Mehrer [Thu, 14 Apr 2016 09:09:02 +0000 (11:09 +0200)]
Crm Demo Data - Out of memory

using filters instead of getting all addressbook contacts
in order to minimize memory footprint

Change-Id: Ifd2d29abd0b35e5327690b226e5da49faaa71d4e
Reviewed-on: http://gerrit.tine20.com/customers/3049
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodeactivate testStudentNameSchemaSpecialChars for AD backend
Philipp Schüle [Fri, 22 Apr 2016 09:10:16 +0000 (11:10 +0200)]
deactivate testStudentNameSchemaSpecialChars for AD backend

Change-Id: I4611a732fad1fd75f5e86316f1ba3aeb65bc88ce
Reviewed-on: http://gerrit.tine20.com/customers/3076
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodefault is a reserved keyword
Philipp Schüle [Mon, 25 Apr 2016 11:20:10 +0000 (13:20 +0200)]
default is a reserved keyword

... which makes jsb2tk fail :(

Change-Id: I05573fddfb815e62904652040d680801fdbd7b6a
Reviewed-on: http://gerrit.tine20.com/customers/3090
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes default handling of record types
Philipp Schüle [Mon, 25 Apr 2016 10:11:58 +0000 (12:11 +0200)]
fixes default handling of record types

... when new relation is added

Change-Id: I9e459db746b47280825000a20a5ff742fa116ad6
Reviewed-on: http://gerrit.tine20.com/customers/3083
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds some tolerance to LDAP expiry date test case
Philipp Schüle [Fri, 22 Apr 2016 08:11:21 +0000 (10:11 +0200)]
adds some tolerance to LDAP expiry date test case

... to prevent this problem:
expiry date should still be the same
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'2016-04-22 07:29:30'
+'2016-04-22 07:29:29'

Change-Id: I3ae52b8ca1db0cd6104ec0d4de2a2998875d4898
Reviewed-on: http://gerrit.tine20.com/customers/3075
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoallows to set the testsuite in phpunit-exec target
Philipp Schüle [Fri, 22 Apr 2016 07:41:55 +0000 (09:41 +0200)]
allows to set the testsuite in phpunit-exec target

... now we can run the setup tests with the same command
... just set testsuite=setup

Change-Id: If293b08ecf235d5030ff095f0a08e451d3302126
Reviewed-on: http://gerrit.tine20.com/customers/3074
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoimproves courses test
Philipp Schüle [Thu, 21 Apr 2016 15:14:08 +0000 (17:14 +0200)]
improves courses test

* use better course name (random number instead of uid)
because of this problem: invalid syntax; 0000200B: objectclass_attrs:
  attribute 'primarygroupid' on entry
 cn=26996840717c13e546ba82a60a04738fbfe67b9b Lehrer,
 cn=Users,dc=example,dc=org' contains at least one invalid value!

Change-Id: I445b0874ea59ae004ff9e8db43516b61c5105f29
Reviewed-on: http://gerrit.tine20.com/customers/3072
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds zf1 include path to phpunit-serv test task
Philipp Schüle [Thu, 21 Apr 2016 07:50:36 +0000 (09:50 +0200)]
adds zf1 include path to phpunit-serv test task

Change-Id: Iaa055be64bcb1bc72b5618392c1b691db11830c6
Reviewed-on: http://gerrit.tine20.com/customers/3066
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoDE translation issue: Default -> Standard
Philipp Schüle [Wed, 20 Apr 2016 07:53:30 +0000 (09:53 +0200)]
DE translation issue: Default -> Standard

Change-Id: Ie3349af5582fe65b57ff0438662ab4b400bf4de5
Reviewed-on: http://gerrit.tine20.com/customers/3061
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11-develop' into 2015.11
Philipp Schüle [Wed, 20 Apr 2016 10:21:17 +0000 (12:21 +0200)]
Merge branch '2014.11-develop' into 2015.11

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 20 Apr 2016 10:21:03 +0000 (12:21 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years agoadds langHelper usage test
Philipp Schüle [Fri, 18 Mar 2016 09:05:18 +0000 (10:05 +0100)]
adds langHelper usage test

* and removes "--color" param when assembling cli cmd

Change-Id: I935d51ecf86695bc162d457c2a813e742a5f75eb
Reviewed-on: http://gerrit.tine20.com/customers/2935
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agouse another name for test contact
Philipp Schüle [Tue, 19 Apr 2016 15:48:45 +0000 (17:48 +0200)]
use another name for test contact

... to prevent duplicate exceptions

Change-Id: Ife48cbba7169eb31d39c0a581879ce0fc1132513
Reviewed-on: http://gerrit.tine20.com/customers/3060
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11788: Always set is_billable if timeaccount is billable
sstamer [Fri, 15 Apr 2016 10:15:30 +0000 (12:15 +0200)]
11788: Always set is_billable if timeaccount is billable

https://forge.tine20.org/view.php?id=11788

- This is needed for copied sheets

Change-Id: I0513c4ef7057d91b9a014aa1c9e1d5d81cb308c6
Reviewed-on: http://gerrit.tine20.com/customers/3050
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodon't show duplicates as failures in import summary
Philipp Schüle [Wed, 13 Apr 2016 14:42:07 +0000 (16:42 +0200)]
don't show duplicates as failures in import summary

Change-Id: I30ce6908787035985993017bb7014e9aaeb93b45
Reviewed-on: http://gerrit.tine20.com/customers/3047
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoonly try to replace matching target fields
Philipp Schüle [Wed, 13 Apr 2016 14:41:27 +0000 (16:41 +0200)]
only try to replace matching target fields

... of related records during import when
targetField option is given
.... and check if it's a scalar, we can't handle
 non-scalars yet

Change-Id: I555aefcf6c67d051de8da8c213d3088ab5b09749
Reviewed-on: http://gerrit.tine20.com/customers/3046
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011780: avoid PHP Fatal if node is missing
Cornelius Weiß [Mon, 11 Apr 2016 17:04:13 +0000 (19:04 +0200)]
0011780: avoid PHP Fatal if node is missing

Change-Id: I6fc412c5ad732ea2a32f1c2815536e128407d729
Reviewed-on: http://gerrit.tine20.com/customers/3041
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11784 support ownclouds X-OC-MTime header
Cornelius Weiß [Fri, 15 Apr 2016 12:40:57 +0000 (14:40 +0200)]
11784 support ownclouds X-OC-MTime header

NOTE:
* this is a hack as good solution would change too much
* automated test not possible due to headers already send problem
* see 0011786: support ctime/mtime as file properties

Change-Id: I33940c09533c5d13d2e0e242a3f9f2608d74b504
Reviewed-on: http://gerrit.tine20.com/customers/3051
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoset param defaults in createNodes
Philipp Schüle [Sat, 19 Mar 2016 12:45:44 +0000 (13:45 +0100)]
set param defaults in createNodes

... client might omit tempFileIds and/or forceOverwrite

Change-Id: I1754f125adaecf879761bcfbfa1b9fa8c3b4a67b
Reviewed-on: http://gerrit.tine20.com/customers/2938
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011794: lazy init of comboboxes fails sometimes
Philipp Schüle [Mon, 18 Apr 2016 14:13:25 +0000 (16:13 +0200)]
0011794: lazy init of comboboxes fails sometimes

deactivates lazyInit for
* recipient search
* timeaccount search

https://forge.tine20.org/view.php?id=11794

Change-Id: I583f2a31b05bd46d8de310876a22652cd5f223cc
Reviewed-on: http://gerrit.tine20.com/customers/3055
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011792: private email address is added on recipient selection
Philipp Schüle [Mon, 18 Apr 2016 14:03:42 +0000 (16:03 +0200)]
0011792: private email address is added on recipient selection

* when editor combo is reset, the record with the private
 address is fetched from store
* we no longer search for records with an empty id in the record
 picker combo

https://forge.tine20.org/view.php?id=11792

Change-Id: I33c5ec3bd0a593d97e9d1fbd8ca7e2449450eae6
Reviewed-on: http://gerrit.tine20.com/customers/3054
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11-sambaad' into 2015.11
Philipp Schüle [Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)]
Merge branch '2015.11-sambaad' into 2015.11

5 years agofixes tests for samba ad
Philipp Schüle [Tue, 5 Apr 2016 16:18:07 +0000 (18:18 +0200)]
fixes tests for samba ad

* use getDefaultGroup fns instead of hard coded group names
* skip some tests that try to create multiple users with same CN
* obey to default ad password complexity
* users and groups can't have the same name in ad default setup
 (same base dn)
* disabled some test (users have no account
 email addresses with samba ad)

... and makes sure that users/groups are deleted
 in TestCase::tearDown, too

Change-Id: I80440ac13006bd0942c43daefabfbe289fb7ea19
Reviewed-on: http://gerrit.tine20.com/customers/3007
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoallows startTLS for ad accounts backend
Philipp Schüle [Mon, 18 Apr 2016 16:15:42 +0000 (18:15 +0200)]
allows startTLS for ad accounts backend

Change-Id: I943e88eb5633ad4216713a5cf285cf4425211451
Reviewed-on: http://gerrit.tine20.com/customers/3056
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoremove "org" from jsclient.php
Philipp Schüle [Mon, 18 Apr 2016 08:52:04 +0000 (10:52 +0200)]
remove "org" from jsclient.php

Change-Id: I521a94c41f36ee5fa11ba77fc1313be1d4072b6e
Reviewed-on: http://gerrit.tine20.com/customers/3053
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011774: include sabreDAV debug traces to tine20 debug log
Cornelius Weiß [Mon, 11 Apr 2016 10:31:20 +0000 (12:31 +0200)]
0011774: include sabreDAV debug traces to tine20 debug log

Change-Id: I77e89960f971ce985d8e682f3db2c03a959391dc
Reviewed-on: http://gerrit.tine20.com/customers/3033
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011778: webdav download of large files fails with debug log
Cornelius Weiß [Mon, 11 Apr 2016 13:22:10 +0000 (15:22 +0200)]
0011778: webdav download of large files fails with debug log

Change-Id: Iad549cc3c7fbc13638eea259bda06f5f5f3c2e0c
Reviewed-on: http://gerrit.tine20.com/customers/3039
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011776: webdav fails when accountDisplayName != n_fileas
Cornelius Weiß [Mon, 11 Apr 2016 11:42:12 +0000 (13:42 +0200)]
0011776: webdav fails when accountDisplayName != n_fileas

Change-Id: I8da65e8d5c963daaa0f8d9f0ea22160348cb9dd6
Reviewed-on: http://gerrit.tine20.com/customers/3036
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011766: Show date at all busy conflict
sstamer [Tue, 5 Apr 2016 12:07:53 +0000 (14:07 +0200)]
0011766: Show date at all busy conflict

https://forge.tine20.org/view.php?id=11766

Change-Id: Idaa5f4005797c9239af4079cf5d16046b3d88492
Reviewed-on: http://gerrit.tine20.com/customers/3002
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoTrim whitespace in combined import fields
sstamer [Mon, 11 Apr 2016 09:46:35 +0000 (11:46 +0200)]
Trim whitespace in combined import fields

Change-Id: Ie2fe5153ef0e8669af0023280933c89922546e9b
Reviewed-on: http://gerrit.tine20.com/customers/3029
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011770: FF: "null" displayed in contact data template
Philipp Schüle [Fri, 8 Apr 2016 14:53:03 +0000 (16:53 +0200)]
0011770: FF: "null" displayed in contact data template

* return empty string in encode/doubleEncode if value is null

https://forge.tine20.org/view.php?id=11770

Change-Id: If51e39b1f674d656fb6ac0cfabf5bcad913551fe
Reviewed-on: http://gerrit.tine20.com/customers/3023
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011768: import relations: allow to define more filter and record fields
Philipp Schüle [Fri, 8 Apr 2016 11:45:05 +0000 (13:45 +0200)]
0011768: import relations: allow to define more filter and record fields

* adds new filterValueAdd field config to be able to search for multiple
 record properties when trying to find a related record in import

 https://forge.tine20.org/view.php?id=11768

Change-Id: Id92bc3afe6cb0a3c00d90423088d5f2d42f646bf
Reviewed-on: http://gerrit.tine20.com/customers/3022
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds duplicate resolve configuration and labels for Leads
Philipp Schüle [Fri, 8 Apr 2016 09:05:01 +0000 (11:05 +0200)]
adds duplicate resolve configuration and labels for Leads

Change-Id: I2e16e2640e7d4afcfc174b83f0706af019097328
Reviewed-on: http://gerrit.tine20.com/customers/3019
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agocatch problem with missing tags
Philipp Schüle [Fri, 8 Apr 2016 09:05:18 +0000 (11:05 +0200)]
catch problem with missing tags

... in duplicate resolve panel

Change-Id: I4a1758137d6017344af68b8c39310c277a466ee0
Reviewed-on: http://gerrit.tine20.com/customers/3020
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11-develop' into 2015.11
Philipp Schüle [Thu, 7 Apr 2016 07:42:32 +0000 (09:42 +0200)]
Merge branch '2014.11-develop' into 2015.11

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 7 Apr 2016 07:42:13 +0000 (09:42 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years ago0011728: Split of a recurring series is not displayed correctly
Cornelius Weiß [Mon, 14 Mar 2016 13:27:14 +0000 (14:27 +0100)]
0011728: Split of a recurring series is not displayed correctly

- Split of a recurring series on multiple days (delete this and
all future) is not displayed correctly in days view

https://forge.tine20.org/view.php?id=11728

Change-Id: Ia5a3bbc95b086561c93ecca886233113d311c147
Reviewed-on: http://gerrit.tine20.com/customers/2900
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11-ldap' into 2015.11
Philipp Schüle [Wed, 6 Apr 2016 14:41:45 +0000 (16:41 +0200)]
Merge branch '2015.11-ldap' into 2015.11

5 years agoSet quicksearch as default filter for invoces and purchase invoces
sstamer [Tue, 5 Apr 2016 12:56:53 +0000 (14:56 +0200)]
Set quicksearch as default filter for invoces and purchase invoces

Change-Id: Ib867cc483b29edd62cad99627730fe353c5ada12
Reviewed-on: http://gerrit.tine20.com/customers/3010
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11-php7' into 2015.11
Philipp Schüle [Wed, 6 Apr 2016 08:35:31 +0000 (10:35 +0200)]
Merge branch '2015.11-php7' into 2015.11

5 years agoremoves deprecated warning for iconv_set_encoding
Philipp Schüle [Tue, 5 Apr 2016 13:49:37 +0000 (15:49 +0200)]
removes deprecated warning for iconv_set_encoding

.... with php > 5.6

Change-Id: Ibb6cd9bd7319c94f65ee13fdaba0a6aa08a81e60
Reviewed-on: http://gerrit.tine20.com/customers/3005
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agouse getDefaultGroup() in DemoData instead of hard coded 'Users'
Philipp Schüle [Tue, 5 Apr 2016 13:56:57 +0000 (15:56 +0200)]
use getDefaultGroup() in DemoData instead of hard coded 'Users'

... as this breaks in samba ad setup

Change-Id: I56b4560cc18d0757a28fb8c348352f587e70eae1
Reviewed-on: http://gerrit.tine20.com/customers/3006
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11-sambaad' into 2015.11
Philipp Schüle [Tue, 5 Apr 2016 13:58:08 +0000 (15:58 +0200)]
Merge branch '2015.11-sambaad' into 2015.11

5 years ago0011686: Editing Users / Sync with Active Directory doesn't work
Philipp Schüle [Wed, 30 Mar 2016 18:26:46 +0000 (20:26 +0200)]
0011686: Editing Users / Sync with Active Directory doesn't work

* don't try to set cn when updating AD entries as
 this is only allowed via rename()
* fixes rename() case for AD groups by using configured groupsDN
* improves some variable names

https://forge.tine20.org/view.php?id=11686

Change-Id: If3cd22f5e7b25b37c50199a7bf542739cac289fa
Reviewed-on: http://gerrit.tine20.com/customers/2996
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11-php7' into 2015.11
Philipp Schüle [Mon, 4 Apr 2016 15:25:24 +0000 (17:25 +0200)]
Merge branch '2015.11-php7' into 2015.11

5 years ago0011704 / PHP 7 can't decode empty JSON
Johannes Nohl [Wed, 23 Mar 2016 00:58:15 +0000 (01:58 +0100)]
0011704 / PHP 7 can't decode empty JSON

https://forge.tine20.org/view.php?id=11704

Change-Id: I38d9f35754f7e6815e2c122a9c0b5c3da08f3795
Reviewed-on: http://gerrit.tine20.com/customers/2960
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011746: fix multiple php7 issues
Paul Mehrer [Thu, 31 Mar 2016 10:53:01 +0000 (12:53 +0200)]
0011746: fix multiple php7 issues

* silenced deprecation message in Zend/Locale/Format.php
* temporary marked Crm_Export_XlsTest::testExportXls to skip for php7
* fixed simpleXML syntax for php7 compatibility
* properly broke TMZ in testBrokenTimezoneInTineEvent
* chg $obj->$arr['s'] to $obj->{$arr['s']} for php7
* fixed Zend_Ldap_ConvertTest (important for php5x too!)

https://forge.tine20.org/view.php?id=11746

Change-Id: I8b6469d0cbe9c158744d52e56566006112881263
Reviewed-on: http://gerrit.tine20.com/customers/2986
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoconvert param to array
Philipp Schüle [Fri, 1 Apr 2016 10:51:11 +0000 (12:51 +0200)]
convert param to array

... as giving a string this was causing an error in
 Calendar_Setup_Update_Release8->update_11():
 Invalid argument supplied for foreach()
 in /usr/share/tine20/ActiveSync/Controller.php::84

Change-Id: Ie0f8861c83549f5c0929a6a5e7ec0e8042994f73
Reviewed-on: http://gerrit.tine20.com/customers/2987
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoskip Doc export test in php7
Philipp Schüle [Wed, 23 Mar 2016 19:23:59 +0000 (20:23 +0100)]
skip Doc export test in php7

TODO: update phpoffice/phpword lib when it supports php7

see 0011730: fix doc export for php7
https://forge.tine20.org/view.php?id=11730

Change-Id: I720e38f8e8f7c5435749ceb311fcf22f44bc5980
Reviewed-on: http://gerrit.tine20.com/customers/2970
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix variable name in log message
Philipp Schüle [Wed, 23 Mar 2016 19:15:12 +0000 (20:15 +0100)]
fix variable name in log message

Change-Id: I45d0b71eeb72bf0f2d9cc57557c3e214a2abe533
Reviewed-on: http://gerrit.tine20.com/customers/2971
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>