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

6 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

6 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

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

6 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

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 13 May 2015 14:41:51 +0000 (16:41 +0200)]
Merge branch '2013.10' into 2014.11

6 years agoRemove CalDAV Password and Username field from Calendar import
sstamer [Fri, 8 May 2015 08:24:28 +0000 (10:24 +0200)]
Remove CalDAV Password and Username field from Calendar import

Change-Id: I9396c48b07ccf72f8a92eec9a8074c48dd37bad3
Reviewed-on: http://gerrit.tine20.com/customers/1931
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoAdd emptyText for url in Calendar import dialog
sstamer [Fri, 8 May 2015 08:40:24 +0000 (10:40 +0200)]
Add emptyText for url in Calendar import dialog

Change-Id: Ic04a47fa725bb15581074e167adc685f2f311043
Reviewed-on: http://gerrit.tine20.com/customers/1930
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoremove account_id from CSV export
Lars Kneschke [Wed, 13 May 2015 12:44:11 +0000 (14:44 +0200)]
remove account_id from CSV export

Change-Id: Id10a201d31d1e4ec9e52a36eeb9bc887e74c3652
Reviewed-on: http://gerrit.tine20.com/customers/1926
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoTranslate Anyone user in container grants
Lars Kneschke [Wed, 13 May 2015 10:54:55 +0000 (12:54 +0200)]
Translate Anyone user in container grants

Change-Id: I74a315b605a9428ab1f304064fff8a92475ed509
Reviewed-on: http://gerrit.tine20.com/customers/1925
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>
6 years agostreamlined descriptions for address book imports
Lars Kneschke [Wed, 13 May 2015 13:27:54 +0000 (15:27 +0200)]
streamlined descriptions for address book imports

Change-Id: I243e99cffdf2ea5e9bc53437037d382e4738f9f1
Reviewed-on: http://gerrit.tine20.com/customers/1927
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoActiveSync Device Translations
sstamer [Fri, 8 May 2015 13:39:02 +0000 (15:39 +0200)]
ActiveSync Device Translations

Change-Id: Iee82c00ee2207c5b91365755fcc0d1966badef07
Reviewed-on: http://gerrit.tine20.com/customers/1920
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011024: don't show external imip events in shared calendars
Philipp Schüle [Thu, 7 May 2015 13:49:07 +0000 (15:49 +0200)]
0011024: don't show external imip events in shared calendars

* do not ignore acl when fetching shared containers in Calendar
* fixes some typos and improves formatting

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

Change-Id: I81c1f6224622a0734266a8a8e4c38d675321b39e
Reviewed-on: http://gerrit.tine20.com/customers/1915
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 2014.09
Philipp Schüle [Thu, 7 May 2015 14:48:23 +0000 (16:48 +0200)]
Merge branch '2014.11-develop' into 2014.09

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

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

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Thu, 7 May 2015 14:42:40 +0000 (16:42 +0200)]
Merge branch '2013.10' into 2014.11

6 years agoadds fallback value if VCARD has no valid family or org name
Philipp Schüle [Thu, 7 May 2015 14:28:38 +0000 (16:28 +0200)]
adds fallback value if VCARD has no valid family or org name

Change-Id: Ie63a90322fb167b74a1d9d6c2b4d95874c49909a
Reviewed-on: http://gerrit.tine20.com/customers/1916
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadds fallback value if VCARD has no valid family or org name
Philipp Schüle [Thu, 7 May 2015 14:28:38 +0000 (16:28 +0200)]
adds fallback value if VCARD has no valid family or org name

Change-Id: Ie63a90322fb167b74a1d9d6c2b4d95874c49909a

6 years agoReset_DemoData clear Cache
sstamer [Wed, 29 Apr 2015 16:12:40 +0000 (18:12 +0200)]
Reset_DemoData clear Cache

Change-Id: Icd855703000bf4c454ad339d24e8ff14fa548fdf
Reviewed-on: http://gerrit.tine20.com/customers/1898
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadd copy action to inventory
sstamer [Tue, 5 May 2015 12:21:08 +0000 (14:21 +0200)]
add copy action to inventory

Change-Id: Ic8de08b9a6881612489e374b7945c58465041ec2
Reviewed-on: http://gerrit.tine20.com/customers/1908
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 agoallow to remove vacation days from already saved vacations
Philipp Schüle [Wed, 6 May 2015 15:18:30 +0000 (17:18 +0200)]
allow to remove vacation days from already saved vacations

Change-Id: I3fe759a4649eb2540c6900fc5a4709df07d14d14
Reviewed-on: http://gerrit.tine20.com/customers/1912
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Wed, 6 May 2015 15:06:19 +0000 (17:06 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 6 May 2015 15:05:24 +0000 (17:05 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoremoves no longer used offset for feast days
Philipp Schüle [Wed, 6 May 2015 15:02:50 +0000 (17:02 +0200)]
removes no longer used offset for feast days

Change-Id: Iaa046bc74aaf2228e414e3a6f63fe403f59845c6
Reviewed-on: http://gerrit.tine20.com/customers/1911
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes js error when element is undefined in EventUI
Philipp Schüle [Wed, 6 May 2015 15:01:59 +0000 (17:01 +0200)]
fixes js error when element is undefined in EventUI

Change-Id: Ief360f7a27ec65031610b381f091ee29a6bcaa02
Reviewed-on: http://gerrit.tine20.com/customers/1910
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoremoves "window can be closed" notification in popups
Philipp Schüle [Wed, 6 May 2015 14:57:40 +0000 (16:57 +0200)]
removes "window can be closed" notification in popups

Change-Id: Icd22feb75c5d2d93a6e6cfc78f49bcb516a1cf56
Reviewed-on: http://gerrit.tine20.com/customers/1909
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011014: don't treat expired user as disabled
Philipp Schüle [Mon, 4 May 2015 14:10:49 +0000 (16:10 +0200)]
0011014: don't treat expired user as disabled

* expired user status is no longer mapped to disabled
* find expired and blocked user contacts by default (with ContactDisabledFilter)

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

Change-Id: I9b821e25b93d1f96b9c19a0d26b74de74c7b2717
Reviewed-on: http://gerrit.tine20.com/customers/1904
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 agoAllow negative values for purchase invoices
Michael Spahn [Tue, 5 May 2015 10:30:58 +0000 (12:30 +0200)]
Allow negative values for purchase invoices

Change-Id: I5374fbd192dacb7e9a54830f1b833b2372a840b0
Reviewed-on: http://gerrit.tine20.com/customers/1907
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 agoAllow negative values for invoices
Michael Spahn [Mon, 4 May 2015 16:10:20 +0000 (18:10 +0200)]
Allow negative values for invoices

 + Improve rendering for negative numbers
 + Change price columns to signed
 + Gross / Net * -1 for reversal invoice

Change-Id: I7f7758a4d0afde20eb2295ddc48b1f02f94b6d4e
Reviewed-on: http://gerrit.tine20.com/customers/1905
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 ago0010874: use service workers to cache app resources
Philipp Schüle [Fri, 1 May 2015 10:28:40 +0000 (12:28 +0200)]
0010874: use service workers to cache app resources

Change-Id: Id8af4dfb3f671d2c1648714333feea3041f60ac8
Reviewed-on: https://gerrit.tine20.org/tine20/3099
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.11-develop' into 2014.09
Philipp Schüle [Mon, 4 May 2015 13:00:11 +0000 (15:00 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Mon, 4 May 2015 12:57:49 +0000 (14:57 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Mon, 4 May 2015 12:57:13 +0000 (14:57 +0200)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Setup/js/AuthenticationPanel.js

Change-Id: Ib7d66926b11cfb6a12405dc2dbbb1b708d76e026

6 years agohandle empty email config in IMAP backend
Philipp Schüle [Thu, 30 Apr 2015 10:25:56 +0000 (12:25 +0200)]
handle empty email config in IMAP backend

Change-Id: I0d533b6705c672c3b3af8c8e8c962c7eff8cd02e
Reviewed-on: http://gerrit.tine20.com/customers/1899
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes STARTTLS config options for LDAP
Philipp Schüle [Thu, 30 Apr 2015 18:12:43 +0000 (20:12 +0200)]
fixes STARTTLS config options for LDAP

Change-Id: I8e21b45a228e150f0d395e2d71551eb121ef3915
Reviewed-on: http://gerrit.tine20.com/customers/1900
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 ago0010954: Search for CustomField type "keyField" does not work
Philipp Schüle [Fri, 1 May 2015 10:57:27 +0000 (12:57 +0200)]
0010954: Search for CustomField type "keyField" does not work

* removes unfinished keyfield/record in/not in operators functionality

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

Change-Id: I40a184c988b1f0d46ae1e2fa5be1de5f4b456aa7
Reviewed-on: http://gerrit.tine20.com/customers/1902
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010998: LICENSE and PRIVACY were loaded as plugin
weberho [Thu, 30 Apr 2015 20:55:01 +0000 (22:55 +0200)]
0010998: LICENSE and PRIVACY were loaded as plugin

* adds check if directory entry is a directory

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

Change-Id: Ie8194f2602bb19f4c9782147f109be36c74baaaf
Reviewed-on: https://gerrit.tine20.org/tine20/3100
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010994: fix broken setup test Setup_JsonTest::testLoginWithWrongUsernameAndPassword
Philipp Schüle [Thu, 30 Apr 2015 08:09:54 +0000 (10:09 +0200)]
0010994: fix broken setup test Setup_JsonTest::testLoginWithWrongUsernameAndPassword

* deactivates test for the moment

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

Change-Id: I9904e016ca4369ad3e2b2162ea09e2f230530e01
Reviewed-on: https://gerrit.tine20.org/tine20/3090
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Thu, 30 Apr 2015 07:36:49 +0000 (09:36 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 30 Apr 2015 07:34:34 +0000 (09:34 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoset Sales_Model_ProductAggregate on ignore list
Philipp Schüle [Wed, 29 Apr 2015 13:17:28 +0000 (15:17 +0200)]
set Sales_Model_ProductAggregate on ignore list

... in relation/foreign record filter

we can't search for related product aggregates atm.

TODO: add filter model for product aggregates

Change-Id: Ibeeae806aa440388c98a1ac8bb0af5373835fa40
Reviewed-on: http://gerrit.tine20.com/customers/1894
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 agocatches access denied exception when updating contract data
Philipp Schüle [Wed, 29 Apr 2015 15:29:40 +0000 (17:29 +0200)]
catches access denied exception when updating contract data

Change-Id: I437ae026526db2c14c2aac3a70499ebe4b024139
Reviewed-on: http://gerrit.tine20.com/customers/1897
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.11-develop' into 2014.09
Philipp Schüle [Wed, 29 Apr 2015 15:38:15 +0000 (17:38 +0200)]
Merge branch '2014.11-develop' into 2014.09

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

6 years agoadds some logging to tineInit (init registry)
Philipp Schüle [Wed, 29 Apr 2015 14:55:54 +0000 (16:55 +0200)]
adds some logging to tineInit (init registry)

Change-Id: Ib14894c4fd230512e212c86fa3a34870750045df
Reviewed-on: http://gerrit.tine20.com/customers/1895
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoIE: removes message for failed closing of popups
Philipp Schüle [Wed, 29 Apr 2015 12:37:43 +0000 (14:37 +0200)]
IE: removes message for failed closing of popups

Change-Id: I1c2006535af214138929bd7988895748b93903f8
Reviewed-on: http://gerrit.tine20.com/customers/1892
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agorelation import improvements
Philipp Schüle [Wed, 29 Apr 2015 10:30:15 +0000 (12:30 +0200)]
relation import improvements

* fixes relations duplicate filter
* fixes replacements in import relation mapping

Change-Id: Ic6cca289a59a29ea68c8187114034d7f9631e813
Reviewed-on: http://gerrit.tine20.com/customers/1889
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010886: Allow modern DNS names for email validation
Michael Spahn [Tue, 28 Apr 2015 12:01:31 +0000 (14:01 +0200)]
0010886: Allow modern DNS names for email validation

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

Change-Id: Ic1fae2e507523f447d3abc2147ca376c6b325032
Reviewed-on: https://gerrit.tine20.org/tine20/3085
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoReset_demoData: truncate State table
sstamer [Tue, 28 Apr 2015 11:08:30 +0000 (13:08 +0200)]
Reset_demoData: truncate State table

Change-Id: Ia514c80c32ac2e022e1b71635365430e841ea6df
Reviewed-on: http://gerrit.tine20.com/customers/1888
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Wed, 29 Apr 2015 08:54:14 +0000 (10:54 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 29 Apr 2015 08:53:18 +0000 (10:53 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 29 Apr 2015 08:52:55 +0000 (10:52 +0200)]
Merge branch '2013.10' into 2014.11

6 years agoreset cache after Tinebase_Config tests
Philipp Schüle [Wed, 29 Apr 2015 06:52:40 +0000 (08:52 +0200)]
reset cache after Tinebase_Config tests

* Tinebase_Config_Abstract::clearCache() clears cached config file and
per request cache, too

Change-Id: I189db63b9e03b3d3ff7a58478897aa8ffc22c839
Reviewed-on: https://gerrit.tine20.org/tine20/3088
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agomake e-Mail links clickable
sstamer [Mon, 27 Apr 2015 10:56:54 +0000 (12:56 +0200)]
make e-Mail links clickable

Change-Id: If3be606628cb70958b9765bfcedadab9b4db9624
Reviewed-on: http://gerrit.tine20.com/customers/1886
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 agoreset cache function signature changed
Philipp Schüle [Tue, 28 Apr 2015 14:35:17 +0000 (16:35 +0200)]
reset cache function signature changed

Change-Id: I018c1a95bc7dacca0b49cdff3dad8ce11eb839a5
Reviewed-on: https://gerrit.tine20.org/tine20/3086
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Tue, 28 Apr 2015 13:59:03 +0000 (15:59 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Tue, 28 Apr 2015 13:58:11 +0000 (15:58 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoadd apc table cache
Lars Kneschke [Wed, 22 Apr 2015 11:40:03 +0000 (13:40 +0200)]
add apc table cache

Change-Id: I850a752373057bd1b6ad6fca5422f85aee5622da
Reviewed-on: https://gerrit.tine20.org/tine20/3080
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoimprove caching
Lars Kneschke [Sat, 25 Apr 2015 00:55:04 +0000 (02:55 +0200)]
improve caching

- improved in memory cache class
- added support to persist cache entires during requests
- update Tinebase_Container + _Application

Change-Id: Ic216df48bed556a6a9a0fa464b1083129cf3a036
Reviewed-on: https://gerrit.tine20.org/tine20/3079
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdate translation files
sstamer [Tue, 28 Apr 2015 08:47:28 +0000 (10:47 +0200)]
update translation files

Change-Id: Ie1672ff1260ca8acc850ddda4c57f97e2b746c48
Reviewed-on: https://gerrit.tine20.org/tine20/3083
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdate lang templates
sstamer [Tue, 28 Apr 2015 07:47:15 +0000 (09:47 +0200)]
update lang templates

Change-Id: I045a124529e0f21acc82d478bd52dba5f9603853
Reviewed-on: https://gerrit.tine20.org/tine20/3082
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago10988 load additional config from conf.d
Paul Mehrer [Wed, 15 Apr 2015 14:36:14 +0000 (16:36 +0200)]
10988 load additional config from conf.d

* adds functionality to optionally load addtional configuration from a conf.d folder,
 cache the resulting composed configuration in a file with a TTL
 * conf.d folder has to be defined in config.inc.php like this:
  'confdfolder' => '/etc/tine20/conf.d',
 * adds caching for app defaults config
 * adds a test. you need to set a config like this in your config.inc.php to make it work:
  'confdfolder' => '../tests/tine20/Tinebase/files/conf.d',

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

Change-Id: I44f745230e6debea68f0d3c3d275a0c9eee66f51
Reviewed-on: http://gerrit.tine20.com/customers/1833
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago10876: Update translation files (pull)
sstamer [Tue, 28 Apr 2015 07:30:34 +0000 (09:30 +0200)]
10876: Update translation files (pull)

Change-Id: I2235669e1bfdf90c4f0ed8fec9ea3bf054b4c8b7
Reviewed-on: https://gerrit.tine20.org/tine20/3081
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11-develop' into 2014.09
Philipp Schüle [Mon, 27 Apr 2015 11:08:17 +0000 (13:08 +0200)]
Merge branch '2014.11-develop' into 2014.09

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

Change-Id: If03b84f0441adbb7821f0ed10dfc1f416d11993b

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Mon, 27 Apr 2015 11:04:42 +0000 (13:04 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Tinebase/Container.php

Change-Id: I0c0095f11f1d81dddb9d10b1606ca80d7ad61d0f

6 years agoDon't use static container id for demoData
sstamer [Mon, 27 Apr 2015 08:52:28 +0000 (10:52 +0200)]
Don't use static container id for demoData

Change-Id: Ibb2b5f1803bd25c0e3ecff1a5844dd1c4db6d200
Reviewed-on: http://gerrit.tine20.com/customers/1882
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agomakes leadstate/source/type conversion during import case insensitive
Philipp Schüle [Mon, 27 Apr 2015 08:09:12 +0000 (10:09 +0200)]
makes leadstate/source/type conversion during import case insensitive

Change-Id: Iacb147d8b8b41d0253e619e05263325bc0072a88
Reviewed-on: http://gerrit.tine20.com/customers/1881
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoallows relations as duplicate check fields
Philipp Schüle [Mon, 27 Apr 2015 07:56:49 +0000 (09:56 +0200)]
allows relations as duplicate check fields

* use CUSTOMER relation in CRM for dup check

Change-Id: Ie0f12267d0975a2dd49adcdd08b387aed9558cb2
Reviewed-on: http://gerrit.tine20.com/customers/1879
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago10752: Remove every active sync device with android 4
Michael Spahn [Mon, 27 Apr 2015 09:26:53 +0000 (11:26 +0200)]
10752: Remove every active sync device with android 4

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

Change-Id: I3aa0200c1b78a774d793ae54056877375caba98e
Reviewed-on: http://gerrit.tine20.com/customers/1883
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago10980: Add DavDroid as supported client for carddav
Michael Spahn [Sat, 25 Apr 2015 14:26:09 +0000 (16:26 +0200)]
10980: Add DavDroid as supported client for carddav

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

Change-Id: I261e8bf9f12e21f115461118c8b428bc9134255c
Reviewed-on: https://gerrit.tine20.org/tine20/3076
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010936: Filemanager Edit Dialog is broken
Michael Spahn [Mon, 27 Apr 2015 09:20:58 +0000 (11:20 +0200)]
0010936: Filemanager Edit Dialog is broken

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

Change-Id: I4cf8d2599b54519fc865885d7af8566d1a566118
Reviewed-on: https://gerrit.tine20.org/tine20/3077
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoimproves deletion of related objects and container contents
Philipp Schüle [Mon, 27 Apr 2015 07:51:18 +0000 (09:51 +0200)]
improves deletion of related objects and container contents

 * adds setter for related objects to delete
 * moves deletion of linked relations to separate fn
 * adds model to test container (TestCase)
 * adds is_deleted filter for Contacts and Leads
 * some more logging

Change-Id: I5a7063d9f2072f812144ca0e167af7af4c31d2a2
Reviewed-on: http://gerrit.tine20.com/customers/1878
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoallows to define composite field values via import definition
Philipp Schüle [Mon, 27 Apr 2015 07:48:23 +0000 (09:48 +0200)]
allows to define composite field values via import definition

 ... for example  lead name in CRM

Change-Id: I5ab7b942975af24c0f79042b69349a201a68caed
Reviewed-on: http://gerrit.tine20.com/customers/1877
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoFix some wording problems
sstamer [Fri, 24 Apr 2015 13:58:45 +0000 (15:58 +0200)]
Fix some wording problems

- Lead name
- remove lead id

Change-Id: I48e042581b9f07b51ebdbd598aed62f8932cda30
Reviewed-on: http://gerrit.tine20.com/customers/1874
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoYou should be able to delete container + content with ignore acl
sstamer [Tue, 21 Apr 2015 13:22:59 +0000 (15:22 +0200)]
You should be able to delete container + content with ignore acl

Change-Id: I42c6c8bcf762561dcd25fe073c29dcaa09d14f2f
Reviewed-on: http://gerrit.tine20.com/customers/1859
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoremoves redundant export split button in PurchaseInvoice grid panel
sstamer [Fri, 24 Apr 2015 08:54:48 +0000 (10:54 +0200)]
removes redundant export split button in PurchaseInvoice grid panel

Change-Id: I74ae3cd94ebf0ec82bbff26839d837c99093fe57
Reviewed-on: http://gerrit.tine20.com/customers/1871
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010490 - Create graphical input for theme
Flávio Gomes da Silva Lisboa [Thu, 27 Nov 2014 13:23:45 +0000 (11:23 -0200)]
0010490 - Create graphical input for theme

 - Configuration Manager shows group for theme
 - Structure of configuration changes to:
   'theme' => array(
        'active' => [TRUE|FALSE],
        'path' => [theme folder name],
        'useBlueAsBase' => [TRUE|FALSE]
   )

Change-Id: Ie12edb6f9e93dd04b3d1704e52870b4fd0f3f9c5
Reviewed-on: https://gerrit.tine20.org/tine20/3072
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Reviewed-by: Flávio Gomes da Silva Lisboa <flavio.lisboa@serpro.gov.br>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agomanufacturer is missing in product model
sstamer [Wed, 22 Apr 2015 13:21:10 +0000 (15:21 +0200)]
manufacturer is missing in product model

Change-Id: I7396b3fc0f5838907b4ff5f3f5a9873c6779821a
Reviewed-on: http://gerrit.tine20.com/customers/1865
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupload of invoices via WebDAV
Lars Kneschke [Mon, 13 Apr 2015 05:37:22 +0000 (07:37 +0200)]
upload of invoices via WebDAV

* create new invoice from uploaded file

Change-Id: I35642cde992615cfc249ecd1b0abdf80b6af0269
Reviewed-on: http://gerrit.tine20.com/customers/1819
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 agoExport translations Sales
sstamer [Tue, 14 Apr 2015 14:09:25 +0000 (16:09 +0200)]
Export translations Sales

Change-Id: Ic18e7b9988675f1056b7a2a64372a4aac2a86e44
Reviewed-on: http://gerrit.tine20.com/customers/1828
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 2014.09
Philipp Schüle [Wed, 22 Apr 2015 10:29:46 +0000 (12:29 +0200)]
Merge branch '2014.11-develop' into 2014.09

6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 22 Apr 2015 08:59:43 +0000 (10:59 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Addressbook/Convert/Contact/VCard/Abstract.php

Change-Id: Iae6e255084586a2b0f9dd0646ea7940b0fb63140

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 22 Apr 2015 08:57:57 +0000 (10:57 +0200)]
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/index.php

Change-Id: I3edc2388d93d5fd60adb9206c0fc8b34fe93d7da