tine20
5 years agoMerge branch 'pu/2013.10-mailto' into 2014.11-develop
Philipp Schüle [Fri, 27 Feb 2015 17:03:33 +0000 (18:03 +0100)]
Merge branch 'pu/2013.10-mailto' into 2014.11-develop

5 years ago0010878: every popup window triggers survey check
Philipp Schüle [Fri, 27 Feb 2015 12:31:53 +0000 (13:31 +0100)]
0010878: every popup window triggers survey check

* prevents re-init of login panel / survey check in popup window

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

Change-Id: I283e04e90cd7b763ef589c8e9eda7e9b9a4d964b
Reviewed-on: http://gerrit.tine20.com/customers/1696
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 'pu/2014.11-archiveproducts' into 2014.11-develop
Philipp Schüle [Wed, 25 Feb 2015 16:26:06 +0000 (17:26 +0100)]
Merge branch 'pu/2014.11-archiveproducts' into 2014.11-develop

Conflicts:
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot

Change-Id: Ie7391f91191998cad8a0c6e9ce43111a4b8cff30

5 years agoSet all products by default to is_active = 1
Michael Spahn [Thu, 12 Feb 2015 10:05:22 +0000 (11:05 +0100)]
Set all products by default to is_active = 1

Change-Id: I6f8135a7432e9acfbb7a30f232a08bddaae955c7
Reviewed-on: http://gerrit.tine20.com/customers/1658
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.11' into 2014.11-develop
Philipp Schüle [Wed, 25 Feb 2015 13:25:25 +0000 (14:25 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 25 Feb 2015 13:21:16 +0000 (14:21 +0100)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: I27b9ee4dae192a652215ac488facb1e3a2a2d0c8

5 years agoMerge branch 'pu/2013.10-favoritesacl' into 2013.10
Philipp Schüle [Wed, 25 Feb 2015 13:16:28 +0000 (14:16 +0100)]
Merge branch 'pu/2013.10-favoritesacl' into 2013.10

Conflicts:
tine20/Felamimail/Setup/Initialize.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: I3191101f7839af8a29b957c86022c497a8c86186

5 years agodefine daysView mouseWheelIncrement per config
Cornelius Weiß [Thu, 19 Feb 2015 09:38:11 +0000 (10:38 +0100)]
define daysView mouseWheelIncrement per config

Change-Id: I54c160cae49e777910f1851150c9894bcb50da9d
Reviewed-on: http://gerrit.tine20.com/customers/1675
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch 'pu/2013.10-eventcopyandpaste' into 2013.10
Philipp Schüle [Wed, 25 Feb 2015 12:56:22 +0000 (13:56 +0100)]
Merge branch 'pu/2013.10-eventcopyandpaste' into 2013.10

5 years ago0010820: fix non-autoincrement integer id column for pgsql
Lars Kneschke [Wed, 25 Feb 2015 07:21:09 +0000 (08:21 +0100)]
0010820: fix non-autoincrement integer id column for pgsql

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

Change-Id: I8d18906196fb407fb6628913eecf58d562c7419d
Reviewed-on: http://gerrit.tine20.com/customers/1690
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoprevent accidental change of pagination object
Philipp Schüle [Wed, 25 Feb 2015 11:30:25 +0000 (12:30 +0100)]
prevent accidental change of pagination object

- adds a test for sorted crm export

see 0010790: use current grid sort in exports

Change-Id: I4b73affb550d6bb9e147728bf9cff99f717f1add

5 years agoFix case of appliaction name
Lars Kneschke [Wed, 25 Feb 2015 04:21:46 +0000 (05:21 +0100)]
Fix case of appliaction name

- lowercase breaks with case sensitive sql query

Change-Id: I08587c317fd53f90836c9078b0bf77ee44f3b56a
Reviewed-on: http://gerrit.tine20.com/customers/1689
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Mon, 23 Feb 2015 12:19:20 +0000 (13:19 +0100)]
Merge branch '2014.11' into 2014.11-develop

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

Change-Id: I72995e21e77df5c6fd6c183020cfe52980c2268f

5 years agofixing IE 9
Philipp Schüle [Thu, 19 Feb 2015 20:26:27 +0000 (21:26 +0100)]
fixing IE 9

* removes some obsolete code
* removes invalid commas
* adds missing semicolon
* use Ext.encode/decode instead of JSON.stringify/parse

Change-Id: I15979c3695ae0b6652e62bc50bb103cc9128b873
Reviewed-on: http://gerrit.tine20.com/customers/1680
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds some improvements for scheduled imports
Philipp Schüle [Wed, 18 Feb 2015 18:16:18 +0000 (19:16 +0100)]
adds some improvements for scheduled imports

* more logging
* prevents logging of passwords
* always run import with NULL timestamps

Change-Id: I546013c30e97c6116cd3beedcb962368964f605e
Reviewed-on: http://gerrit.tine20.com/customers/1673
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoAllow to copy and paste events
Michael Spahn [Tue, 10 Feb 2015 15:38:28 +0000 (16:38 +0100)]
Allow to copy and paste events

 + copy once
 + paste as often as you like by click right mouse
 + introducing first kind of clipboard in tine

Change-Id: Iaf9540cf2e7405858ec77e3ae251a754a76b85a2
Reviewed-on: http://gerrit.tine20.com/customers/1641
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 agoTine.log.err() is not working in IE: use error()
Philipp Schüle [Thu, 19 Feb 2015 20:21:26 +0000 (21:21 +0100)]
Tine.log.err() is not working in IE: use error()

Change-Id: I4dd0e0860b9e4804041e9573e65c6874218ecf19
Reviewed-on: http://gerrit.tine20.com/customers/1677
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 agofix update path of Sales application
Lars Kneschke [Wed, 18 Feb 2015 18:00:45 +0000 (19:00 +0100)]
fix update path of Sales application

Change-Id: I1efacfbd5302e155dc10864aadb2ae254e1a38b7
Reviewed-on: http://gerrit.tine20.com/customers/1672
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
5 years agoshow translation of undefined for deleted types/sources/states
Philipp Schüle [Wed, 18 Feb 2015 16:30:38 +0000 (17:30 +0100)]
show translation of undefined for deleted types/sources/states

Change-Id: I8c073b3799f4db59e08750eec3faa0a0d4bf360f
Reviewed-on: http://gerrit.tine20.com/customers/1669
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch 'pu/2013.10-mailto' into 2014.11-develop
Philipp Schüle [Wed, 18 Feb 2015 16:38:10 +0000 (17:38 +0100)]
Merge branch 'pu/2013.10-mailto' into 2014.11-develop

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 18 Feb 2015 16:38:03 +0000 (17:38 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 18 Feb 2015 16:36:11 +0000 (17:36 +0100)]
Merge branch '2013.10' into 2014.11

5 years agoskips already deleted exdates during event update
Philipp Schüle [Wed, 4 Feb 2015 16:56:49 +0000 (17:56 +0100)]
skips already deleted exdates during event update

* adds a new param skipMissing to
Tinebase_Record_RecordSet::setByIndices()

Change-Id: I6f986395011a91deb73e898ed62f213eedb12bf9
Reviewed-on: http://gerrit.tine20.com/customers/1609
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010834: defining a key-value costumfield breaks addressbook
Philipp Schüle [Tue, 17 Feb 2015 12:45:33 +0000 (13:45 +0100)]
0010834: defining a key-value costumfield breaks addressbook

* use set() to update config item in registry
* trying to set the object directly did not work any longer (did it ever
work?)

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

Change-Id: If9e0325648cdbe3c372e878d1b365d226291c8aa
Reviewed-on: http://gerrit.tine20.com/customers/1670
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoRevert "0010834: defining a key-value costumfield breaks addressbook"
Philipp Schüle [Wed, 18 Feb 2015 16:34:05 +0000 (17:34 +0100)]
Revert "0010834: defining a key-value costumfield breaks addressbook"

-> this is only needed with the registry changes introduced in pu/2013.10-mailto

This reverts commit 6ee7095ff75780e97425011642b315cdb5b4024a.

Change-Id: I7205d027979ac989fe3ff4e57165e60c46b0353b
Reviewed-on: http://gerrit.tine20.com/customers/1671
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 [Wed, 18 Feb 2015 15:58:47 +0000 (16:58 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 18 Feb 2015 15:58:21 +0000 (16:58 +0100)]
Merge branch '2013.10' into 2014.11

5 years agoMerge branch 'pu/2013.10-mailto' into 2014.11-develop
Philipp Schüle [Wed, 18 Feb 2015 15:57:31 +0000 (16:57 +0100)]
Merge branch 'pu/2013.10-mailto' into 2014.11-develop

5 years agoadds new window/registry handling for mailto links
Philipp Schüle [Tue, 10 Feb 2015 16:28:28 +0000 (17:28 +0100)]
adds new window/registry handling for mailto links

Change-Id: I98f48adc10ec1b8beb0b7a05e31c2f7952cbc2c6
Reviewed-on: http://gerrit.tine20.com/customers/1640
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoreload registry on forced page reload
Cornelius Weiß [Tue, 10 Feb 2015 18:20:13 +0000 (19:20 +0100)]
reload registry on forced page reload

* have forced reload on ctrl-l key for testing

Change-Id: I18b12a5dc0c5fc35cb39cec525b41435d3293a34
Reviewed-on: http://gerrit.tine20.com/customers/1643
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 agomemberOf filter can only added once
Cornelius Weiß [Wed, 18 Feb 2015 10:05:05 +0000 (11:05 +0100)]
memberOf filter can only added once

* cope with list/group mix from server

Change-Id: I64ff9ffeb6dca42952e40b328f910f3af264266e
Reviewed-on: http://gerrit.tine20.com/customers/1668
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 ago0010752: update script for android 5.0 / lollipop devices
jevers [Fri, 6 Feb 2015 12:35:24 +0000 (13:35 +0100)]
0010752: update script for android 5.0 / lollipop devices

* delete Android 5 user agent entries from tine20_acsync_device

Change-Id: Ie3b1a8c784ed25baffb13d75f04c90b960a37a83
Reviewed-on: http://gerrit.tine20.com/customers/1618
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 'pu/2014.11-archiveleadsource' into 2014.11-develop
Philipp Schüle [Tue, 17 Feb 2015 13:32:06 +0000 (14:32 +0100)]
Merge branch 'pu/2014.11-archiveleadsource' into 2014.11-develop

Conflicts:
tine20/Crm/translations/de.po
tine20/Crm/translations/en.po
tine20/Crm/translations/template.pot

Change-Id: I3b52e36d2afaf83b9a7db6f230fc416cf353200a

5 years agoMerge branch 'pu/2014.11-extendedsearch' into 2014.11-develop
Philipp Schüle [Tue, 17 Feb 2015 13:31:39 +0000 (14:31 +0100)]
Merge branch 'pu/2014.11-extendedsearch' into 2014.11-develop

Conflicts:
tests/tine20/Crm/JsonTest.php

Change-Id: I95ebffbb23e9957c5f46ab481431b966a8eb1b60

5 years agoMerge branch 'pu/2014.11-vcardimport' into 2014.11-develop
Philipp Schüle [Tue, 17 Feb 2015 13:31:11 +0000 (14:31 +0100)]
Merge branch 'pu/2014.11-vcardimport' into 2014.11-develop

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Tue, 17 Feb 2015 13:31:06 +0000 (14:31 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Tue, 17 Feb 2015 13:29:10 +0000 (14:29 +0100)]
Merge branch '2013.10' into 2014.11

5 years ago0010834: defining a key-value costumfield breaks addressbook
Philipp Schüle [Tue, 17 Feb 2015 12:45:33 +0000 (13:45 +0100)]
0010834: defining a key-value costumfield breaks addressbook

* use set() to update config item in registry
* trying to set the object directly did not work any longer (did it ever
work?)

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

Change-Id: If9e0325648cdbe3c372e878d1b365d226291c8fb
Reviewed-on: http://gerrit.tine20.com/customers/1667
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes invalid start/end time validation
Philipp Schüle [Tue, 17 Feb 2015 11:57:32 +0000 (12:57 +0100)]
fixes invalid start/end time validation

* introduces adjustTimeToUserPreference helper function
* improves validation error strings

Change-Id: I4aa6eccdd5ff674973bee6dda7b954326ce14658
Reviewed-on: http://gerrit.tine20.com/customers/1666
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoskips test if Sales custom config exists
Philipp Schüle [Mon, 16 Feb 2015 14:21:46 +0000 (15:21 +0100)]
skips test if Sales custom config exists

Change-Id: Id5775ac74a1441c88885fe8e0a618b46dfd88b27
Reviewed-on: http://gerrit.tine20.com/customers/1663
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes translation strings
Philipp Schüle [Wed, 11 Feb 2015 14:38:52 +0000 (15:38 +0100)]
fixes translation strings

Change-Id: I3897c46bb2395558c4fcf4b6392fe8cf69a39923
Reviewed-on: http://gerrit.tine20.com/customers/1645
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch 'pu/2014.11-personaltags' into 2014.11-develop
Philipp Schüle [Tue, 17 Feb 2015 13:11:38 +0000 (14:11 +0100)]
Merge branch 'pu/2014.11-personaltags' into 2014.11-develop

Conflicts:
tests/tine20/TestCase.php

Change-Id: Ib411165184ba784220d99e740c1cab6662cf3cb4

5 years agolist returns 1 if no applications are installed
Philipp Schüle [Mon, 16 Feb 2015 11:42:00 +0000 (12:42 +0100)]
list returns 1 if no applications are installed

Change-Id: I2f01135054a35434e4bf2937904d8fb5413bcf76
Reviewed-on: http://gerrit.tine20.com/customers/1660
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Mon, 16 Feb 2015 12:01:58 +0000 (13:01 +0100)]
Merge branch '2013.10' into 2014.11

5 years agofix borken update on PGSQL
Lars Kneschke [Fri, 13 Feb 2015 10:32:29 +0000 (11:32 +0100)]
fix borken update on PGSQL

Change-Id: I3796991ef95cb00df316f571d95e0d8d37549fad
Reviewed-on: http://gerrit.tine20.com/customers/1659
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
5 years agofind gidnumber for group objects too
Lars Kneschke [Wed, 11 Feb 2015 15:09:37 +0000 (16:09 +0100)]
find gidnumber for group objects too

Change-Id: I91270063c78e630e185cf9a6dea04d283d9c2206
Reviewed-on: http://gerrit.tine20.com/customers/1646
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 11 Feb 2015 14:40:00 +0000 (15:40 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoskips undefined fields in UserProfilePanel
Philipp Schüle [Wed, 11 Feb 2015 11:38:47 +0000 (12:38 +0100)]
skips undefined fields in UserProfilePanel

Change-Id: I95f664a8788ea51cf91989cd0b6ae2633265f8d2
Reviewed-on: http://gerrit.tine20.com/customers/1642
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 11 Feb 2015 11:17:15 +0000 (12:17 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoremoves duplicate translation
Philipp Schüle [Wed, 11 Feb 2015 11:15:31 +0000 (12:15 +0100)]
removes duplicate translation

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 11 Feb 2015 11:12:59 +0000 (12:12 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 11 Feb 2015 10:55:44 +0000 (11:55 +0100)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/translations/de.po

Change-Id: Ica114bb265602c623d275a3fc1c84cc4a391341d

5 years agofixes duplicate % in tooltip
Philipp Schüle [Tue, 10 Feb 2015 13:04:55 +0000 (14:04 +0100)]
fixes duplicate % in tooltip

Change-Id: I596988e188131f970d46c99fb0ddc9207e303e65
Reviewed-on: http://gerrit.tine20.com/customers/1632
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Tue, 10 Feb 2015 16:38:41 +0000 (17:38 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years ago0010822: contact relation is not saved correctly
Philipp Schüle [Tue, 10 Feb 2015 13:51:04 +0000 (14:51 +0100)]
0010822: contact relation is not saved correctly

* RESPONSIBLE relation type needs to be upper case
- fixed in js client default data for new leads
- adds update script for current relations types
* fixes lead notification mails for new leads
* adds a helper function for setting container grants to TestCase
* some more minor improvements

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

Change-Id: Ic46b21518db985a8d86a0042fe4b6b44dd047537
Reviewed-on: http://gerrit.tine20.com/customers/1637
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoReverts new window/registry handling for mailto links
Philipp Schüle [Tue, 10 Feb 2015 15:42:23 +0000 (16:42 +0100)]
Reverts new window/registry handling for mailto links

* this is currently broken as we rely on registry reloads
in some cases
* user profile seems to be broken, too

Revert "fix event handling for same window event"
This reverts commit a0a3fea6fe0b474cd7733173dc6d058a30a1c2f9.

Revert "support mailto links"
This reverts commit 5817f15342a561e5e9245f67979f430331571fc9.

Change-Id: Ie917f80baa43fa46707b1d1ec73c3c79f9b47baa
Reviewed-on: http://gerrit.tine20.com/customers/1639
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoremove comment no longer needed
Lars Kneschke [Tue, 10 Feb 2015 14:12:25 +0000 (15:12 +0100)]
remove comment no longer needed

Change-Id: Ic66e2465c1fe2994528194b6916fed36e9fed49d
Reviewed-on: http://gerrit.tine20.com/customers/1633
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix update script for Sales application
Lars Kneschke [Tue, 10 Feb 2015 08:13:33 +0000 (09:13 +0100)]
fix update script for Sales application

Change-Id: Iddec41931a27d9b64621c5ac13b4c9a7d1cab4e3
Reviewed-on: http://gerrit.tine20.com/customers/1629
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
5 years agosetup tests: phpunitconfig.inc.php is taken from any include path
Philipp Schüle [Mon, 9 Feb 2015 16:11:28 +0000 (17:11 +0100)]
setup tests: phpunitconfig.inc.php is taken from any include path

Change-Id: I721430ff975e141764eb3596a35c731b76c99e2d
Reviewed-on: http://gerrit.tine20.com/customers/1626
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoreturn also default value in toArray()
Lars Kneschke [Tue, 10 Feb 2015 08:08:43 +0000 (09:08 +0100)]
return also default value in toArray()

Change-Id: I09d88a22e00c69e97ad65be31fa8d6cb1dc3eb94
Reviewed-on: http://gerrit.tine20.com/customers/1627
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix broken alterCol function
Lars Kneschke [Tue, 10 Feb 2015 08:12:14 +0000 (09:12 +0100)]
fix broken alterCol function

- previous preg_match matched not only the DEFAULT value but also the
following NOT NULL
- default value is property of $_declaration => no need to guess it with
preg_match

Change-Id: I1e6c80e65608db706dd55da4f3c63d7ebcb8b555
Reviewed-on: http://gerrit.tine20.com/customers/1628
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch 'pu/2013.10-clipboard' into 2013.10
Philipp Schüle [Mon, 9 Feb 2015 15:41:11 +0000 (16:41 +0100)]
Merge branch 'pu/2013.10-clipboard' into 2013.10

Conflicts:
tine20/Calendar/translations/de.po

Change-Id: Iab280980cf051874a9363de1ca67b72c49bf5f18

5 years agoreplace having with where
Lars Kneschke [Tue, 27 Jan 2015 07:36:17 +0000 (08:36 +0100)]
replace having with where

Change-Id: I4f6d634c49d221e50f138b9a77149cfb24ffc444
Reviewed-on: http://gerrit.tine20.com/customers/1567
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix problem with duplicate INBOX folders
Lars Kneschke [Mon, 9 Feb 2015 12:27:40 +0000 (13:27 +0100)]
fix problem with duplicate INBOX folders

- INBOX: check if located in personal namespace
- TRASH, SENT and DRAFTS: check if configured folder or if located in
personal namespace

Change-Id: Ia8b6963bdbf0c1759b7dac88368f622165c34abc
Reviewed-on: http://gerrit.tine20.com/customers/1623
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Mon, 9 Feb 2015 12:29:11 +0000 (13:29 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Mon, 9 Feb 2015 12:28:27 +0000 (13:28 +0100)]
Merge branch '2013.10' into 2014.11

5 years agosome minor improvements of XLS export
Philipp Schüle [Fri, 6 Feb 2015 20:56:00 +0000 (21:56 +0100)]
some minor improvements of XLS export

* more debugging
* code formatting
* configure dates as timestamp or normal date string (YYYY-MM-DD)
* allows to define the used sheet in templates

Change-Id: Id471202c00f83e813c853c5bc43c3ffe7da995d5
Reviewed-on: http://gerrit.tine20.com/customers/1620
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Michael Spahn <kontakt@michaelspahn.de>
5 years agoAllow to parse vcard url instead of contact data
Michael Spahn [Wed, 21 Jan 2015 16:12:17 +0000 (17:12 +0100)]
Allow to parse vcard url instead of contact data

Change-Id: I342b2300cf9170547303dcaf67d45109cb7ec35e
Reviewed-on: http://gerrit.tine20.com/customers/1554
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoImprove regex for adress detection
Michael Spahn [Wed, 4 Feb 2015 17:49:51 +0000 (18:49 +0100)]
Improve regex for adress detection

Allows to detect the following:
Name Surname Title Company

Change-Id: I7d2a4779df7593099db31021935cf3c8b825949c
Reviewed-on: http://gerrit.tine20.com/customers/1611
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 agoSend notification emails if user has edit right to resource
Michael Spahn [Mon, 8 Dec 2014 16:20:42 +0000 (17:20 +0100)]
Send notification emails if user has edit right to resource

If you add a resource to your event, every user who is allowed
to edit this resouce receives the mail as well.

Change-Id: I1f3dfa321e28c475b6ec7b633763c5a96d5ac964
Reviewed-on: http://gerrit.tine20.com/customers/1430
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 agoallows to select custom export defintions in the CRM
Philipp Schüle [Fri, 6 Feb 2015 20:53:42 +0000 (21:53 +0100)]
allows to select custom export defintions in the CRM

Change-Id: Iae268d806591596b3a206e08fa6eda82e892861f
Reviewed-on: http://gerrit.tine20.com/customers/1619
Reviewed-by: Michael Spahn <kontakt@michaelspahn.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010814: quicksearch should search in related records
Philipp Schüle [Fri, 6 Feb 2015 12:37:47 +0000 (13:37 +0100)]
0010814: quicksearch should search in related records

* quicksearch now includes related contacts/products/tasks

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

Change-Id: If7465e1d76f13f09f3a3e977cc7a72483d00e18b
Reviewed-on: http://gerrit.tine20.com/customers/1617
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoImplementing advanced filter mode for filterpanel
Michael Spahn [Fri, 30 Jan 2015 15:06:49 +0000 (16:06 +0100)]
Implementing advanced filter mode for filterpanel

Change-Id: I99d4f2cecb386f8e7d587a79b2c5f56a53de2802
Reviewed-on: http://gerrit.tine20.com/customers/1589
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 agothrows exception if event has neither dtend nor dtstart
Philipp Schüle [Fri, 6 Feb 2015 10:23:45 +0000 (11:23 +0100)]
throws exception if event has neither dtend nor dtstart

Change-Id: I68486a53c42e67483ff7447d32372577a3fd1b98
Reviewed-on: http://gerrit.tine20.com/customers/1616
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Fri, 6 Feb 2015 09:06:33 +0000 (10:06 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Fri, 6 Feb 2015 09:05:30 +0000 (10:05 +0100)]
Merge branch '2013.10' into 2014.11

5 years agosome export definitions don't have a column config
Philipp Schüle [Thu, 5 Feb 2015 11:47:06 +0000 (12:47 +0100)]
some export definitions don't have a column config

* for example the DOC export of the Adressbook

Change-Id: Ic535eb9b7ffb6cb8b080a6a5bff2ec37fe1b8dc8
Reviewed-on: http://gerrit.tine20.com/customers/1614
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoFix some special Translations
sstamer [Thu, 5 Feb 2015 12:18:47 +0000 (13:18 +0100)]
Fix some special Translations

Change-Id: Idb6e7d1052d855d9055e03bca25c20590fb9a706
Reviewed-on: http://gerrit.tine20.com/customers/1615
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoDo not create recurring events that are longer than the interval
sstamer [Wed, 4 Feb 2015 14:37:14 +0000 (15:37 +0100)]
Do not create recurring events that are longer than the interval

Change-Id: I9b964a9f46e51788ee1cab091559ee712b044362
Reviewed-on: http://gerrit.tine20.com/customers/1608
Tested-by: sstamer <s.stamer@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010766: set product lifespan
Michael Spahn [Fri, 30 Jan 2015 12:33:53 +0000 (13:33 +0100)]
0010766: set product lifespan

* adds new product fields: lifespan begin/end, is_active
* adds update script for new fields
* adds updateProductLifespan
* adds unittests
* adds hourly async job for updateProductLifespan

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

Change-Id: Iefb36e0c3bf728dd135c96bbe58106f4a2dc31aa
Reviewed-on: http://gerrit.tine20.com/customers/1610
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoDon't allow to add personal tags if user has not enough perms
Michael Spahn [Mon, 26 Jan 2015 18:10:57 +0000 (19:10 +0100)]
Don't allow to add personal tags if user has not enough perms

Change-Id: I17d397a9c2dede50f0952727786d6ec1c2949dc6
Reviewed-on: http://gerrit.tine20.com/customers/1565
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 agoprevent xDAV clients to change the container displayname to id/uuid
Philipp Schüle [Wed, 4 Feb 2015 12:27:37 +0000 (13:27 +0100)]
prevent xDAV clients to change the container displayname to id/uuid

Change-Id: I33a310c7f52b1f9fc16b828ad53e3caffa56f843
Reviewed-on: http://gerrit.tine20.com/customers/1607
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoFix some sales translations
sstamer [Wed, 28 Jan 2015 08:45:41 +0000 (09:45 +0100)]
Fix some sales translations

Change-Id: Id63f07aaa1698e3a0c3c237c140158da075a0f6e
Reviewed-on: http://gerrit.tine20.com/customers/1570
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch 'pu/2013.10-mailto' into 2014.11-develop
Philipp Schüle [Wed, 4 Feb 2015 12:43:52 +0000 (13:43 +0100)]
Merge branch 'pu/2013.10-mailto' into 2014.11-develop

Conflicts:
tine20/Tinebase/js/MainMenu.js

Change-Id: Iff5447f347286824e7b8bcc824b9a084ea606ebe

5 years agofix event handling for same window event
Cornelius Weiß [Wed, 4 Feb 2015 11:23:08 +0000 (12:23 +0100)]
fix event handling for same window event

Change-Id: I0b3aba65b10596f3c71011d0f6538409672b5785
Reviewed-on: http://gerrit.tine20.com/customers/1606
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Michael Spahn <kontakt@michaelspahn.de>
Tested-by: Michael Spahn <kontakt@michaelspahn.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 4 Feb 2015 12:35:09 +0000 (13:35 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 4 Feb 2015 12:34:19 +0000 (13:34 +0100)]
Merge branch '2013.10' into 2014.11

5 years ago0010790: use current grid sort in exports
Philipp Schüle [Thu, 29 Jan 2015 16:10:43 +0000 (17:10 +0100)]
0010790: use current grid sort in exports

* passes sort info to export config
* fixes sort handling in iterator

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

Change-Id: I02d53cff22115bb5a9b7d6caa84f2f95d5d56f84
Reviewed-on: http://gerrit.tine20.com/customers/1580
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMute Toggle with Reschedule, RecurException, StatusChange
sstamer [Thu, 29 Jan 2015 15:04:07 +0000 (16:04 +0100)]
Mute Toggle with Reschedule, RecurException, StatusChange

+ Tests

Change-Id: I4b14f3ab7bf2fae837c59156c0787a57bdafe8a9
Reviewed-on: http://gerrit.tine20.com/customers/1603
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010560: Import contacts using merge mine
sstamer [Thu, 29 Jan 2015 14:12:57 +0000 (15:12 +0100)]
0010560: Import contacts using merge mine

* adds a mergeMine test with tags
* fixes merge handling when importing via web interface

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

Change-Id: I04307bd01ca05ea57cb6aef9f792338c96f727ee
Reviewed-on: http://gerrit.tine20.com/customers/1578
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 agofixes duplicate translations in Filemanager de.po
Philipp Schüle [Tue, 3 Feb 2015 15:07:46 +0000 (16:07 +0100)]
fixes duplicate translations in Filemanager de.po

Change-Id: I71a5cacfdf4ae0bc42739f30c30266d2ebfc7f5f
Reviewed-on: http://gerrit.tine20.com/customers/1604
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix dayview position & size in print sheets
Cornelius Weiß [Thu, 22 Jan 2015 13:02:00 +0000 (14:02 +0100)]
fix dayview position & size in print sheets

* position all day events with percentages

Change-Id: If92869e42540bc2ad06ed8448812857b6ade7b10
Reviewed-on: http://gerrit.tine20.com/customers/1557
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Tue, 3 Feb 2015 14:29:40 +0000 (15:29 +0100)]
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Frontend/iMIPTest.php
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot

Change-Id: I7415f7ecabb4d32f734ae4723bd7e10a045f8684

5 years agoupdate for installations with PGSQL < 9.1 fails
Lars Kneschke [Tue, 3 Feb 2015 08:33:09 +0000 (09:33 +0100)]
update for installations with PGSQL < 9.1 fails

- left function is not evailable for PGSQL < 9.1
- do the length calculation in PHP
- create the needed SQL query with Zend_Db_Select

Change-Id: I8de7ded086b7674d87da072da2424ee2bce35f16
Reviewed-on: http://gerrit.tine20.com/customers/1600
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010792: Sort leads by status and source
Philipp Schüle [Sat, 31 Jan 2015 17:27:32 +0000 (18:27 +0100)]
0010792: Sort leads by status and source

* implements sorting for "keyfields" in CRM (leadstate/source/type)
* creates new getSwitch() DB Command

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

Change-Id: I3d2a1b5d7323b6de89b6124596b6169efbed9653
Reviewed-on: http://gerrit.tine20.com/customers/1597
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch 'pu/2013.10-mutenotification' into 2013.10
Philipp Schüle [Tue, 3 Feb 2015 09:12:11 +0000 (10:12 +0100)]
Merge branch 'pu/2013.10-mutenotification' into 2013.10

Conflicts:
tests/tine20/Calendar/Frontend/iMIPTest.php

Change-Id: I8352806b92bd3d75cac3fafeced6f4b765a8803b

5 years agoMerge branch 'pu/2013.10-downloadlink' into 2013.10
Philipp Schüle [Tue, 3 Feb 2015 09:10:59 +0000 (10:10 +0100)]
Merge branch 'pu/2013.10-downloadlink' into 2013.10

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

Change-Id: I8ed2bfbee9d88ea1822e9ebac38fe8e50a349aa2

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Sat, 31 Jan 2015 17:45:59 +0000 (18:45 +0100)]
Merge branch '2013.10' into 2014.11

5 years agoadd action should be available by default
Philipp Schüle [Sat, 31 Jan 2015 17:28:30 +0000 (18:28 +0100)]
add action should be available by default

Change-Id: Ife2a0414c69e2be9bbaad55abf8b001dc57cfe55
Reviewed-on: http://gerrit.tine20.com/customers/1598
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agochecks if session is writable first (setup TZ)
Philipp Schüle [Fri, 30 Jan 2015 13:56:01 +0000 (14:56 +0100)]
checks if session is writable first (setup TZ)

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