tine20
5 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>
5 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>
5 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

5 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

5 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>
5 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

5 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

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoMerge branch '2014.09'
Philipp Schüle [Thu, 25 Jun 2015 12:46:18 +0000 (14:46 +0200)]
Merge branch '2014.09'

5 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

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoMerge branch '2014.09'
Philipp Schüle [Fri, 19 Jun 2015 20:12:01 +0000 (22:12 +0200)]
Merge branch '2014.09'

5 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>
5 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>
5 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>
5 years agoMerge branch '2014.09'
Philipp Schüle [Fri, 19 Jun 2015 18:28:17 +0000 (20:28 +0200)]
Merge branch '2014.09'

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoMerge branch '2014.09'
Philipp Schüle [Fri, 29 May 2015 12:27:16 +0000 (14:27 +0200)]
Merge branch '2014.09'

5 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

5 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

5 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>
5 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>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Fri, 29 May 2015 12:13:59 +0000 (14:13 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years agoadd missing comma
sstamer [Fri, 29 May 2015 11:57:37 +0000 (13:57 +0200)]
add missing comma

Change-Id: I4613397d390683565cb4c33e2904715e0191a376
Reviewed-on: http://gerrit.tine20.com/customers/1961
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.09'
Philipp Schüle [Thu, 28 May 2015 14:47:18 +0000 (16:47 +0200)]
Merge branch '2014.09'

5 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Thu, 28 May 2015 14:46:33 +0000 (16:46 +0200)]
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Sales/js/ContractEditDialog.js
tine20/Tinebase/Frontend/Http.php

Change-Id: Ie775135b2dffc32aca9208e45d3585fcc9401737

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 28 May 2015 14:43:03 +0000 (16:43 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js
tine20/composer.lock

Change-Id: Ib67ae66fbae9131394c50d7c65e68a2d7ba51549

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Thu, 28 May 2015 14:35:28 +0000 (16:35 +0200)]
Merge branch '2013.10' into 2014.11

5 years agoSet Task Status default for Task edit dialog
sstamer [Tue, 19 May 2015 12:44:13 +0000 (14:44 +0200)]
Set Task Status default for Task edit dialog

Change-Id: I9329d6a554959997a2550116ef20ba799ea214c7
Reviewed-on: http://gerrit.tine20.com/customers/1937
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010588: Folder structure is displayed incorrectly
Philipp Schüle [Thu, 28 May 2015 14:18:14 +0000 (16:18 +0200)]
0010588: Folder structure is displayed incorrectly

* totalcount can be 0 .... implements a better way for checking search response structure

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

Change-Id: I7d4f2102cda263751150af3e1df1aece06fa0efd
Reviewed-on: http://gerrit.tine20.com/customers/1958
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoImplement download function for temp files in fileupload
Michael Spahn [Mon, 18 May 2015 13:03:25 +0000 (15:03 +0200)]
Implement download function for temp files in fileupload

Change-Id: I3eff37589b13972d03476a9f727f5c118bc93ed2
Reviewed-on: http://gerrit.tine20.com/customers/1935
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 agoAdd invoice and offer number to comboboxes
Michael Spahn [Wed, 6 May 2015 15:48:47 +0000 (17:48 +0200)]
Add invoice and offer number to comboboxes

Change-Id: I5b849ab6f94262009094ae9089f26bc22abbd48a
Reviewed-on: http://gerrit.tine20.com/customers/1922
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 agoupdate Syncroton to version 1.1.1
Lars Kneschke [Thu, 28 May 2015 11:56:24 +0000 (13:56 +0200)]
update Syncroton to version 1.1.1

Change-Id: I886fb71cad07c1f19793462bffd7d2e9b645cb06
Reviewed-on: http://gerrit.tine20.com/customers/1957
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011000: Cannot accept invitation to meeting when organiser email is too long
Philipp Schüle [Fri, 8 May 2015 11:41:00 +0000 (13:41 +0200)]
0011000: Cannot accept invitation to meeting when organiser email is too long

* increases email fields in addressbook (64 -> 255)
* adopts test as long email addresses are no longer truncated

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

Change-Id: I7f1e258b49c6151b478b1b1d2cd41fe8765fae59
Reviewed-on: https://gerrit.tine20.org/tine20/3105
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011042: failed scheduled imports stop async job
Philipp Schüle [Mon, 18 May 2015 11:24:56 +0000 (13:24 +0200)]
0011042: failed scheduled imports stop async job

* catch import exceptions during scheduled import

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

Change-Id: I57a337d3bb99ba75dd47542bca032312e0c98589
Reviewed-on: http://gerrit.tine20.com/customers/1934
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010996: Modules get disabled every now and then
Philipp Schüle [Mon, 4 May 2015 13:03:40 +0000 (15:03 +0200)]
0010996: Modules get disabled every now and then

* prevents access denied exceptions from disabling applications

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

Change-Id: I5f7d2a8544faa54c241413f2c00a91e78d743b5b
Reviewed-on: https://gerrit.tine20.org/tine20/3101
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.09'
Philipp Schüle [Wed, 27 May 2015 18:25:25 +0000 (20:25 +0200)]
Merge branch '2014.09'

5 years ago0011048: Cron job not working any more: getDispatchServer returns NULL
Philipp Schüle [Wed, 20 May 2015 08:57:05 +0000 (10:57 +0200)]
0011048: Cron job not working any more: getDispatchServer returns NULL

* adds an exception and logging if no server is found for request
* fixes is_dir in searchServerPlugins() as suggested by fvisic

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

Change-Id: Ic558cfb5d3d539f37ce9c8b918f31d5b6976f4fe
Reviewed-on: https://gerrit.tine20.org/tine20/3108
Tested-by: jenkins user
Reviewed-by: Ingo Ratsdorf <ingo@envirology.co.nz>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.09'
Philipp Schüle [Wed, 27 May 2015 15:59:23 +0000 (17:59 +0200)]
Merge branch '2014.09'

5 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Wed, 27 May 2015 15:58:42 +0000 (17:58 +0200)]
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot

Change-Id: I9aed7064e96bdbf6f6f07cbd00ee580273ee12b1

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 27 May 2015 15:53:22 +0000 (17:53 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 27 May 2015 15:52:55 +0000 (17:52 +0200)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/Convert/Event/VCalendar/Abstract.php

Change-Id: I985ea58a6fd36d49ec5a7da3b14458bab4a95d50

5 years agoApps, Admin, Setting Translation (Defaults)
sstamer [Wed, 27 May 2015 12:51:47 +0000 (14:51 +0200)]
Apps, Admin, Setting Translation (Defaults)

Change-Id: I3458d7cdf8313dbeb09f40f79fbdbe8ecda6f908
Reviewed-on: http://gerrit.tine20.com/customers/1953
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoDon't change activeContentType for new windows
sstamer [Wed, 27 May 2015 14:06:56 +0000 (16:06 +0200)]
Don't change activeContentType for new windows

Change-Id: I5d3240a6f86a87a6e4c4c4ebc93d06135568e017
Reviewed-on: http://gerrit.tine20.com/customers/1954
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agorestore Settings translation
sstamer [Tue, 26 May 2015 13:21:03 +0000 (15:21 +0200)]
restore Settings translation

Change-Id: I08541d10f2b274d45f45f394678557fb7e631590
Reviewed-on: http://gerrit.tine20.com/customers/1951
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago 0010940: Dovecot MySQL SSHA512 password too long
Philipp Schüle [Mon, 25 May 2015 19:45:23 +0000 (21:45 +0200)]
 0010940: Dovecot MySQL SSHA512 password too long

* increases password field length in php comment

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

Change-Id: Ib6ece64ad240474f3850657f40dd3c881059b5b4
Reviewed-on: http://gerrit.tine20.com/customers/1950
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago 0010946: Hinzufügen von E-Mail Konten
Philipp Schüle [Mon, 25 May 2015 19:34:08 +0000 (21:34 +0200)]
 0010946: Hinzufügen von E-Mail Konten

* fixes js error

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

Change-Id: I8559eb892e30a0f0d9186d35fb442d12f90fac9d
Reviewed-on: http://gerrit.tine20.com/customers/1949
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago 0011062: restore modal windows functionality / remove pref
Philipp Schüle [Mon, 25 May 2015 19:32:32 +0000 (21:32 +0200)]
 0011062: restore modal windows functionality / remove pref

* removes window type preference

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

Change-Id: I9cca6008c2854d4bf6be665940a2ff54d68aeb2b
Reviewed-on: http://gerrit.tine20.com/customers/1948
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago 0011030: Ldap plugin error: no user object found
Philipp Schüle [Mon, 25 May 2015 19:15:04 +0000 (21:15 +0200)]
 0011030: Ldap plugin error: no user object found

* fixed by checking user object first

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

Change-Id: I3484a338149d46f6eb4b8a9abc49039a02f83bd9
Reviewed-on: http://gerrit.tine20.com/customers/1947
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011058 can't change locale on login page
Philipp Schüle [Fri, 22 May 2015 11:00:24 +0000 (13:00 +0200)]
0011058 can't change locale on login page

* fixes problem by checking if user is already available

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

Change-Id: I50d2b7a700a581e8c48a5d96af13598925d2518a
Reviewed-on: http://gerrit.tine20.com/customers/1946
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011050: VEVENT converter: fix timezone handling for all day events
Philipp Schüle [Thu, 21 May 2015 10:42:14 +0000 (12:42 +0200)]
0011050: VEVENT converter: fix timezone handling for all day events

* adds test for TZ handling with Asia/Tehran

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

Change-Id: Idfac8bf485a7892e47d981ca141f830de1da2d1f
Reviewed-on: http://gerrit.tine20.com/customers/1943
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoAdd cli function for ImportExportDefinition update
sstamer [Wed, 27 May 2015 10:38:26 +0000 (12:38 +0200)]
Add cli function for ImportExportDefinition update

Change-Id: Ie0e4535bb0fabeb2b5c4b6a7dc46c5cd7c5d6529
Reviewed-on: http://gerrit.tine20.com/customers/1952
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011056: Fix event conversion of CANCELLED status
Marcelo Teixeira [Thu, 21 May 2015 14:35:40 +0000 (11:35 -0300)]
0011056: Fix event conversion of CANCELLED status

- recognize CANCELLED vevent status on conversion
- makes possible to process event cancelation from external organizers

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

Change-Id: I728a9a00eaff568ded0735e431031978d48346f0
Reviewed-on: https://gerrit.tine20.org/tine20/3109
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoprevent duplicate updates of exdates during MSEventFacade updates
Philipp Schüle [Thu, 7 May 2015 10:58:49 +0000 (12:58 +0200)]
prevent duplicate updates of exdates during MSEventFacade updates

* this should not be necessary as the main problem is that the getMigration fn
 returns duplicates in 'toUpdate'

Change-Id: Ibcd02a9fe86f9dd14f01fadb3d6d12613ea7fbf4
Reviewed-on: http://gerrit.tine20.com/customers/1914
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011050: VEVENT converter: fix timezone handling for all day events
Philipp Schüle [Wed, 13 May 2015 15:50:09 +0000 (17:50 +0200)]
0011050: VEVENT converter: fix timezone handling for all day events

* ics has no timezone information
* we need to use user timezone in this case to fix exdate matching

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

Change-Id: I37389487062b3f008d106b499dc64ecfe89e7efa
Reviewed-on: http://gerrit.tine20.com/customers/1932
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadd missing Calendar translations
sstamer [Mon, 18 May 2015 13:15:39 +0000 (15:15 +0200)]
add missing Calendar translations

Change-Id: I5078e75dc492a68bde3df8025af536fef6346245
Reviewed-on: http://gerrit.tine20.com/customers/1936
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010780: MessageBox "Session invalid" occurs if Browser is closed
Philipp Schüle [Thu, 14 May 2015 09:55:12 +0000 (11:55 +0200)]
0010780: MessageBox "Session invalid" occurs if Browser is closed

* checks if app is reloading when checking rights
* this removes an inifinite loop during initialization when the browser
 had been closed an the session is no longer valid

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

Change-Id: I7978b50fcc4868773a6ebb6d65bbe3f80c535c73
Reviewed-on: http://gerrit.tine20.com/customers/1933
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes merge problem in ActiveSync de.po
Philipp Schüle [Wed, 13 May 2015 15:55:18 +0000 (17:55 +0200)]
fixes merge problem in ActiveSync de.po

Change-Id: I4e6c8a0a683f8bb15de77fc0c2c6d825ba40820b
Reviewed-on: https://gerrit.tine20.org/tine20/3106
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.09'
Philipp Schüle [Wed, 13 May 2015 14:46:48 +0000 (16:46 +0200)]
Merge branch '2014.09'

5 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Wed, 13 May 2015 14:46:15 +0000 (16:46 +0200)]
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/ActiveSync/translations/de.po
tine20/Admin/translations/de.po

Change-Id: Id60b9382aae68b77856a5a0dcbe5ffa4db9648ec

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 13 May 2015 14:42:12 +0000 (16:42 +0200)]
Merge branch '2014.11' into 2014.11-develop