tine20
5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Wed, 18 Nov 2015 12:36:46 +0000 (13:36 +0100)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/Core.php
tine20/composer.lock

Change-Id: Ife9bc84cac193b8e09c487f75f64861867d65cdb

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 18 Nov 2015 12:30:39 +0000 (13:30 +0100)]
Merge branch '2013.10' into 2014.11

5 years ago0011192: LDAP sync should delete contacts
Philipp Schüle [Mon, 31 Aug 2015 13:59:49 +0000 (15:59 +0200)]
0011192: LDAP sync should delete contacts

* expires the users before deleting them
* users need to be expired for some time (1 year) before they are deleted
* removes user contact, too

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

Change-Id: I4b0060de105613b81d2650fd1bd3d18c3cfc5d61
Reviewed-on: http://gerrit.tine20.com/customers/2149
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0003526: generic application settings dialog for saving config
Cornelius Weiß [Fri, 30 Oct 2015 15:25:44 +0000 (16:25 +0100)]
0003526: generic application settings dialog for saving config

* moves KeyFieldGridPanel to Tinebase
* cleanup old config concepts
* add admin config UI
* move keyFieldConfig default from db to code

@TODO
* support config type 'record'
* convert CRM, Admin & Tinebase config
* convert HR & Sales config
* convert SimpleFAQ

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

Change-Id: I7a149ad18c4ac3f11238b6bdba95ba36b080e7ff
Reviewed-on: http://gerrit.tine20.com/customers/2372
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoShow price in invoice and purchaseInvoice detailsPanel
sstamer [Fri, 13 Nov 2015 12:13:37 +0000 (13:13 +0100)]
Show price in invoice and purchaseInvoice detailsPanel

Change-Id: I2205e783130da237c81fa60d53bf56d5adc7f2a8
Reviewed-on: http://gerrit.tine20.com/customers/2375
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoSupplier should not require street
sstamer [Mon, 16 Nov 2015 15:00:07 +0000 (16:00 +0100)]
Supplier should not require street

Change-Id: I1333253c85b48724f2a6b1e8f461b15f2486ed94
Reviewed-on: http://gerrit.tine20.com/customers/2378
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0003746: add maintenance mode
Cornelius Weiß [Fri, 11 Sep 2015 08:31:12 +0000 (10:31 +0200)]
0003746: add maintenance mode

* new config option maintenanceMode
* new right maintenance
* deny logins in maintenance mode if user has no maintenance right
* invalidate session when maintenance mode got enabled
* updates syncroton/syncroton to 1.1.2 (needed for ActiveSync session invalidation)

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

Change-Id: Ib13b6fad738a70257f205e21465639cb88d3fd8d
Reviewed-on: http://gerrit.tine20.com/customers/2209
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodo not try to remove non-existant attender
Philipp Schüle [Mon, 16 Nov 2015 09:15:10 +0000 (10:15 +0100)]
do not try to remove non-existant attender

Change-Id: I0087b6a5eae9326dcf993e770b6af18a5feabd1a
Reviewed-on: http://gerrit.tine20.com/customers/2376
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010249: Tinebase.purgeDeletedRecords fails
Philipp Schüle [Thu, 12 Nov 2015 16:29:07 +0000 (17:29 +0100)]
0010249: Tinebase.purgeDeletedRecords fails

* improves purging by sorting the tables
* and adds some ondelete-cascade triggers to indices
 to make sure child rows (for example tags acl) are removed
* adds update script
* fixes index declarations for single index fields

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

Change-Id: I3fdaf51f93cb4254a281d1a0bf4ce5bc94514362
Reviewed-on: http://gerrit.tine20.com/customers/2374
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 Nov 2015 13:55:14 +0000 (14:55 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agocatch Index own_id already exists
sstamer [Wed, 11 Nov 2015 13:51:03 +0000 (14:51 +0100)]
catch Index own_id already exists

Change-Id: If9c1b451769d7001417a331c858cb5770c622253
Reviewed-on: http://gerrit.tine20.com/customers/2370
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, 11 Nov 2015 11:46:38 +0000 (12:46 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Wed, 11 Nov 2015 11:46:09 +0000 (12:46 +0100)]
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Controller/EventTests.php

Change-Id: Iad910afef11128ece3020edbc33173b449ba5be7

5 years agoMW Sales - added json attributes and callback
Paul Mehrer [Tue, 27 Oct 2015 15:09:28 +0000 (16:09 +0100)]
MW Sales - added json attributes and callback

added json attributes to Sales_Model_ProductAggregate
added callback to Sales_Controller_Contract to notify listeners
when all creation or updating of all sub records is done
added Tinebase_Model_Converter that convert fields from
data to objects to data

Change-Id: I26a353cedfe8244872073415a1695ec8b62e5be7
Reviewed-on: http://gerrit.tine20.com/customers/2321
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011414: block editing of timesheets of closed Timeaccount
sstamer [Wed, 28 Oct 2015 12:53:38 +0000 (13:53 +0100)]
0011414: block editing of timesheets of closed Timeaccount

Use check_grants to block editing of timesheets of closed
Timeaccount

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

Change-Id: I73054bdc7d8f12041d7f0a095717f2097582fa72
Reviewed-on: http://gerrit.tine20.com/customers/2324
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodon't try to resize whole day area if we don't have one
Philipp Schüle [Tue, 10 Nov 2015 14:44:01 +0000 (15:44 +0100)]
don't try to resize whole day area if we don't have one

... as it is the case in month view

Change-Id: Ida29cd04d74a55bf0691def63b747c41139f634c
Reviewed-on: http://gerrit.tine20.com/customers/2366
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011404: fix failing testAdoptAlarmTimeOfYearlyEvent
Philipp Schüle [Wed, 28 Oct 2015 07:12:57 +0000 (08:12 +0100)]
0011404: fix failing testAdoptAlarmTimeOfYearlyEvent

* allow daylight saving change to happen before or after test data
* removes some unused variables

Change-Id: I5e599c47580b7d32010febc083b00c9643f2da55

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Tue, 10 Nov 2015 08:29:23 +0000 (09:29 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Tue, 10 Nov 2015 08:28:45 +0000 (09:28 +0100)]
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Controller/EventTests.php

Change-Id: Ia7eadfa1043d69d1fb65f5c3d160741af26eedd2

5 years ago0011404: fix failing testAdoptAlarmTimeOfYearlyEvent
Philipp Schüle [Mon, 26 Oct 2015 10:40:01 +0000 (11:40 +0100)]
0011404: fix failing testAdoptAlarmTimeOfYearlyEvent

... skip second part of the test if current date is between
October 24th and 27th

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

Change-Id: I49c040e4af5269ebbf058192eb4bb280fdd105ad
Reviewed-on: http://gerrit.tine20.com/customers/2314
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoorder applications when fetching enabled apps
Philipp Schüle [Fri, 6 Nov 2015 13:12:54 +0000 (14:12 +0100)]
order applications when fetching enabled apps

* this is important for the include order of css/js files

Change-Id: I22816253277500e560e0fc37926d4948d3a59450
Reviewed-on: http://gerrit.tine20.com/customers/2361
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 agoallows better re-usage of cal event grid view and edit dialog
Philipp Schüle [Fri, 6 Nov 2015 12:22:12 +0000 (13:22 +0100)]
allows better re-usage of cal event grid view and edit dialog

* and fixes a minor problem in isRecurInstance (id no longer needs to be a String)

Change-Id: Ida4687e218365ee4890319f3c050d6a3d8d22c5a
Reviewed-on: http://gerrit.tine20.com/customers/2360
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds bbar grid panel and improve local mode behavior
Philipp Schüle [Fri, 6 Nov 2015 12:19:48 +0000 (13:19 +0100)]
adds bbar grid panel and improve local mode behavior

* improves new record handling for "local mode" grids
* use bbar actions für add/edit/delete
* extends bbar.gridPanel in Sales/Customers
* adds gridpanel config disableDeleteConfirmation
* adds helper function setFromJson to read a record from json string
* adds helper function setId to set record (data.)ids

Change-Id: I5e7d2ad42a4b5d6e5fd7e83420c39ea6ab92aabe
Reviewed-on: http://gerrit.tine20.com/customers/2359
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 [Thu, 5 Nov 2015 10:14:02 +0000 (11:14 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agoincreases timeout for updateFolderCache
Philipp Schüle [Wed, 28 Oct 2015 14:55:34 +0000 (15:55 +0100)]
increases timeout for updateFolderCache

... and adds exception handling to  ajax failure method

Change-Id: I25af53dadd830aae3127d474aa79704520afeab4
Reviewed-on: http://gerrit.tine20.com/customers/2326
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoignore acl when creating system container
Philipp Schüle [Thu, 29 Oct 2015 09:40:28 +0000 (10:40 +0100)]
ignore acl when creating system container

Change-Id: Ib4dde1a9967424cdcfb39b4ae29df6971b25c56c
Reviewed-on: http://gerrit.tine20.com/customers/2327
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoFix Application uninstall
sstamer [Thu, 29 Oct 2015 10:04:58 +0000 (11:04 +0100)]
Fix Application uninstall

see 0011410: remove relations + modlog if app is uninstalled

Change-Id: Icb0d352ba33c652395801a820da4f8643524fcd4
Reviewed-on: http://gerrit.tine20.com/customers/2329
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011376: send mail on lead import to responsibles
Philipp Schüle [Wed, 28 Oct 2015 13:04:30 +0000 (14:04 +0100)]
0011376: send mail on lead import to responsibles

* only run test with valid smtp config
* fixes param for notification sending: recipients needs to
 be an array!

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

Change-Id: I348f141f2633d8df999c974ff4d556f5506a768d
Reviewed-on: http://gerrit.tine20.com/customers/2325
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds color property to keyfields
Philipp Schüle [Thu, 29 Oct 2015 10:48:27 +0000 (11:48 +0100)]
adds color property to keyfields

... and fixes a typo in config translation string in calendar

Change-Id: I4b9e0177c2dd255fdf974b5387ab2e6939e7cdaa
Reviewed-on: http://gerrit.tine20.com/customers/2330
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, 28 Oct 2015 15:44:47 +0000 (16:44 +0100)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/Relations.php

Change-Id: I0bb38a15f644459b0b56953a090af6c1adc4f1ba

5 years ago0011406: completely remove flash from extjs
Philipp Schüle [Fri, 23 Oct 2015 10:15:12 +0000 (12:15 +0200)]
0011406: completely remove flash from extjs

* removes swfobject

... from ext-all-debug.js + ext-all.js

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

Change-Id: I6bc17cfeb1f3c2f65fb061f40780ac0191c10688
Reviewed-on: http://gerrit.tine20.com/customers/2308
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011410: remove relations + modlog if app is uninstalled
Paul Mehrer [Thu, 22 Oct 2015 12:48:00 +0000 (14:48 +0200)]
0011410: remove relations + modlog if app is uninstalled

added Tinebase_Relations::removeAppliction
added Tinebase_Timemachine_ModificationLog::removeApplication

used both methods in Setup_Controller::_uninstallApplication

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

Change-Id: Ie6f9644173b83925b8800c2781adb5f908ae37f8
Reviewed-on: http://gerrit.tine20.com/customers/2304
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, 28 Oct 2015 08:54:19 +0000 (09:54 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years agofixes Crm_Import_CsvTest::testEmailNotification
Philipp Schüle [Wed, 28 Oct 2015 07:01:14 +0000 (08:01 +0100)]
fixes Crm_Import_CsvTest::testEmailNotification

.... as we expect 2 or more mails

Change-Id: Id10c7bbda46100cf9ca3a4f96a5e8ce27c34d3f1
Reviewed-on: http://gerrit.tine20.com/customers/2322
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011404: fix failing testAdoptAlarmTimeOfYearlyEvent
Philipp Schüle [Wed, 28 Oct 2015 07:12:57 +0000 (08:12 +0100)]
0011404: fix failing testAdoptAlarmTimeOfYearlyEvent

* allow daylight saving change to happen before or after test data
* removes some unused variables

Change-Id: I5e599c47580b7d32010febc083b00c9643f2da55

5 years agoremoves obsolete code from event default data fn
Philipp Schüle [Mon, 26 Oct 2015 16:33:41 +0000 (17:33 +0100)]
removes obsolete code from event default data fn

Change-Id: Idff3f4d2ed97d0d11674c7edcd5c8c25cf93107e
Reviewed-on: http://gerrit.tine20.com/customers/2317
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011402: Update8.4 fails on MySQL < 5.5
Philipp Schüle [Fri, 23 Oct 2015 17:43:26 +0000 (19:43 +0200)]
0011402: Update8.4 fails on MySQL < 5.5

catch exception when trying to check innodb version
- variable might not exist.

... see https://www.tine20.org/forum/viewtopic.php?f=12&t=17678
and 0009448: add index account_id + folder_id + messageuid to
messages table

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

Change-Id: I309b03446fa82d443cf082c0b5e0fba97b0c35c6
Reviewed-on: http://gerrit.tine20.com/customers/2313
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 [Mon, 26 Oct 2015 11:26:21 +0000 (12:26 +0100)]
Merge branch '2014.11' into 2014.11-develop

5 years ago0011404: fix failing testAdoptAlarmTimeOfYearlyEvent
Philipp Schüle [Mon, 26 Oct 2015 10:40:01 +0000 (11:40 +0100)]
0011404: fix failing testAdoptAlarmTimeOfYearlyEvent

... skip second part of the test if current date is between
October 24th and 27th

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

Change-Id: I49c040e4af5269ebbf058192eb4bb280fdd105ad
Reviewed-on: http://gerrit.tine20.com/customers/2314
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011370: repair function for persistent filters without grants
Philipp Schüle [Thu, 22 Oct 2015 15:09:56 +0000 (17:09 +0200)]
0011370: repair function for persistent filters without grants

* introduce ignoreAcl to find filters without grants

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

Change-Id: Icf8d72c05b675447292d341a21a306316fc14ef4
Reviewed-on: http://gerrit.tine20.com/customers/2306
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 [Thu, 22 Oct 2015 09:42:23 +0000 (11:42 +0200)]
Merge branch '2014.11' into 2014.11-develop

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

Change-Id: Ifd975cf8639acc56480cba89372c9079302dbabb

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Thu, 22 Oct 2015 09:39:07 +0000 (11:39 +0200)]
Merge branch '2013.10' into 2014.11

5 years agoes logging of updateFolderCache
Paul Mehrer [Wed, 21 Oct 2015 10:27:08 +0000 (12:27 +0200)]
es logging of updateFolderCache

Change-Id: Idd3744857d32e9fbd46e6ffb6dc9743fa523d214
Reviewed-on: http://gerrit.tine20.com/customers/2298
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011376: send mail on lead import to responsibles
Philipp Schüle [Tue, 29 Sep 2015 08:14:25 +0000 (10:14 +0200)]
0011376: send mail on lead import to responsibles

... to responsible people

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

Change-Id: Ic28b33d5990e68de9b55373a0179ea2179e23dcd
Reviewed-on: http://gerrit.tine20.com/customers/2230
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011362: mime-type lost after detail update
Cornelius Weiß [Thu, 8 Oct 2015 17:59:49 +0000 (19:59 +0200)]
0011362: mime-type lost after detail update

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

Change-Id: Iaf32609c4130c81dc6ce4d921e72fa6b171da163
Reviewed-on: http://gerrit.tine20.com/customers/2264
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011398: add own_id index to relations table
Paul Mehrer [Wed, 21 Oct 2015 15:40:53 +0000 (17:40 +0200)]
0011398: add own_id index to relations table

added index to relations table to optimize
Tinebase_Relations::_validateConstraintsConfig

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

Change-Id: If4c73e683199920087187a67d3dbb0c88bd211af
Reviewed-on: http://gerrit.tine20.com/customers/2302
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011388: prune tine20 history
Paul Mehrer [Wed, 21 Oct 2015 16:23:00 +0000 (18:23 +0200)]
0011388: prune tine20 history

added case that $app maybe instance of Tinebase_Container

Change-Id: I637d6a9e4c8d56a329aa3abeb20fe29d886ddd36
Reviewed-on: http://gerrit.tine20.com/customers/2303
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, 21 Oct 2015 12:33:23 +0000 (14:33 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years ago0011342: ics-scheduled import only imports 1 remote calendar
Philipp Schüle [Tue, 20 Oct 2015 11:47:44 +0000 (13:47 +0200)]
0011342: ics-scheduled import only imports 1 remote calendar

* fixes filter to find next scheduled import
* improves tests

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

Change-Id: Ie2436958cc00027f726bb11b3fdfac7dc6c466ca
Reviewed-on: http://gerrit.tine20.com/customers/2295
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0009448: add index account_id + folder_id + messageuid to messages table
Paul Mehrer [Mon, 12 Oct 2015 10:42:10 +0000 (12:42 +0200)]
0009448: add index account_id + folder_id + messageuid to messages table

FelamiMail - added index account_id-folder_id to felamimail_cache_message

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

Change-Id: Ie4afbd5ed969eaf21f90ae0a85dbbd32aa2656fc
Reviewed-on: http://gerrit.tine20.com/customers/2268
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011382: attachments in templates converted to rfc-822 attachment
Philipp Schüle [Sat, 15 Mar 2014 15:58:13 +0000 (16:58 +0100)]
0011382: attachments in templates converted to rfc-822 attachment

* we now no longer create rfc822 attachments when sending drafts/templates with attachments
* improves attachment handling in message edit dialog and Send controller
* Nico Hessler<tine20@nico-hessler.de> has helped with the javascript part of this change
 (see https://gerrit.tine20.org/tine20/#/c/2811)

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

also resolves:
0008784: attachments in forwarded messages (avoid .eml)
which allows to set a user preference, if forwarded mails should be converted to rfc822 attachment
(defaults to true - we should think about switching this to false)
0010387: Attachments in draft converted to rfc-822 attachment
(same as templates)
0008612: gmail can't open attachments of forwarded mails
(no rfc822 any more)

Change-Id: If78d456d93cd03312c1a0f691595b485faeb6aad
Reviewed-on: http://gerrit.tine20.com/customers/2288
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 ago0011364: count anonymous downloads (via link)
Cornelius Weiß [Fri, 9 Oct 2015 10:25:57 +0000 (12:25 +0200)]
0011364: count anonymous downloads (via link)

Change-Id: I608ecdfade91ca156ab704413ac24868f47ebb7a
Reviewed-on: http://gerrit.tine20.com/customers/2266
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoupdates example application tests
Philipp Schüle [Mon, 19 Oct 2015 13:47:01 +0000 (15:47 +0200)]
updates example application tests

* use generic TestCase
* some minor fixes

Change-Id: Iac8b7d95242ce11279a69ef72d74d63f735735de
Reviewed-on: http://gerrit.tine20.com/customers/2292
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agouses generic getDefaultContainer and adds createDefaultContainer fn
Philipp Schüle [Tue, 13 Oct 2015 11:22:19 +0000 (13:22 +0200)]
uses generic getDefaultContainer and adds createDefaultContainer fn

* updates ExampleApp and Inventory controllers
* call App_Controller::createPersonalFolder as fallback

Change-Id: Iab060f89450bfaa2b8fa19d5899ca20eef807aab
Reviewed-on: http://gerrit.tine20.com/customers/2273
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011388: prune tine20 history
Paul Mehrer [Wed, 14 Oct 2015 14:37:42 +0000 (16:37 +0200)]
0011388: prune tine20 history

added cli Tinebase::cleanModlog
modified cli Tinebase::purgeDeletedRecords
to also do cleanRelations and cleanModLog

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

Change-Id: I7b34af077aff8899b4272702910d51021bb50a1d
Reviewed-on: http://gerrit.tine20.com/customers/2278
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoavoid concurrency conflicts when merging records
Philipp Schüle [Mon, 19 Oct 2015 10:12:55 +0000 (12:12 +0200)]
avoid concurrency conflicts when merging records

... by setting the current seq of the updated record

Change-Id: Ib21a33b56219785f79f3f1611f8a8e224f90eb06
Reviewed-on: http://gerrit.tine20.com/customers/2290
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agomoveRecordsToContainer might be a long running request
Philipp Schüle [Mon, 19 Oct 2015 13:26:43 +0000 (15:26 +0200)]
moveRecordsToContainer might be a long running request

... so we close the session here and set unlimited exec time

Change-Id: I4058ba2a7cdb314bca49fdf0ce41cd4cd5a5048d
Reviewed-on: http://gerrit.tine20.com/customers/2291
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoincrease timeout for update folder cache to 5 mins
Philipp Schüle [Wed, 21 Oct 2015 09:45:34 +0000 (11:45 +0200)]
increase timeout for update folder cache to 5 mins

Change-Id: I37f21a2fb2434dea8deb13436c76cf35dd2dfa96
Reviewed-on: http://gerrit.tine20.com/customers/2296
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011360: use php session.save_handler ini setting if available
Philipp Schüle [Thu, 8 Oct 2015 15:28:47 +0000 (17:28 +0200)]
0011360: use php session.save_handler ini setting if available

* and fixes baseUri handling by setting fallback first

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

Change-Id: If5abc886a875146d8f9309d1e496742414113cb1
Reviewed-on: http://gerrit.tine20.com/customers/2263
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, 19 Oct 2015 12:53:37 +0000 (14:53 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/Frontend/Cli/Abstract.php

Change-Id: I5a5a1cc3d42b77e43536802e0956c454e7ef6355

5 years agosetupChecks might not be an object
Philipp Schüle [Fri, 16 Oct 2015 17:22:16 +0000 (19:22 +0200)]
setupChecks might not be an object

Change-Id: I257f7c91b791104ce69767aa9094e37bc9c0ab1e
Reviewed-on: http://gerrit.tine20.com/customers/2287
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011370: repair function for persistent filters (favorites) without grants
Philipp Schüle [Mon, 12 Oct 2015 16:29:52 +0000 (18:29 +0200)]
0011370: repair function for persistent filters (favorites) without grants

* checks all filters - add default grants for filters without grants
* adds a fix for getGrantsForRecords
* fixes an invalid continue() statement

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

Change-Id: I007d229d1032982b502a43e65fccf23377f0b5d4
Reviewed-on: http://gerrit.tine20.com/customers/2271
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011356: cleanup script for relations of removed records
Paul Mehrer [Mon, 12 Oct 2015 11:13:34 +0000 (13:13 +0200)]
0011356: cleanup script for relations of removed records

adding more verbosity

Change-Id: I7c6ffd32f3b08ef1fb5c4fdbabce40ad661e308b
Reviewed-on: http://gerrit.tine20.com/customers/2269
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, 14 Oct 2015 10:27:27 +0000 (12:27 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years agocatches client registry exceptions
Philipp Schüle [Mon, 12 Oct 2015 15:24:53 +0000 (17:24 +0200)]
catches client registry exceptions

* and adds some code improvements / comments

Change-Id: Iaf1f0da26cfd8137ded1fda2a58a9641e20b4bdc
Reviewed-on: http://gerrit.tine20.com/customers/2270
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadd resources in demo data
Cornelius Weiß [Thu, 8 Oct 2015 16:45:31 +0000 (18:45 +0200)]
add resources in demo data

... and remove requirement of HR in CRM and Timetracker demo data

Change-Id: Id0a07b9bbbb8be98ef1913cc7fdb16c05f35bae5
Reviewed-on: http://gerrit.tine20.com/customers/2265
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodeny create/delete for unknown CalDAV clients
Cornelius Weiß [Fri, 2 Oct 2015 08:39:13 +0000 (10:39 +0200)]
deny create/delete for unknown CalDAV clients

Change-Id: I6e377f54bf370c75e5eb88711f28f5014e59fd52
NOTE: before, we only denied updates which is irritation for the users
Reviewed-on: http://gerrit.tine20.com/customers/2244
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011338: First Configuration fails after Installation
Philipp Schüle [Fri, 9 Oct 2015 15:54:06 +0000 (17:54 +0200)]
0011338: First Configuration fails after Installation

* during setup we try to fetch translations and other stuff
   from the config. this fails if no tables exist yet.

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

Change-Id: I54fd7423d7be89f4706b0813793d2a0e5d267650
Reviewed-on: http://gerrit.tine20.com/customers/2267
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoshows a warning if application of billable is not found
Philipp Schüle [Wed, 7 Oct 2015 11:25:01 +0000 (13:25 +0200)]
shows a warning if application of billable is not found

... instead of running into an error

Change-Id: I94ede953033fa72e96ed6794a54b7e4d1de1cb38
Reviewed-on: http://gerrit.tine20.com/customers/2259
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, 7 Oct 2015 10:19:36 +0000 (12:19 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years ago0011356: cleanup script for relations of removed records
Paul Mehrer [Wed, 16 Sep 2015 09:51:05 +0000 (11:51 +0200)]
0011356: cleanup script for relations of removed records

it seems in the past relations may not have been set
to deleted properly.

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

Change-Id: I84db72c24e3d3e309a7e09467ce0746a2ecb286e
Reviewed-on: http://gerrit.tine20.com/customers/2231
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011354: keep both records if duplicates are within current import file
Philipp Schüle [Tue, 6 Oct 2015 09:32:38 +0000 (11:32 +0200)]
0011354: keep both records if duplicates are within current import file

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

Change-Id: I85fe6ade7aaea6946bc2316983355272c99ecafe
Reviewed-on: http://gerrit.tine20.com/customers/2253
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes tags merging by removing duplicates
Philipp Schüle [Tue, 6 Oct 2015 18:23:09 +0000 (20:23 +0200)]
fixes tags merging by removing duplicates

... in js duplicate resolve panel

Change-Id: I6b20c4ba78cdecec8babf5e81e493669ff8427c8
Reviewed-on: http://gerrit.tine20.com/customers/2256
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 agosnom frontend: limit call id to 40 chars
Philipp Schüle [Tue, 6 Oct 2015 15:23:46 +0000 (17:23 +0200)]
snom frontend: limit call id to 40 chars

... we should think about introducing a separate call id property

then we could use the normal Tine 2.0 id field (40 char uuid)

Change-Id: Ic2cb945b59f93335ac782fff6fbf44ad76eb1304
Reviewed-on: http://gerrit.tine20.com/customers/2255
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 agoadds additional logging for credential cache failures
Philipp Schüle [Mon, 5 Oct 2015 11:50:55 +0000 (13:50 +0200)]
adds additional logging for credential cache failures

... to CC cookie adapter

Change-Id: I0ad600d75ec4fdb6c8b64e4d110f5a88efe1c700
Reviewed-on: http://gerrit.tine20.com/customers/2250
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoSales Controller Invoice: changed TRACE print_r to count
Paul Mehrer [Mon, 5 Oct 2015 11:44:33 +0000 (13:44 +0200)]
Sales Controller Invoice: changed TRACE print_r to count

Change-Id: Ib49cd973cdcc02fc94c8a6fe645af49a4116f7dd
Reviewed-on: http://gerrit.tine20.com/customers/2249
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
5 years agoSales Backend Invoice: fixed missing is_deleted check
Paul Mehrer [Sun, 4 Oct 2015 12:05:43 +0000 (14:05 +0200)]
Sales Backend Invoice: fixed missing is_deleted check

also optimized memory consumption by removing redundant clones

Change-Id: I1c693e599a81819b72af004e6f18fd1fae3257ac
Reviewed-on: http://gerrit.tine20.com/customers/2248
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agocheck for empty cronuser id in async events test
Philipp Schüle [Mon, 14 Sep 2015 15:48:44 +0000 (17:48 +0200)]
check for empty cronuser id in async events test

Change-Id: I3d2830fc8ff2dce5f2273d6912f0dda3c13094de
Reviewed-on: http://gerrit.tine20.com/customers/2200
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agorelease db lock after asyncJob test
Philipp Schüle [Tue, 29 Sep 2015 16:29:51 +0000 (18:29 +0200)]
release db lock after asyncJob test

* and adds generic db lock cleanup handling to TestCase

Change-Id: I61bafc45cc163fcebce8f763d90d82db03a7cfd3
Reviewed-on: http://gerrit.tine20.com/customers/2233
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011348: multiple destinations in csv import mapping
Philipp Schüle [Mon, 28 Sep 2015 14:43:55 +0000 (16:43 +0200)]
0011348: multiple destinations in csv import mapping

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

Change-Id: Ib367da92ce86c1cb375600e1038153110cb7ab5e
Reviewed-on: http://gerrit.tine20.com/customers/2225
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, 29 Sep 2015 13:19:34 +0000 (15:19 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tests/tine20/Addressbook/JsonTest.php
tine20/Addressbook/Model/Contact.php
tine20/Tinebase/User.php

Change-Id: Ie7ccd9df63c3fd15020149f9b60cfbb94a30de3e

5 years agofixes customer billing address & contract handling for manual invoices
Philipp Schüle [Mon, 28 Sep 2015 18:34:47 +0000 (20:34 +0200)]
fixes customer billing address & contract handling for manual invoices

and prevents "undefined index" for manual invoices, too

Change-Id: I8d1a825c8f26db6b13c525bec4f6c951a035fb82
Reviewed-on: http://gerrit.tine20.com/customers/2229
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 agothrow exception if relation is missing related_model
Philipp Schüle [Mon, 28 Sep 2015 14:49:38 +0000 (16:49 +0200)]
throw exception if relation is missing related_model

Change-Id: I3586d714e3965285736a705ac8ce7a7ea426833e
Reviewed-on: http://gerrit.tine20.com/customers/2227
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0009852: improve cache cleaning after LDAP sync
Philipp Schüle [Wed, 5 Aug 2015 14:07:49 +0000 (16:07 +0200)]
0009852: improve cache cleaning after LDAP sync

* adds a test
* removes cache cleaning after sync as this should work automatically
* improves logging
* reactivates group ldap tests

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

Change-Id: I72c651e7f8644601ba68e592fa932e42143adab4
Reviewed-on: http://gerrit.tine20.com/customers/2091
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011286: allow contacts without org/family name
Cornelius Weiß [Tue, 1 Sep 2015 07:06:33 +0000 (09:06 +0200)]
0011286: allow contacts without org/family name

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

Change-Id: I14088d435298e0c30cf1cdbdb6088f8851e96faa
Reviewed-on: http://gerrit.tine20.com/customers/2223
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoDon't use DuplicateCheck for purchaseInvoice Import
sstamer [Mon, 28 Sep 2015 14:20:16 +0000 (16:20 +0200)]
Don't use DuplicateCheck for purchaseInvoice Import

- default data makes them duplicate by default

Change-Id: Id4f3cbec72ea7c6fa76b414b884816fd888bac41
Reviewed-on: http://gerrit.tine20.com/customers/2224
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
6 years agoskip triggerAsyncEvents test for the moment
Philipp Schüle [Wed, 23 Sep 2015 15:07:49 +0000 (17:07 +0200)]
skip triggerAsyncEvents test for the moment

Change-Id: Ia3da2d02ec644138726da611668efe9dfd851729
Reviewed-on: http://gerrit.tine20.com/customers/2219
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011126: invoices update mechanism
Paul Mehrer [Mon, 6 Jul 2015 08:48:17 +0000 (10:48 +0200)]
0011126: invoices update mechanism

invoices that belong to a contract that was changed
 after the invoice was created get recreated in
 a transaction. comparison is done. transaction
 eventually rollbacked

invoices that have not been cleared and have not
 been recreated by above process, check themselves
 for updates on accountables and merge new data
 into the existing invoice

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

Change-Id: Ieb29a597d2335fb6d99010be59e6ae9ca8ec0aa3
Reviewed-on: http://gerrit.tine20.com/customers/2218
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0011346: Add Payment Methods
Paul Mehrer [Thu, 10 Sep 2015 12:59:54 +0000 (14:59 +0200)]
0011346: Add Payment Methods

added payment methods and provided update script

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

Change-Id: I84c6714f7dfb96100f5e3e86982ab0570f459d31
Reviewed-on: http://gerrit.tine20.com/customers/2191
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes default container handling in Addressbook
Philipp Schüle [Wed, 23 Sep 2015 12:55:52 +0000 (14:55 +0200)]
fixes default container handling in Addressbook

Change-Id: I51c86911062440c0b7993ae03d6349e18feb3a4a
Reviewed-on: http://gerrit.tine20.com/customers/2216
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agodatetime types should use Tinebase_Model_Filter_DateTime
Philipp Schüle [Wed, 23 Sep 2015 14:12:02 +0000 (16:12 +0200)]
datetime types should use Tinebase_Model_Filter_DateTime

... in ModelConfiguration

Change-Id: I6e51b0622dfc2ceb3af0bf1aef51202eebde1f67
Reviewed-on: http://gerrit.tine20.com/customers/2217
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Tue, 22 Sep 2015 13:25:26 +0000 (15:25 +0200)]
Merge branch '2014.11' into 2014.11-develop

6 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Tue, 22 Sep 2015 13:25:05 +0000 (15:25 +0200)]
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Convert/Event/VCalendar/MacOSXTest.php

Change-Id: I19bca261578d8c7af1149c2e4e5d494875805414

6 years agoworkaround 10.10 allday event rrule until timezone bug
Cornelius Weiß [Fri, 18 Sep 2015 14:03:52 +0000 (16:03 +0200)]
workaround 10.10 allday event rrule until timezone bug

Change-Id: I9af6b6dcb2d26c4db0645117f38577e3d92ce6be
Reviewed-on: http://gerrit.tine20.com/customers/2207
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes email replacement in subscription links
Philipp Schüle [Tue, 22 Sep 2015 08:05:38 +0000 (10:05 +0200)]
fixes email replacement in subscription links

* do not replace emails if already embedded in uri

Change-Id: I41f9d451b4b0a23e72a706242e8857811b244806
Reviewed-on: http://gerrit.tine20.com/customers/2213
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofixes IE problems with jsonkey cookie
Philipp Schüle [Mon, 21 Sep 2015 10:53:41 +0000 (12:53 +0200)]
fixes IE problems with jsonkey cookie

* cookie.clear() sets the cookie value to "null" in IE
* also fixes a minor problem in exception dialog when registry is empty
* adds jsonkey cookie for all mainscreen requests again

fixes 602427d6c142b23be4e12c7bdaf4cafa769e0e04 (cope with jsonKey for SSO logins)

Change-Id: Ic9244bb7514c3de886532237817ae86e3781091e
Reviewed-on: http://gerrit.tine20.com/customers/2210
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 agomake Fileupload exception more general
sstamer [Fri, 24 Jul 2015 09:54:25 +0000 (11:54 +0200)]
make Fileupload exception more general

Change-Id: Ib3385efe5555885f5c16182856f43ecbbda04ef6
Reviewed-on: http://gerrit.tine20.com/customers/2057
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Mon, 21 Sep 2015 15:25:00 +0000 (17:25 +0200)]
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Setup/Controller.php

Change-Id: I4605dac9ee470a606e84a2b04361c40859125018

6 years ago0011336: support backup and restore via cli
Cornelius Weiß [Wed, 16 Sep 2015 15:50:40 +0000 (17:50 +0200)]
0011336: support backup and restore via cli

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

Change-Id: Ia169496109c8c460b62425c2989aab8d466e8da5
Reviewed-on: http://gerrit.tine20.com/customers/2205
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Thu, 17 Sep 2015 10:32:26 +0000 (12:32 +0200)]
Merge branch '2014.11' into 2014.11-develop