Philipp Schüle [Thu, 18 Aug 2016 09:45:39 +0000 (11:45 +0200)]
improve test to mitigate race condition
Change-Id: I923a2d11cad72d0b321e697eb7b784d59f2f5b99
Reviewed-on: http://gerrit.tine20.com/customers/3460
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Thu, 18 Aug 2016 07:47:20 +0000 (09:47 +0200)]
fixes _createSharedOffers in Sales demo data
Change-Id: I27e4b1535460902bb58b4b0b739dadbb0adf1444
Reviewed-on: http://gerrit.tine20.com/customers/3455
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Wed, 17 Aug 2016 12:40:57 +0000 (14:40 +0200)]
0012116: ldap sync: allow empty ldap values to overwrite contact values
* contact data is not updated during ldap sync
* create test that reproduces the problem
* allows to define synced (overwritten) fields
in config
https://forge.tine20.org/view.php?id=12116
Change-Id: Icd0ee745e65ef075ec8d9ec31fc222c855a12b4d
Reviewed-on: http://gerrit.tine20.com/customers/3446
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
sstamer [Fri, 12 Aug 2016 14:40:57 +0000 (16:40 +0200)]
0012114: lead name column did not appear for non-admin users
* Crm has no right view
https://forge.tine20.org/view.php?id=12114
Change-Id: If3dc9aa976037ce90c209bd6a3c503d17d6ebac3
Reviewed-on: http://gerrit.tine20.com/customers/3433
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 15 Aug 2016 09:24:51 +0000 (11:24 +0200)]
improves duplicate exception logging in import
... and fixes empty tag id handling
Change-Id: I15459a3a82c0bb60f8aa7211cab16270e28b9fbd
Reviewed-on: http://gerrit.tine20.com/customers/3435
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>
Philipp Schüle [Mon, 15 Aug 2016 09:41:41 +0000 (11:41 +0200)]
sometimes we get errors for wrong locales
... when trying to get country from geodata
Change-Id: I21e384002890f348fa508b1f2f30a8d60877b54a
error: Zend_Locale_Exception -> The locale '' is no known locale
Reviewed-on: http://gerrit.tine20.com/customers/3436
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
sstamer [Wed, 10 Aug 2016 12:49:04 +0000 (14:49 +0200)]
allow to omit filter for imported relations
... this way, we always create a new related record
Change-Id: I6f68164b3956c1a32c06e9b7aaf0df528d873576
Reviewed-on: http://gerrit.tine20.com/customers/3422
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Paul Mehrer [Fri, 29 Jul 2016 12:50:24 +0000 (14:50 +0200)]
0012080: different model favorites overwrite each other
within an application favorites will overwrite each other
based on the name only. Changed that to name + model
https://forge.tine20.org/view.php?id=12080
Change-Id: Iaa5f188f6d93b0e11816d1746701b5d7e2f9d445
Reviewed-on: http://gerrit.tine20.com/customers/3405
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
sstamer [Thu, 21 Jul 2016 12:54:42 +0000 (14:54 +0200)]
0012064: Add multiple filter values in Import
https://forge.tine20.org/view.php?id=12064
Change-Id: I193797b8220078f4bd565255967096e79e551596
Reviewed-on: http://gerrit.tine20.com/customers/3384
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Tue, 12 Jul 2016 11:18:51 +0000 (13:18 +0200)]
only run invoices tests if feature is enabled
Change-Id: Iaf502371cf5e5901319b732cafec632c9d4b9fc9
Reviewed-on: http://gerrit.tine20.com/customers/3347
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Tue, 12 Jul 2016 11:33:00 +0000 (13:33 +0200)]
0012040: Zend_Filter can't cope with utf8 chars
https://forge.tine20.org/view.php?id=12040
Change-Id: I6e3dd4c1a4a34ffd1bc267f9639c4a6cd755ac7d
Reviewed-on: http://gerrit.tine20.com/customers/3345
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Tue, 12 Jul 2016 11:35:25 +0000 (13:35 +0200)]
throw an exception if container name/organizer mail is empty
Change-Id: I4cd0884146471949ef11e542796aeb1ed72f1345
Reviewed-on: http://gerrit.tine20.com/customers/3346
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 11 Jul 2016 14:26:15 +0000 (16:26 +0200)]
backports build.xml improvement
... no need to prepare again before each build-module
... ignore userdata dir
Change-Id: Idc1bb01879862f4a19c5eb1be4d424079c89da8e
Reviewed-on: http://gerrit.tine20.com/customers/3337
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>
Philipp Schüle [Mon, 11 Jul 2016 13:26:15 +0000 (15:26 +0200)]
Merge branch '2014.11' into 2015.11
Change-Id: Ic2a6cd03dd6fa9a64cfad7ef99d49acb266b1830
Philipp Schüle [Mon, 11 Jul 2016 12:07:58 +0000 (14:07 +0200)]
removes phpdocumentor from dev requirements
Change-Id: Ica5303a8039dba2f5d6e76d1d2d60c54f3456f62
Reviewed-on: http://gerrit.tine20.com/customers/3335
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 2 May 2016 08:49:34 +0000 (10:49 +0200)]
0011976: prevent open_basedir error in searchServerPlugins
https://forge.tine20.org/view.php?id=11976
Change-Id: Id01d3f324c27e028f5af31bac67050d6a063cc8f
Reviewed-on: http://gerrit.tine20.com/customers/3119
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 11 Jul 2016 10:35:43 +0000 (12:35 +0200)]
Merge branch '2014.11' into 2015.11
Cornelius Weiß [Tue, 25 Aug 2015 16:21:29 +0000 (18:21 +0200)]
0011852: add git merge driver for po/pot files
... to improve po file merging
add this to the end of .git/config file:
[merge "pofile"]
name = merge po-files driver
driver = ./scripts/merge-po-files %A %O %B
recursive = binary
https://forge.tine20.org/view.php?id=11852
Change-Id: I94e2675206858b5c1140f50b62a31ca39e0b13b7
Reviewed-on: http://gerrit.tine20.com/customers/2975
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Cornelius Weiß [Thu, 7 Jul 2016 16:23:05 +0000 (18:23 +0200)]
0012000: WebDAV fails overwriting file silently, possible data loss
* fix update etag test
* add update contents test
* fix update from webdav (hash file ref did't update)
* add OC-MTIME test
* improve OC-MTIME header handling
Change-Id: I8ef48b1cfc2fcabe8cb1ec3e2d55bc4b743fe964
Reviewed-on: http://gerrit.tine20.com/customers/3331
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
sstamer [Fri, 1 Jul 2016 10:00:39 +0000 (12:00 +0200)]
Fix german Calendar translations
Change-Id: Iafdfc72579296f26c276b59c6fd301f1cb182f08
Reviewed-on: http://gerrit.tine20.com/customers/3332
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 4 Jul 2016 10:15:57 +0000 (12:15 +0200)]
0011994: password expired message should not show with imap auth backend
https://forge.tine20.org/view.php?id=11994
Change-Id: I31898f3ac08baf169e94f7bb765cc030ebab75d1
Reviewed-on: http://gerrit.tine20.com/customers/3299
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Cornelius Weiß [Thu, 1 Oct 2015 16:53:21 +0000 (18:53 +0200)]
0011982: support expanded-group-member-set report
* ical searches for groups on attendee add
* if group is chose by user it tries to expand the group members
* we deliver the group members + the group itself as INTELLIGROUP so
the group itself gets part in the event (like in tine20 web ui)
https://forge.tine20.org/view.php?id=11982
Change-Id: Ibaabd5417b8d391f2bb745a348a2173fc353c6b6
Reviewed-on: http://gerrit.tine20.com/customers/3330
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Cornelius Weiß [Tue, 5 Jul 2016 08:08:11 +0000 (10:08 +0200)]
enable tab switch with key shortcuts
* CTRL-1 for first tab, CTRL-2 for second, ...
Change-Id: I4d0a19e853bab9fd6068a0edd4c9b020dc8c8aba
Reviewed-on: http://gerrit.tine20.com/customers/3305
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Thu, 7 Jul 2016 08:26:07 +0000 (10:26 +0200)]
lowered loglevel for config data
Change-Id: Idf6626057bfd0eb55368955ea9bdd81ee5a2ab00
Reviewed-on: http://gerrit.tine20.com/customers/3312
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Thu, 16 Jun 2016 12:09:48 +0000 (14:09 +0200)]
phpdocumentor is not needed in Elena any more
... as it causes lots of problems, like this:
Your requirements could not be resolved to an installable set of packages.
Problem 1
- Installation request for phpdocumentor/unified-asset-installer 1.1.2
-> satisfiable by phpdocumentor/unified-asset-installer[1.1.2].
- phpdocumentor/unified-asset-installer 1.1.2 requires composer-plugin-api 1.0.0
-> no matching package found.
Change-Id: Iafbcc83e0922fac37494924d8bdd328f3d81be72
Reviewed-on: http://gerrit.tine20.com/customers/3303
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 27 Jun 2016 09:33:12 +0000 (11:33 +0200)]
Merge branch '2015.11-pgsql' into 2015.11
Philipp Schüle [Wed, 22 Jun 2016 13:28:40 +0000 (15:28 +0200)]
0011668: fix Calendar_Frontend_* Tests with postgresql backend
* Calendar_Frontend_ActiveSync: comparing strings with ints
* RecordSet: only allow unique records to be added
* improves some tests
https://forge.tine20.org/view.php?id=11668
Change-Id: Id18f14f58006344a6cddc48bf707092524cf1a19
Reviewed-on: http://gerrit.tine20.com/customers/3270
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Fri, 24 Jun 2016 09:54:18 +0000 (11:54 +0200)]
0011968: shared calendars filter leads to sql error with pgsql
* adds a test
* don't use space for empty sql IN value, need to use
Zend_Db_Expr('NULL') instead
https://forge.tine20.org/view.php?id=11968
Change-Id: I1b65fb6b301711df5e073b3de057ff70cf20e04c
Reviewed-on: http://gerrit.tine20.com/customers/3272
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Wed, 22 Jun 2016 14:36:20 +0000 (16:36 +0200)]
0011962: contract end_date can't be changed if vacation has been added
* adds workaround for json encoded field "workingtime_json"
* adds another test for updating contract end_date
* fixes "undefined index" if employee->contracts structure is not correct
in json frontend
https://forge.tine20.org/view.php?id=11962
Change-Id: Ia18b9ce3c50b4fa60a36ab15d650a2bff3d63041
Reviewed-on: http://gerrit.tine20.com/customers/3271
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Wed, 22 Jun 2016 13:31:55 +0000 (15:31 +0200)]
Merge branch '2015.11-pgsql' into 2015.11
Philipp Schüle [Mon, 20 Jun 2016 12:22:58 +0000 (14:22 +0200)]
0011078: CalDav calender not working after upgrade from 2013.10
* postgres handles container id as ints ...
* reactivates some of the disabled tests
see also
0011668: fix Calendar_Frontend_* Tests with postgresql backend
https://forge.tine20.org/view.php?id=11078
Change-Id: I25133d32c9cd9ea9b9be00c2b111f640fc13d84c
Reviewed-on: http://gerrit.tine20.com/customers/3261
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Thu, 16 Jun 2016 06:46:10 +0000 (08:46 +0200)]
improves CLI import echo output
.... show updatecount and hide zero counts
Change-Id: I57621d26faaf82a949a69986abc0636425c040de
Reviewed-on: http://gerrit.tine20.com/customers/3240
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 20 Jun 2016 09:06:46 +0000 (11:06 +0200)]
use correct variable: $folder instead of $folderId
... in updateFolder()
Change-Id: I1b8ed0323ec2c31823d9f2b77f7e087b7bd998cc
Reviewed-on: http://gerrit.tine20.com/customers/3256
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Mon, 20 Jun 2016 09:04:08 +0000 (11:04 +0200)]
do not try to rename folder that has not changed
Change-Id: I6288a329deeccca1eb3580622aaadffaa497ffc4
Reviewed-on: http://gerrit.tine20.com/customers/3255
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Thu, 9 Jun 2016 16:37:46 +0000 (18:37 +0200)]
0011898: Download links missing server subdir part
* make use of new Tinebase_Core::getUrl()
* 'full' is default part for getUrl()
https://forge.tine20.org/view.php?id=11898
Change-Id: I91076e42d4f4ad44a3ac6114677153c80b43ed81
Reviewed-on: http://gerrit.tine20.com/customers/3245
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Philipp Schüle [Thu, 16 Jun 2016 09:29:41 +0000 (11:29 +0200)]
backports Tinebase_Core::getUrl
... from 2015.11-develop
Change-Id: I7382b9e44b72b1e1a17e5b4c19947099a9c95d1c
Reviewed-on: http://gerrit.tine20.com/customers/3244
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
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
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>
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>
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>
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>
Philipp Schüle [Tue, 14 Jun 2016 09:11:59 +0000 (11:11 +0200)]
Merge branch '2014.11' into 2015.11
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>
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>
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>
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>
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>
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>
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>
Philipp Schüle [Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)]
Merge branch '2014.11' into 2015.11
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>
Philipp Schüle [Tue, 7 Jun 2016 13:56:55 +0000 (15:56 +0200)]
Merge branch '2014.11' into 2015.11
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>
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>
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>
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>
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>
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>
Philipp Schüle [Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)]
Merge branch '2014.11' into 2015.11
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Philipp Schüle [Mon, 9 May 2016 12:02:00 +0000 (14:02 +0200)]
Merge branch '2014.11' into 2015.11
Philipp Schüle [Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)]
Merge branch '2013.10' into 2014.11
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>
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>
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>
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>
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>
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>
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
Philipp Schüle [Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)]
Merge branch '2014.11' into 2014.11-develop
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Philipp Schüle [Wed, 20 Apr 2016 10:21:17 +0000 (12:21 +0200)]
Merge branch '2014.11-develop' into 2015.11
Philipp Schüle [Wed, 20 Apr 2016 10:21:03 +0000 (12:21 +0200)]
Merge branch '2014.11' into 2014.11-develop
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>
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>
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>