tine20
6 years agoMerge branch '2014.09' into 2015.07
Philipp Schüle [Thu, 16 Jul 2015 10:01:21 +0000 (12:01 +0200)]
Merge branch '2014.09' into 2015.07

6 years agoMerge branch '2014.11-develop' into 2015.07
Philipp Schüle [Thu, 16 Jul 2015 10:00:57 +0000 (12:00 +0200)]
Merge branch '2014.11-develop' into 2015.07

6 years agoupdate Zend_OpenId to latest version of ZF1
Lars Kneschke [Wed, 15 Jul 2015 14:17:19 +0000 (16:17 +0200)]
update Zend_OpenId to latest version of ZF1

Change-Id: I8476bdb76f879aae99404cace0222b299af5b311
Reviewed-on: https://gerrit.tine20.org/tine20/3159
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 16 Jul 2015 09:00:14 +0000 (11:00 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Thu, 16 Jul 2015 08:59:43 +0000 (10:59 +0200)]
Merge branch '2013.10' into 2014.11

6 years agoupdate Zend_Cache to latest version of ZF1
Lars Kneschke [Wed, 15 Jul 2015 10:30:11 +0000 (12:30 +0200)]
update Zend_Cache to latest version of ZF1

Change-Id: I02e7830a1617f81989f347185793924c4ef843d4
Reviewed-on: https://gerrit.tine20.org/tine20/3157
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agore-activates getInput() call in upload() function
Philipp Schüle [Wed, 15 Jul 2015 16:20:22 +0000 (18:20 +0200)]
re-activates getInput()  call in upload() function

* removes some obsolete commented code
* coding style

Change-Id: I43cecff9af3dfad2c7b3d6e457f3f579b11e60ff
Reviewed-on: http://gerrit.tine20.com/customers/2044
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoContract start date empty lead to exception
Paul Mehrer [Mon, 13 Jul 2015 16:02:59 +0000 (18:02 +0200)]
Contract start date empty lead to exception

fixed that

Change-Id: Iae9613ada76a2b728fee2e320529fb30cad03c16
Reviewed-on: http://gerrit.tine20.com/customers/2031
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agohandle the case that no columns are defined in export definition
Philipp Schüle [Wed, 15 Jul 2015 16:13:31 +0000 (18:13 +0200)]
handle the case that no columns are defined in export definition

Change-Id: I9457a82456d65a436b1cb73175895c2b4be087d9
Reviewed-on: http://gerrit.tine20.com/customers/2043
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupload and post sizes might be needed during setup, too
Philipp Schüle [Wed, 15 Jul 2015 16:12:38 +0000 (18:12 +0200)]
upload and post sizes might be needed during setup, too

Change-Id: I2ecb4f4be470c8102fc85c44d92bf03a9bfe4739
Reviewed-on: http://gerrit.tine20.com/customers/2042
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes some minor problems in abstract update class
Philipp Schüle [Wed, 15 Jul 2015 11:23:43 +0000 (13:23 +0200)]
fixes some minor problems in abstract update class

Change-Id: Iff31a4042a438b93892ad3e93c2dea3ab3ab5806
Reviewed-on: http://gerrit.tine20.com/customers/2035
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011148: Renaming a group is not renaming the group in ldap
sstamer [Mon, 6 Jul 2015 10:37:53 +0000 (12:37 +0200)]
0011148: Renaming a group is not renaming the group in ldap

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

Change-Id: I4db651d4a9c31f17b45f0935e52c6a53161ceab3
Reviewed-on: http://gerrit.tine20.com/customers/2010
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdate Zend_Filter to latest version of ZF1
Lars Kneschke [Wed, 15 Jul 2015 08:43:56 +0000 (10:43 +0200)]
update Zend_Filter to latest version of ZF1

Change-Id: Ie4a324b4cb5a4f3129daf9a5b3231df51896ba8e
Reviewed-on: https://gerrit.tine20.org/tine20/3154
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.09' into 2015.07
Philipp Schüle [Wed, 15 Jul 2015 10:30:18 +0000 (12:30 +0200)]
Merge branch '2014.09' into 2015.07

6 years agoMerge branch '2014.11-develop' into 2015.07
Philipp Schüle [Wed, 15 Jul 2015 10:29:37 +0000 (12:29 +0200)]
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Sales/js/PurchaseInvoiceEditDialog.js

Change-Id: I7982f6e212437969438430798050198b3b523a14

6 years agoupdate Zend_Log to latest version of ZF1
Lars Kneschke [Tue, 14 Jul 2015 12:09:02 +0000 (14:09 +0200)]
update Zend_Log to latest version of ZF1

Change-Id: If13f4637135b0bf502d18ab734ae5f46d85c6ede
Reviewed-on: https://gerrit.tine20.org/tine20/3152
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdate Zend_Validate to latest version of ZF1
Lars Kneschke [Tue, 14 Jul 2015 12:19:17 +0000 (14:19 +0200)]
update Zend_Validate to latest version of ZF1

Change-Id: I905014c29b6576c2b0c5ef8bd084e458a02e3b88
Reviewed-on: https://gerrit.tine20.org/tine20/3153
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011092: Process event cancel invitations
Marcelo Teixeira [Wed, 10 Jun 2015 20:19:32 +0000 (17:19 -0300)]
0011092: Process event cancel invitations

- Process two types of cancel:
  - Event cancelled: when received event status is CANCELLED;
  - Attendee cancelled: when received event status is not CANCELLED;
- Update existing event (or attendee) in database;
- Added more preconditions to improve user messages;
- Some changes/improvements in process request;
- Allow get deleted events from lookupExistingEvent;

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

Change-Id: I77a9b4f6a0b920d63818e5b5700d885ba9439090
Reviewed-on: https://gerrit.tine20.org/tine20/3130
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadjusts validation for discount (purchase invoices) and budget (TA)
sstamer [Mon, 13 Jul 2015 13:03:23 +0000 (15:03 +0200)]
adjusts validation for discount (purchase invoices) and budget (TA)

* and some code cleanup

Change-Id: I3180248ba649a74f61efdda0854cbc2e37661eb0
Reviewed-on: http://gerrit.tine20.com/customers/2030
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.09' into 2015.07
Philipp Schüle [Mon, 13 Jul 2015 11:08:53 +0000 (13:08 +0200)]
Merge branch '2014.09' into 2015.07

6 years agoMerge branch '2014.11-develop' into 2015.07
Philipp Schüle [Mon, 13 Jul 2015 11:08:26 +0000 (13:08 +0200)]
Merge branch '2014.11-develop' into 2015.07

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Mon, 13 Jul 2015 11:07:45 +0000 (13:07 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Mon, 13 Jul 2015 11:07:18 +0000 (13:07 +0200)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/Controller/Event.php

Change-Id: I3a162ebb12ebe5fa544d630f791bf0116a8f72b7

6 years agoincrease cache lifetime for principal resolving
Philipp Schüle [Wed, 8 Jul 2015 15:36:47 +0000 (17:36 +0200)]
increase cache lifetime for principal resolving

Change-Id: I6c49909d8d4a260cb31053d9ef88a5949cd58df8
Reviewed-on: http://gerrit.tine20.com/customers/2025
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes static function call
Philipp Schüle [Thu, 9 Jul 2015 12:30:28 +0000 (14:30 +0200)]
fixes static function call

Change-Id: I962a43be51c16eef83823af91c729b603fbef262
Reviewed-on: http://gerrit.tine20.com/customers/2026
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoseparated patched and addtional Zend Framework 1 classes
Lars Kneschke [Thu, 9 Jul 2015 14:56:03 +0000 (16:56 +0200)]
separated patched and addtional Zend Framework 1 classes

Change-Id: I4ed49a464d3a4857b252c5115164fb27efcd6b97
Reviewed-on: https://gerrit.tine20.org/tine20/3144
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes print_r function name
Philipp Schüle [Mon, 13 Jul 2015 08:52:52 +0000 (10:52 +0200)]
fixes print_r function name

Change-Id: I3d37b2c7d29d88c1803a9ab2629f959ec8b3bc3f
Reviewed-on: http://gerrit.tine20.com/customers/2028
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011130: handle bad originator timzone in VCALENDAR converter
Philipp Schüle [Tue, 7 Jul 2015 12:48:42 +0000 (14:48 +0200)]
0011130: handle bad originator timzone in VCALENDAR converter

* adds a test with broken originator_tz
* throw exceptions if bad originator timezone is found

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

Change-Id: I2337fbd96387a7595da3e7df5eedb9a45411c344
Reviewed-on: http://gerrit.tine20.com/customers/2016
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2015.07
Philipp Schüle [Wed, 8 Jul 2015 12:05:30 +0000 (14:05 +0200)]
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml

Change-Id: I344b3aab21baf1a2c98bc13c904dfc36248accfc

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 8 Jul 2015 12:02:52 +0000 (14:02 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years ago0010086: creating recur series loses displaycontainer_id
sstamer [Wed, 8 Apr 2015 13:19:28 +0000 (15:19 +0200)]
0010086: creating recur series loses displaycontainer_id

Events don't show up in attendees personal calendar

- test

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

Change-Id: I9185e375cbbf2b9f519b045e7f93fa345bef8684
Reviewed-on: http://gerrit.tine20.com/customers/1801
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011124: recur events with missing displaycontainer_id
Cornelius Weiß [Fri, 3 Jul 2015 08:07:41 +0000 (10:07 +0200)]
0011124: recur events with missing displaycontainer_id

* add missing displaycontainer
* THISANDFUTURE updates with attendee add had missing
  displaycontainer
* Fixes the bug
* repair script

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

Change-Id: I6b4af4850e919a3226068d735eba8bc45fcdb01c
Reviewed-on: http://gerrit.tine20.com/customers/2012
Tested-by: Jenkins CI (http://ci.tine20.com/)
Tested-by: sstamer <s.stamer@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes exception name
Philipp Schüle [Fri, 3 Jul 2015 08:47:53 +0000 (10:47 +0200)]
fixes exception name

Change-Id: I874faac03411d95dd91c388ce157a4028766d946
Reviewed-on: http://gerrit.tine20.com/customers/2004
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011118: LDAP auth: user without Tinebase permissions is able to login
Philipp Schüle [Fri, 3 Jul 2015 12:33:34 +0000 (14:33 +0200)]
0011118: LDAP auth: user without Tinebase permissions is able to login

* checks Tinebase run permission during login, too
* fixes some minor glitches in Tinebase_Controller

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

Change-Id: I521c75bed7e2dee966655fcbd054bf1143d64f46
Reviewed-on: http://gerrit.tine20.com/customers/2005
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadds logging for count of resolved relations
Philipp Schüle [Fri, 3 Jul 2015 12:38:26 +0000 (14:38 +0200)]
adds logging for count of resolved relations

* and fixes some typos

Change-Id: Ia88f65562fc9af54ef5a03c42282674eeb18e8ce
Reviewed-on: http://gerrit.tine20.com/customers/2006
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2015.07
Philipp Schüle [Thu, 2 Jul 2015 14:07:23 +0000 (16:07 +0200)]
Merge branch '2014.11-develop' into 2015.07

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 2 Jul 2015 14:06:47 +0000 (16:06 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years ago0010928: iconv use is deprecated
Michael Spahn [Mon, 27 Apr 2015 09:51:58 +0000 (11:51 +0200)]
0010928: iconv use is deprecated

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

Change-Id: I1c5908f5b507a7378d4b1a4a9746810b83e2fc3e
Reviewed-on: http://gerrit.tine20.com/customers/1884
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011016: change target in links
Nico Hessler [Mon, 4 May 2015 14:24:42 +0000 (14:24 +0000)]
0011016: change target in links

Change-Id: I9dbffb4763ff68631d21db324ffeedafd1a52aa6
Reviewed-on: https://gerrit.tine20.org/tine20/3143
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdates build script for new version Elena 2015.07
Philipp Schüle [Thu, 2 Jul 2015 10:26:43 +0000 (12:26 +0200)]
updates build script for new version Elena 2015.07

Change-Id: I82c31f108b5f4bf2284b27d505eaa9a4ac0694d7
Reviewed-on: https://gerrit.tine20.org/tine20/3135
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011102: popup window error ins some modules
Philipp Schüle [Thu, 2 Jul 2015 11:59:18 +0000 (13:59 +0200)]
0011102: popup window error ins some modules

removes obsolete activities panel from supppliers, contracts and
purchase invoices edit dialogs

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

Change-Id: Ie834dc427483b56417e22b3b737753d0fda5459a
Reviewed-on: https://gerrit.tine20.org/tine20/3142
Reviewed-by: Stefanie Stamer <s.stamer@metaways.de>
Tested-by: Stefanie Stamer <s.stamer@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2015.07
Philipp Schüle [Thu, 2 Jul 2015 10:28:35 +0000 (12:28 +0200)]
Merge branch '2014.11-develop' into 2015.07

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 2 Jul 2015 10:27:50 +0000 (12:27 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoremoves Flash pie charts
Philipp Schüle [Wed, 1 Jul 2015 17:06:24 +0000 (19:06 +0200)]
removes Flash pie charts

* because of neverending flash security issues
* removes some obsolete code from Crm details panel as well

Change-Id: I86e1a09941e5cab975e1182f467c4334e4fef599
TODO: add something useful to default/multi-record lead details panel
Reviewed-on: http://gerrit.tine20.com/customers/2002
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>
6 years agoMerge branch '2014.09'
Philipp Schüle [Wed, 1 Jul 2015 17:22:03 +0000 (19:22 +0200)]
Merge branch '2014.09'

Conflicts:
tine20/Tinebase/js/tineInit.js

Change-Id: I54f4598c2ee375570bac12799a9dd711be50f462

6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Wed, 1 Jul 2015 17:20:41 +0000 (19:20 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 1 Jul 2015 17:13:34 +0000 (19:13 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/js/tineInit.js

Change-Id: Ia30ff57898328f1a7c7a0fa2cc2b2b670a21173a

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 1 Jul 2015 17:09:42 +0000 (19:09 +0200)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Core.php

Change-Id: I427008452534772574a2b765d65611749f3b83d1

6 years agoSalesControllerInvoice - product and contract end date treating buggy
Paul Mehrer [Mon, 29 Jun 2015 16:12:30 +0000 (18:12 +0200)]
SalesControllerInvoice - product and contract end date treating buggy

fixed that
changed interval to look for already closed contracts from 12 to 6 months

Change-Id: Ieb29a597d2335fb6d99010ff40e6ae0cc7ec027c
Reviewed-on: http://gerrit.tine20.com/customers/1998
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdates tine20 community url
Philipp Schüle [Wed, 1 Jul 2015 16:28:51 +0000 (18:28 +0200)]
updates tine20 community url

Change-Id: I8c249fc020fd96e3af04ba4c606a2d66c7d13196
Reviewed-on: http://gerrit.tine20.com/customers/2001
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdates langstats url on login panel
Philipp Schüle [Wed, 1 Jul 2015 16:24:04 +0000 (18:24 +0200)]
updates langstats url on login panel

langstats have moved to transifex

Change-Id: I7a73470388b9e63dcd5ec8c92577af6fabe2e78b
Reviewed-on: http://gerrit.tine20.com/customers/2000
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011046: Split View + Month View kills the whole view
Philipp Schüle [Wed, 1 Jul 2015 16:05:17 +0000 (18:05 +0200)]
0011046: Split View + Month View kills the whole view

* added the fixes suggested by AirMike (plugin deactivation and update of event actions)

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

Change-Id: I744b6cfbc8f070f0df6c9e6c6ee342763c45a980
Reviewed-on: http://gerrit.tine20.com/customers/1999
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoFix for WindowType
sstamer [Mon, 29 Jun 2015 10:25:27 +0000 (12:25 +0200)]
Fix for WindowType

- force Browser as default

Change-Id: I88ec2d6ff0d711839953e9c84156928622dc96b7
Reviewed-on: http://gerrit.tine20.com/customers/1997
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoincreases required php version to 5.3.9
Philipp Schüle [Fri, 26 Jun 2015 12:50:07 +0000 (14:50 +0200)]
increases required php version to 5.3.9

0011086: Timetracker is not usable

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

Change-Id: Idc80be4befca0a9f702dd25dd8ca76cf9ed3540f
Reviewed-on: http://gerrit.tine20.com/customers/1996
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago10341: update all applications to 9.0
sstamer [Mon, 13 Oct 2014 09:32:12 +0000 (11:32 +0200)]
10341: update all applications to 9.0

Change-Id: Iebdc31b2a1ca6cccc2b2945765c8c1da28fd8910
Reviewed-on: https://gerrit.tine20.org/tine20/2909
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011074: Active Directory as User Backend
Philipp Schüle [Fri, 26 Jun 2015 12:39:41 +0000 (14:39 +0200)]
0011074: Active Directory as User Backend

* fixes Tinebase_DateTime handling of float timestamps
* adds a test for AD timestamp conversion

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

Change-Id: I75ce6401fd5db2fbd97d685c8421f69e1eb1552d
Reviewed-on: http://gerrit.tine20.com/customers/1995
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoUpdate vagrant to trusty
Michael Spahn [Mon, 4 May 2015 07:42:04 +0000 (09:42 +0200)]
Update vagrant to trusty

Change-Id: Ia12c0e7cd599e303528133a1bd413b279199032d
Reviewed-on: http://gerrit.tine20.com/customers/1901
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>
6 years agoset group_concat_max_len to max value for 32 bit systems
Lars Kneschke [Thu, 25 Jun 2015 11:34:28 +0000 (13:34 +0200)]
set group_concat_max_len to max value for 32 bit systems

Change-Id: I7f10b4bad55b666f7b227dbd4eb49f608a030d93
Reviewed-on: http://gerrit.tine20.com/customers/1993
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.09'
Philipp Schüle [Thu, 25 Jun 2015 12:46:18 +0000 (14:46 +0200)]
Merge branch '2014.09'

6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Thu, 25 Jun 2015 12:46:06 +0000 (14:46 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 25 Jun 2015 12:45:18 +0000 (14:45 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Thu, 25 Jun 2015 12:44:59 +0000 (14:44 +0200)]
Merge branch '2013.10' into 2014.11

6 years agodisables failing assertion
Philipp Schüle [Thu, 25 Jun 2015 10:57:01 +0000 (12:57 +0200)]
disables failing assertion

* needs to be fixed for daylight saving boundaries:

Failed asserting that two strings are equal.
[exec] --- Expected
[exec] +++ Actual
[exec] @@ @@
[exec] -'2015-10-25 11:45:59'
[exec] +'2015-10-25 10:45:59'

Change-Id: I0f01ce867e4101aa97e1a86dc5d4e1c2ed2bc6d6
Reviewed-on: http://gerrit.tine20.com/customers/1992
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoAdd optional password suffix for inital student passwords
sstamer [Fri, 5 Jun 2015 10:37:09 +0000 (12:37 +0200)]
Add optional password suffix for inital student passwords

Change-Id: I70dec4219b9ccc6a7dfddac228db30930b24b443
Reviewed-on: http://gerrit.tine20.com/customers/1965
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoAdding CardDAVSync for Android write capability
Ingo Ratsdorf [Tue, 26 May 2015 07:48:49 +0000 (19:48 +1200)]
Adding CardDAVSync for Android write capability

This chnage will allow CardDAVSync for Android to sync
addressbook entries to Tine20.

Change-Id: I04fbf78c3e3b6ec3bd29c73a81f5212f4089f9fe
Reviewed-on: https://gerrit.tine20.org/tine20/3110
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011098: Make more readable condition to get deleted records
Flávio Gomes da Silva Lisboa [Wed, 17 Jun 2015 13:42:25 +0000 (10:42 -0300)]
0011098: Make more readable condition to get deleted records

Change-Id: I2d464f925a9612c1f6e111c0cd2b0e2b99451beb
Reviewed-on: https://gerrit.tine20.org/tine20/3133
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.09'
Philipp Schüle [Wed, 24 Jun 2015 12:02:15 +0000 (14:02 +0200)]
Merge branch '2014.09'

Conflicts:
tine20/Calendar/Config.php

Change-Id: Ieda81b043a7a6d53f366da2360f58cc7f73eb87b

6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Wed, 24 Jun 2015 12:00:04 +0000 (14:00 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 24 Jun 2015 11:59:26 +0000 (13:59 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years ago0011100: keep both leads when duplicate is detected
Philipp Schüle [Wed, 24 Jun 2015 11:30:32 +0000 (13:30 +0200)]
0011100: keep both leads when duplicate is detected

* fixed by adding the duplicateCheck param to json frontend save fn signature

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

Change-Id: Ide705161bc9ccf41938aeaea1a4a4917a9d121b1
Reviewed-on: http://gerrit.tine20.com/customers/1990
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>
6 years agoDo not use only the customer relation for dublicate check
sstamer [Thu, 4 Jun 2015 12:00:05 +0000 (14:00 +0200)]
Do not use only the customer relation for dublicate check

- also check lead_name
- TODO add some Test

Change-Id: I8e3a6fb9c07983233586c35d370868430e8316ca
Reviewed-on: http://gerrit.tine20.com/customers/1963
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoSalesBackendContract::getBillableContractIds failed on contract start / end borders
Paul Mehrer [Tue, 23 Jun 2015 11:47:53 +0000 (13:47 +0200)]
SalesBackendContract::getBillableContractIds failed on contract start / end borders

fixed that

Change-Id: I0f2e70755d80f4bb4012949aef3e23c83c66754b
Reviewed-on: http://gerrit.tine20.com/customers/1986
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoSalesControllerInvoice - fixed invoice creation in first month
Paul Mehrer [Tue, 23 Jun 2015 11:14:49 +0000 (13:14 +0200)]
SalesControllerInvoice - fixed invoice creation in first month

if contract started after the first day of the month, first month invoice was not created. Fixed that.

Change-Id: I3b50949ae14fbacbcbb968de86bbc38ae394c5d3
Reviewed-on: http://gerrit.tine20.com/customers/1985
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agooptional context actions via feature toggle
Cornelius Weiß [Fri, 8 May 2015 07:12:31 +0000 (09:12 +0200)]
optional context actions via feature toggle

* attach/detach tags
* invite/cancle attendee

Change-Id: I6d7f1a4436e5ee75c94608a4ab90a141135312ab
Reviewed-on: http://gerrit.tine20.com/customers/1939
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoSalesControllerInvoice fixed last_autobill set back in _inspectDelete
Paul Mehrer [Fri, 19 Jun 2015 11:00:47 +0000 (13:00 +0200)]
SalesControllerInvoice fixed last_autobill set back in _inspectDelete

also fixed invoice creation to populate the date field
in _inspectDelete for non-products, like timeaccounts, last_autobill
will now be set back based on the invoice date field

Change-Id: Ie02ea28c62f21e20b7248d870ad4aa98d6175d30
Reviewed-on: http://gerrit.tine20.com/customers/1983
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoCal Splitview: include groupmember events
sstamer [Wed, 17 Jun 2015 08:12:27 +0000 (10:12 +0200)]
Cal Splitview: include groupmember events

Change-Id: I84de5fffc9573de1bf51d1e724ee1d101b1c544c
Reviewed-on: http://gerrit.tine20.com/customers/1977
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.09'
Philipp Schüle [Fri, 19 Jun 2015 20:12:01 +0000 (22:12 +0200)]
Merge branch '2014.09'

6 years ago0011028: Open_basedir error / 2
Philipp Schüle [Fri, 19 Jun 2015 19:07:52 +0000 (21:07 +0200)]
0011028: Open_basedir error / 2

* adds test bootstrap to main test entry point and server test files

-> tests run isolated and thus always need the autoloader bootstrap
-> is there a better solution??

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

Change-Id: I294553c9874cc776e3f95c56e1df34c2ce22d79f
Reviewed-on: https://gerrit.tine20.org/tine20/3132
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agocorrected URL
Nico Hessler [Wed, 10 Jun 2015 16:08:42 +0000 (16:08 +0000)]
corrected URL

Change-Id: Ia11b8989d7fc0297eb6061a65593a5617c43a614
Reviewed-on: https://gerrit.tine20.org/tine20/3129
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011082: Prevent user edit external organizer events
Marcelo Teixeira [Fri, 5 Jun 2015 16:55:33 +0000 (13:55 -0300)]
0011082: Prevent user edit external organizer events

- Ignore editGrant from external organizer events in Frontend Json
- Behavior like attendee from internal organizer

Change-Id: Ib6fd5f75a6f6187467859121400ca8378d0158e1
Reviewed-on: https://gerrit.tine20.org/tine20/3127
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.09'
Philipp Schüle [Fri, 19 Jun 2015 18:28:17 +0000 (20:28 +0200)]
Merge branch '2014.09'

6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Fri, 19 Jun 2015 18:27:26 +0000 (20:27 +0200)]
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Calendar/js/EventEditDialog.js

Change-Id: I514b952f39991dac92d91af7a8c0a8dfb0d60e89

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Fri, 19 Jun 2015 09:31:42 +0000 (11:31 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years ago0011028: Open_basedir error
Philipp Schüle [Fri, 19 Jun 2015 09:01:12 +0000 (11:01 +0200)]
0011028: Open_basedir error

* moves tests autoloader paths from composer.json to test bootstrap

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

Change-Id: Ia3b78b3a3cba24243b36f5bb700c2d5f33dd6f9a
Reviewed-on: http://gerrit.tine20.com/customers/1984
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agosupport multiple tags in mass attach action
Cornelius Weiß [Mon, 17 Dec 2012 11:55:48 +0000 (12:55 +0100)]
support multiple tags in mass attach action

Change-Id: I827baa04e99d9d34b8d3bc270902ebf3cac6f879
Reviewed-on: http://gerrit.tine20.com/customers/1938
Tested-by: Jenkins CI (http://ci.tine20.com/)
Tested-by: sstamer <s.stamer@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoCal Edit: update rrule on dtstart change
Cornelius Weiß [Wed, 17 Jun 2015 07:59:19 +0000 (09:59 +0200)]
Cal Edit: update rrule on dtstart change

Change-Id: Ia7cb9319fd63979facd83ac975c0f601c571bc22
Reviewed-on: http://gerrit.tine20.com/customers/1978
Tested-by: sstamer <s.stamer@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoignore error when group in LDAP/AD is already deleted
Lars Kneschke [Wed, 17 Jun 2015 11:22:50 +0000 (13:22 +0200)]
ignore error when group in LDAP/AD is already deleted

Change-Id: Ie357c4414f5fc86214e3c923b79ef44b4157a3c7
Reviewed-on: http://gerrit.tine20.com/customers/1979
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoSalesSetupDemoData was broken
Paul Mehrer [Wed, 17 Jun 2015 13:34:02 +0000 (15:34 +0200)]
SalesSetupDemoData was broken

fixes amount contracts created which previously lead to an exception

Change-Id: I302a78c6fe13e5080ca1ec26e8631b430f65daa4

6 years agofixes model name in Sales Invoice _inspectDelete
Paul Mehrer [Tue, 16 Jun 2015 11:54:32 +0000 (13:54 +0200)]
fixes model name in Sales Invoice _inspectDelete

Change-Id: I049bca43d06c42407a6379ef767e6cc0c570d9cc
Reviewed-on: http://gerrit.tine20.com/customers/1974
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agocheck if user has access to Calendar application
Lars Kneschke [Tue, 9 Jun 2015 13:44:40 +0000 (15:44 +0200)]
check if user has access to Calendar application

Change-Id: If1566ff47e4714c654e87edb3f5c4cd38319a640
Reviewed-on: http://gerrit.tine20.com/customers/1970
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agodon't import empty invoices
Lars Kneschke [Tue, 9 Jun 2015 13:38:02 +0000 (15:38 +0200)]
don't import empty invoices

Change-Id: I627df2d15af048356f5f4cc555ad765486bed432
Reviewed-on: http://gerrit.tine20.com/customers/1969
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agofix combined emailuser backend
Lars Kneschke [Mon, 8 Jun 2015 09:58:19 +0000 (11:58 +0200)]
fix combined emailuser backend

Change-Id: I01f46a81ec25b080558468c8f02ce397d3155420
Reviewed-on: http://gerrit.tine20.com/customers/1967
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agoFix ActiveSync of Android Lollipop
Emerson Faria Nobre [Thu, 14 May 2015 20:04:05 +0000 (17:04 -0300)]
Fix ActiveSync of Android Lollipop

Change-Id: I6d4b940184c152b63280c16a441430a281f8d893
Reviewed-on: https://gerrit.tine20.org/tine20/3107
Tested-by: jenkins user
Reviewed-by: Emerson Faria Nobre <emerson-faria.nobre@serpro.gov.br>
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years ago0011080: Events from external organizers are not visible in calendar
Marcelo Teixeira [Wed, 3 Jun 2015 15:00:54 +0000 (12:00 -0300)]
0011080: Events from external organizers are not visible in calendar

- displaycontainer_id can also be integer
- fix Calendar_Model_Attender::getResolvedAttendees

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

Change-Id: Ia6bf3817d7ecbe91bcc1e9baf8d7f4966269a020
Reviewed-on: https://gerrit.tine20.org/tine20/3126
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years ago0008568: "Private field" for calendar events doesn't sync using
Lars Kneschke [Fri, 5 Jun 2015 07:47:13 +0000 (09:47 +0200)]
0008568: "Private field" for calendar events doesn't sync using
ActiveSync

- added support for pivate flag handlung
- Tested with iOS and Android

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

Change-Id: I9ac85bf836ff389fa5e192c310ffc2da4f05f59b
Reviewed-on: http://gerrit.tine20.com/customers/1964
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agoMerge branch '2014.09'
Philipp Schüle [Fri, 29 May 2015 12:27:16 +0000 (14:27 +0200)]
Merge branch '2014.09'

6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Fri, 29 May 2015 12:27:05 +0000 (14:27 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Fri, 29 May 2015 12:26:11 +0000 (14:26 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoFix INBOX detecttion for Cyrus IMAP servers
Lars Kneschke [Fri, 29 May 2015 10:59:35 +0000 (12:59 +0200)]
Fix INBOX detecttion for Cyrus IMAP servers

0010956: Foldermapping ActiveSync funktioniert nicht

Change-Id: I1e1039b198d5646c48954de3eeeb308da9905483
Reviewed-on: http://gerrit.tine20.com/customers/1959
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011062: restore modal windows functionality / remove pref
Philipp Schüle [Fri, 29 May 2015 11:44:45 +0000 (13:44 +0200)]
0011062: restore modal windows functionality / remove pref

This reverts commit fba3a853cd119ea6817f63fef2d471e75b9df0b5.

don't remove pref, only the option "modal"

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

Change-Id: Ic3745d8a6244de6d099c98a99819c91bf3f6adc0
Reviewed-on: http://gerrit.tine20.com/customers/1960
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>