tine20
5 years agoMerge branch '2015.11-develop-postal' into 2015.11-develop
Philipp Schüle [Fri, 10 Jun 2016 16:18:29 +0000 (18:18 +0200)]
Merge branch '2015.11-develop-postal' into 2015.11-develop

5 years ago0011898: Download links missing server subdir part
Philipp Schüle [Thu, 9 Jun 2016 16:37:46 +0000 (18:37 +0200)]
0011898: Download links missing server subdir part

* make use of new Tinebase_Core::getUrl()
* 'full' is default part for getUrl()

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

Change-Id: I92e8889623d11eaa748e0ee134f4326d6f6c40f5
Reviewed-on: http://gerrit.tine20.com/customers/3222
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agobring back global _() as deprecated i18n ref
Cornelius Weiß [Thu, 9 Jun 2016 06:32:53 +0000 (08:32 +0200)]
bring back global _() as deprecated i18n ref

* with webpack we don't need to have lodash globally exposed
* using _ as i18n eases the transition as we have it used in multiple
  branches

Change-Id: I3914f537481ac36796cc427d3f12c0438fe42a6c
Reviewed-on: http://gerrit.tine20.com/customers/3219
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agomoves setting of SERVER vars in test bootstrap
Philipp Schüle [Wed, 8 Jun 2016 08:29:32 +0000 (10:29 +0200)]
moves setting of SERVER vars in test bootstrap

Change-Id: Ib64d446806fbd604032417e5364bf85a465ec376
Reviewed-on: http://gerrit.tine20.com/customers/3206
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Thu, 9 Jun 2016 15:24:29 +0000 (17:24 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years ago0011918: shorten for export fields
sstamer [Thu, 2 Jun 2016 14:42:15 +0000 (16:42 +0200)]
0011918: shorten for export fields

* configure maxlines and maxcharacters

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

Change-Id: I64fd764885851310ed65e19f57b214f2c3dbd31c
Reviewed-on: http://gerrit.tine20.com/customers/3198
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agogetRelations: fixes phpdoc and set fallback for types
Philipp Schüle [Thu, 9 Jun 2016 12:16:28 +0000 (14:16 +0200)]
getRelations: fixes phpdoc and set fallback for types

... as sometimes the clients sends NULL for $type

Change-Id: I58e2b0d5e0cf13df094521a151d15bb0175c25d6
Reviewed-on: http://gerrit.tine20.com/customers/3221
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoSetup needs Tinebase libs (webpack), too
Philipp Schüle [Thu, 9 Jun 2016 10:20:29 +0000 (12:20 +0200)]
Setup needs Tinebase libs (webpack), too

Change-Id: Iaec7e2fd8bb28019c15d5c77c9b0dd7b6ebd7442
Reviewed-on: http://gerrit.tine20.com/customers/3220
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Wed, 8 Jun 2016 14:54:22 +0000 (16:54 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Wed, 8 Jun 2016 14:54:03 +0000 (16:54 +0200)]
Merge branch '2014.11' into 2015.11

5 years agoCalendar printing in FF
Cornelius Weiß [Mon, 6 Jun 2016 21:41:18 +0000 (23:41 +0200)]
Calendar printing in FF

new printing approach:
- take screenshot with html2canvas
- print screenshot
=> looks better in FF in other browsers

fixes:
 0011708: Firefox printing is broken again
 0011340: Second page corrupt, when printing calender in landscape
 0010628: Calender print shows only time range 0-11 o'clock

Change-Id: I99e0f36249a109fb8acdee447dd95d264f288b3b
Reviewed-on: http://gerrit.tine20.com/customers/3215
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011882: add web pack as javascript packager for libraries
Cornelius Weiß [Thu, 26 May 2016 18:23:46 +0000 (20:23 +0200)]
0011882: add web pack as javascript packager for libraries

Change-Id: Ieacbd2aec5626b31f49016b2c16d4907720ec97f
Reviewed-on: http://gerrit.tine20.com/customers/3214
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agocatch promise error in js log
sstamer [Wed, 8 Jun 2016 11:52:39 +0000 (13:52 +0200)]
catch promise error in js log

Change-Id: Ic9f7b5ce9e7671c34aac417ff7d2be947c30da4a
Reviewed-on: http://gerrit.tine20.com/customers/3207
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoFix scroller jump bug at calendar page start
sstamer [Wed, 8 Jun 2016 11:55:08 +0000 (13:55 +0200)]
Fix scroller jump bug at calendar page start

Change-Id: I3682d359f444d20057d0558b88bcf206c44ff26d
Reviewed-on: http://gerrit.tine20.com/customers/3208
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoRevert "11888 increase announced own cloud server version"
Philipp Schüle [Wed, 8 Jun 2016 10:53:24 +0000 (12:53 +0200)]
Revert "11888 increase announced own cloud server version"

THIS BREAKS OLDER OWNCLOUD CLIENTS!

This reverts commit 203dadea2feb0f9ac48cbdc185526ee224a26058.

Change-Id: I94e6762b97af35b5114c288fa4dbfe9c4b623087
Reviewed-on: http://gerrit.tine20.com/customers/3205
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011824: show raw message when PGP decryption fails
Cornelius Weiß [Wed, 4 May 2016 08:00:11 +0000 (10:00 +0200)]
0011824: show raw message when PGP decryption fails

NOTE: Mailvelope has a bug in it's error handling for displayContainers
      see: https://github.com/mailvelope/mailvelope/pull/386

Change-Id: I1a2af8b0bcef44e5cd1f19dc08edfa7629d661f5
Reviewed-on: http://gerrit.tine20.com/customers/3126
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Tue, 7 Jun 2016 13:58:08 +0000 (15:58 +0200)]
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tine20/Tinebase/js/extFixes.js

Change-Id: I1b4a6d34d03460c784156e94ba4c746693081847

5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Tue, 7 Jun 2016 13:56:55 +0000 (15:56 +0200)]
Merge branch '2014.11' into 2015.11

5 years agoFix copy to clipboard loses view
sstamer [Tue, 7 Jun 2016 09:04:32 +0000 (11:04 +0200)]
Fix copy to clipboard loses view

Change-Id: Ifa74d80779ebb768d1075437de0cf80f8e4dae6a
Reviewed-on: http://gerrit.tine20.com/customers/3201
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011906: Fix contact type not sortable
sstamer [Mon, 6 Jun 2016 14:47:32 +0000 (16:47 +0200)]
0011906: Fix contact type not sortable

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

Change-Id: Ica5d727ce709ff090cd3a670a2276f28d648f6f0
Reviewed-on: http://gerrit.tine20.com/customers/3192
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011884: fix expresso css include flaw
Cornelius Weiß [Fri, 27 May 2016 14:08:20 +0000 (16:08 +0200)]
0011884: fix expresso css include flaw

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

Change-Id: Ia9e5b6a63d9c8d581a5993bef74933cf9d6757d4
Reviewed-on: http://gerrit.tine20.com/customers/3181
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11888 increase announced own cloud server version
Cornelius Weiß [Fri, 27 May 2016 18:15:57 +0000 (20:15 +0200)]
11888 increase announced own cloud server version

-> use 9.0.2, latest version

Change-Id: I5d0593abea7c279a362a4c7494e3c39c7c8c79ba
Reviewed-on: http://gerrit.tine20.com/customers/3183
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoSales - add/edit contract dialog bug
Paul Mehrer [Fri, 20 May 2016 10:49:18 +0000 (12:49 +0200)]
Sales - add/edit contract dialog bug

in the add/edit contract dialog, in the product
tab, was an error when changing the product quantity

Change-Id: Ib82a0fe5d774846356cdedea76edb97c638220fc
Reviewed-on: http://gerrit.tine20.com/customers/3175
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11878 allow data reload from external window
Cornelius Weiß [Mon, 23 May 2016 10:44:32 +0000 (12:44 +0200)]
11878 allow data reload from external window

Change-Id: I7479b25295e132ef791ca6cbb8c874f122fa1e55
Reviewed-on: http://gerrit.tine20.com/customers/3176
Reviewed-by: sstamer <s.stamer@metaways.de>
Tested-by: sstamer <s.stamer@metaways.de>
5 years ago0011830: integrate API for cross window communication
Cornelius Weiß [Fri, 13 May 2016 15:36:31 +0000 (17:36 +0200)]
0011830: integrate API for cross window communication

integrate postal.js as pub/sub library
* integrate postal.xwindow for cross window communication
* have iframe service from server to ease third party app integration
 https://tine.example.com/?method=Tinebase.getPostalXWindow
* integrate postal.request-response for rpc style communication

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

Change-Id: I87592e8756f3608e31d82f3659dcffff004ccfbd
Reviewed-on: http://gerrit.tine20.com/customers/3162
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: sstamer <s.stamer@metaways.de>
Tested-by: sstamer <s.stamer@metaways.de>
5 years agoRevert "0011830: integrate API for cross window communication"
Philipp Schüle [Tue, 7 Jun 2016 08:52:08 +0000 (10:52 +0200)]
Revert "0011830: integrate API for cross window communication"

This reverts commit c195e92b3035c1b4dd056c4e9829ef7ab5285f4f.

* this will be moved to a separate branch for further testing
* integration will be done when this is more stable

Change-Id: I0792dbdf0654210b36bd08acf3ef6c6faccba218
Reviewed-on: http://gerrit.tine20.com/customers/3195
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoRevert "11878 allow data reload from external window"
Philipp Schüle [Tue, 7 Jun 2016 08:49:09 +0000 (10:49 +0200)]
Revert "11878 allow data reload from external window"

This reverts commit 6bccb0992d43d0576fe4b600af7821aaf78ad2db.

Change-Id: If5ac6a897da6b01fb9e9374d5a203c04fdeef55f
Reviewed-on: http://gerrit.tine20.com/customers/3194
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago146817 can't use mail templates
Cornelius Weiß [Fri, 20 May 2016 09:44:59 +0000 (11:44 +0200)]
146817 can't use mail templates

* format autodetection failed
* add explicit property for type of body property in message records

Change-Id: Ied90d40bbac6352bd5fcd0e9c7bd47fe0f67767d
Reviewed-on: http://gerrit.tine20.com/customers/3173
Reviewed-by: sstamer <s.stamer@metaways.de>
Tested-by: sstamer <s.stamer@metaways.de>
5 years ago11878 allow data reload from external window
Cornelius Weiß [Mon, 23 May 2016 10:44:32 +0000 (12:44 +0200)]
11878 allow data reload from external window

Change-Id: I7479b25295e132ef791ca6cbb8c874f122fa1e55
Reviewed-on: http://gerrit.tine20.com/customers/3176
Reviewed-by: sstamer <s.stamer@metaways.de>
Tested-by: sstamer <s.stamer@metaways.de>
5 years ago0011830: integrate API for cross window communication
Cornelius Weiß [Fri, 13 May 2016 15:36:31 +0000 (17:36 +0200)]
0011830: integrate API for cross window communication

integrate postal.js as pub/sub library
* integrate postal.xwindow for cross window communication
* have iframe service from server to ease third party app integration
 https://tine.example.com/?method=Tinebase.getPostalXWindow
* integrate postal.request-response for rpc style communication

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

Change-Id: I87592e8756f3608e31d82f3659dcffff004ccfbd
Reviewed-on: http://gerrit.tine20.com/customers/3162
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: sstamer <s.stamer@metaways.de>
Tested-by: sstamer <s.stamer@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Thu, 19 May 2016 10:34:11 +0000 (12:34 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years ago0011872: add imported members to default group
sstamer [Fri, 13 May 2016 10:40:14 +0000 (12:40 +0200)]
0011872: add imported members to default group

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

Change-Id: I463b740103db13590456369025abe1f21d6d859e
Reviewed-on: http://gerrit.tine20.com/customers/3157
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11876: Fix Resource invite for splitview
sstamer [Thu, 19 May 2016 09:28:37 +0000 (11:28 +0200)]
11876: Fix Resource invite for splitview

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

- Type user was forced on resource type attendee

Change-Id: I837e7c4d466a856385a13cd5bc6a072a1e36c1f7
Reviewed-on: http://gerrit.tine20.com/customers/3170
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011870: Tinebase_ActionQueue - 100% CPU worker process
Paul Mehrer [Tue, 17 May 2016 12:19:32 +0000 (14:19 +0200)]
0011870: Tinebase_ActionQueue - 100% CPU worker process

if no proper backend is configured, the worker process
just quits instead of running in an infinite loop

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

Change-Id: I28344d2f5124ad8cd282908d9d9d6186b5c29331
Reviewed-on: http://gerrit.tine20.com/customers/3163
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011866: free global _ for lodash library
Philipp Schüle [Wed, 18 May 2016 17:29:11 +0000 (19:29 +0200)]
0011866: free global _ for lodash library

* fixes some missing i18ns

A modern JavaScript utility library delivering
 modularity, performance, & extras.

https://lodash.com/
https://github.com/lodash/lodash

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

Change-Id: I86bbe66104e39a216f8a8e97daa5f4c9f4133615
Reviewed-on: http://gerrit.tine20.com/customers/3167
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 '2015.11' into 2015.11-develop
Philipp Schüle [Wed, 18 May 2016 12:41:59 +0000 (14:41 +0200)]
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tests/tine20/Tinebase/AllTests.php
tine20/Crm/Frontend/Json.php

Change-Id: I99e0f0468b7ce55a761cd43d69ca2479e513ca90

5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)]
Merge branch '2014.11' into 2015.11

5 years ago0011866: free global _ for lodash library
Cornelius Weiß [Tue, 10 May 2016 16:17:39 +0000 (18:17 +0200)]
0011866: free global _ for lodash library

A modern JavaScript utility library delivering
 modularity, performance, & extras.

https://lodash.com/
https://github.com/lodash/lodash

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

Change-Id: I9e902bf6dd61e85addc653195dd1758977ab20f8
Reviewed-on: http://gerrit.tine20.com/customers/3146
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoclient expects default container in 'defaultContainer' registry key
Philipp Schüle [Tue, 17 May 2016 15:03:55 +0000 (17:03 +0200)]
client expects default container in 'defaultContainer' registry key

... on CRM lead import

Change-Id: I691886022bb392d82adf08f353766b5ff9bd0a5b
Reviewed-on: http://gerrit.tine20.com/customers/3164
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011844: decodeSid fails for some encoded SIDs
Philipp Schüle [Tue, 10 May 2016 13:43:48 +0000 (15:43 +0200)]
0011844: decodeSid fails for some encoded SIDs

* encoded Sids might contain dashes -.-
* adds a test
* improves logging

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

Change-Id: Ief81024e3d1c4cd862a587e93529717af88c7f79
Reviewed-on: http://gerrit.tine20.com/customers/3139
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011706: After Update Some elements are broken
Philipp Schüle [Wed, 11 May 2016 08:02:57 +0000 (10:02 +0200)]
0011706: After Update Some elements are broken

* fixes CRM config update script
-> somehow javascript has been introduced
 for string concat ;)
* adds update 9.2 to fix broken 9.1

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

Change-Id: Ia74df585c62a6ad5b9b74c9669f649c86d5846e1
Reviewed-on: http://gerrit.tine20.com/customers/3140
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoFix missing CRM Keyfield icons
sstamer [Wed, 11 May 2016 11:03:27 +0000 (13:03 +0200)]
Fix missing CRM Keyfield icons

Change-Id: I8fbe3792dfb227d3daad96bb3dc8fc926f266be2
Reviewed-on: http://gerrit.tine20.com/customers/3143
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011860: Firefox: error message after setup.php login
Philipp Schüle [Fri, 13 May 2016 14:31:43 +0000 (16:31 +0200)]
0011860: Firefox: error message after setup.php login

* skip exception handling when tine is reloading

... this "fixes" the Firefox problem during setup
 which might be caused by a timing issue and stacked
  registry clearing / reloading

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

Change-Id: I877de443753bf0014d0a7872e4786b00e6b47dff
Reviewed-on: http://gerrit.tine20.com/customers/3161
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011848: Tine 2.0 update-script creates table adb_list_m_role
Philipp Schüle [Tue, 17 May 2016 16:35:29 +0000 (18:35 +0200)]
0011848: Tine 2.0 update-script creates table adb_list_m_role

* renames table in application_tables
* fixes table name as we had to use adb_list_m_role to have
 small index key lenghts

see https://www.tine20.org/forum/viewtopic.php?f=12&t=17932

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

Change-Id: I4bae6e008d1e7c23e8836ada4983ffbcfa7c41e6
Reviewed-on: http://gerrit.tine20.com/customers/3145
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011864: invite resource automatically
sstamer [Thu, 12 May 2016 12:32:54 +0000 (14:32 +0200)]
0011864: invite resource automatically

... if you create a event in resource calendar

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

Change-Id: I8f9720238a8bc453935cca2e5f19dae4c016d626
Reviewed-on: http://gerrit.tine20.com/customers/3158
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011858: renamed fields might break concurrent update
Philipp Schüle [Thu, 12 May 2016 16:07:13 +0000 (18:07 +0200)]
0011858: renamed fields might break concurrent update

* checks if property exists in record with has()
* renames a remaining "price" property to salesprice
 in lead pdf export

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

Change-Id: I27d0aa661a5837498468a28f59c12bc871959a49
Reviewed-on: http://gerrit.tine20.com/customers/3154
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11574: backup should only dump structure of some tables
Paul Mehrer [Tue, 12 Apr 2016 11:18:37 +0000 (13:18 +0200)]
11574: backup should only dump structure of some tables

added <backupStructureOnly> flag to setup.xml

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

Change-Id: I0959a1f5f3c006770c9ffb507d3f7a8e8fe313d3
Reviewed-on: http://gerrit.tine20.com/customers/3159
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0001264: compose text emails
Cornelius Weiß [Tue, 12 Apr 2016 08:01:02 +0000 (10:01 +0200)]
0001264: compose text emails

added toggle button in editor
added options
 - compose_format -> format when composing messages
 - preserve_format -> use original format for reply/forward

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

Change-Id: I71110c34724971596baf2670135422f7fde3913c
Reviewed-on: http://gerrit.tine20.com/customers/3124
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadd feature switch for except recur feature
sstamer [Tue, 10 May 2016 13:40:04 +0000 (15:40 +0200)]
add feature switch for except recur feature

see 0011598: add rrule constraints
https://forge.tine20.org/view.php?id=11598

Change-Id: I83ff7b87a3c69d3f435d984bd068dd34a5b2432f
Reviewed-on: http://gerrit.tine20.com/customers/3138
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011856: setup tests: make phpunitconfig.inc.php optional
Philipp Schüle [Thu, 12 May 2016 15:24:11 +0000 (17:24 +0200)]
0011856: setup tests: make phpunitconfig.inc.php optional

improves setup tests bootstrap

* adds bootstrap.php
* extends "normal" TestServer
* allows to get test credentials from phpunit config
 OR config.inc.php

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

Change-Id: I05104b0bb847d24946d676da84ace6eed0e3335f
Reviewed-on: http://gerrit.tine20.com/customers/3153
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoimproved test config handling
Philipp Schüle [Thu, 12 May 2016 15:22:14 +0000 (17:22 +0200)]
improved test config handling

* adds lazy loading for config
* use test credentials in caldav test
* always use getConfig of TestServer instance

Change-Id: If8e33fcd99030bfdb7a9902d3a103161f6b69f7a
Reviewed-on: http://gerrit.tine20.com/customers/3152
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11854: Fix Crm keyfield Filter Bug
sstamer [Fri, 29 Apr 2016 15:55:31 +0000 (17:55 +0200)]
11854: Fix Crm keyfield Filter Bug

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

- int Ids don't work

Change-Id: I05080c5764f89badc8b744b3d4fb737079093418
Reviewed-on: http://gerrit.tine20.com/customers/3151
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes flaky testInvoiceRecreation
Philipp Schüle [Wed, 11 May 2016 09:32:36 +0000 (11:32 +0200)]
fixes flaky testInvoiceRecreation

Change-Id: I0d4e5ddb8c5547a5bfb0e045ea22dbefa6b2c279
Reviewed-on: http://gerrit.tine20.com/customers/3141
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixed blacklisting of tine20 config
Philipp Schüle [Tue, 10 May 2016 08:45:05 +0000 (10:45 +0200)]
fixed blacklisting of tine20 config

... use subdir /etc/tine20 as all of /etc
 throws "permission denied"

Change-Id: Icd22a199c8d9097951a347fe6acf6820007e73f7
Reviewed-on: http://gerrit.tine20.com/customers/3137
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoremove limitation for order confirmation and contract
sstamer [Fri, 6 May 2016 13:20:59 +0000 (15:20 +0200)]
remove limitation for order confirmation and contract

Change-Id: Ia6a032bfe4dd0fa456823198d841a63245e9e236
Reviewed-on: http://gerrit.tine20.com/customers/3135
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoremove unused columns
sstamer [Mon, 9 May 2016 11:46:09 +0000 (13:46 +0200)]
remove unused columns

- purchase invoice

Change-Id: I42da76db7ac28aebd54b2e9fb46637d928ae1b5b
Reviewed-on: http://gerrit.tine20.com/customers/3136
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoAdd Debitor and price net, tax, gross to invoice export
sstamer [Fri, 6 May 2016 13:00:51 +0000 (15:00 +0200)]
Add Debitor and price net, tax, gross to invoice export

Change-Id: I4365cbefe0f85940442658d595aea188951abff3
Reviewed-on: http://gerrit.tine20.com/customers/3134
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago11816: Show description qtip in recordPicker
sstamer [Thu, 28 Apr 2016 13:31:33 +0000 (15:31 +0200)]
11816: Show description qtip in recordPicker

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

Change-Id: I5a47f4b768c1a529468af7f2fe8f185b45e98e24
Reviewed-on: http://gerrit.tine20.com/customers/3111
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Mon, 9 May 2016 12:02:12 +0000 (14:02 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years agoMerge branch '2014.11' into 2015.11
Philipp Schüle [Mon, 9 May 2016 12:02:00 +0000 (14:02 +0200)]
Merge branch '2014.11' into 2015.11

5 years agoMerge branch '2013.10' into 2014.11
Philipp Schüle [Mon, 9 May 2016 11:58:32 +0000 (13:58 +0200)]
Merge branch '2013.10' into 2014.11

5 years agoshow tags column in list grid
Philipp Schüle [Mon, 2 May 2016 15:03:45 +0000 (17:03 +0200)]
show tags column in list grid

Change-Id: I11cd44d11e7322b286c17a889047c929d5e773dc
Reviewed-on: http://gerrit.tine20.com/customers/3122
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011842: import full related record data
Philipp Schüle [Mon, 9 May 2016 10:47:30 +0000 (12:47 +0200)]
0011842: import full related record data

* allows to import all related record (scalar) fields

side effects:
* setRelations(): use existing relations if only relation id is missing
* makes deleteLinkedRelations public (to be able to
 use it in test case cleanup)
* show relations in CRM lead duplicate conflict panel
* improve plugin failure message

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

Change-Id: Ic9e01d3d5797ff009f5bffbb02ef6f7c34be2cd6
Reviewed-on: http://gerrit.tine20.com/customers/3131
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011840: iCal 10.11: problem with recurring events
Paul Mehrer [Tue, 3 May 2016 14:41:57 +0000 (16:41 +0200)]
0011840: iCal 10.11: problem with recurring events

changed href format for invite/user/href

OS X 10.11 ical client doesn't accept a URI formated href
in the invite/user/href tag anymore. Changed format to
urn:uuid

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

Change-Id: I8d59f1da55f3345bfeb1f912e17f8f4b7c753db6
Reviewed-on: http://gerrit.tine20.com/customers/3127
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoblacklist some more files and directories for code coverage
Philipp Schüle [Mon, 2 May 2016 15:10:52 +0000 (17:10 +0200)]
blacklist some more files and directories for code coverage

Change-Id: I9aa2243aafb4fc21297ff17b48b1aa98cbc21210
Reviewed-on: http://gerrit.tine20.com/customers/3123
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoskips testInvoiceRecreation again
Philipp Schüle [Mon, 9 May 2016 07:36:19 +0000 (09:36 +0200)]
skips testInvoiceRecreation again

This reverts commit 2e9046646ba649ed133b465a8eb3969a7d176442.

Change-Id: I95ecdbd337f868874ed258f5e7d3db9285c8d43c
Reviewed-on: http://gerrit.tine20.com/customers/3130
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011822: prevent error when combobox list is not initialized
Cornelius Weiß [Tue, 3 May 2016 07:45:04 +0000 (09:45 +0200)]
0011822: prevent error when combobox list is not initialized

Change-Id: Ifce0fcbc64023fb72f3dd60abd2cac22c6f5f6ed
Reviewed-on: http://gerrit.tine20.com/customers/3125
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0011812: add seq to lists
Paul Mehrer [Mon, 25 Apr 2016 14:07:43 +0000 (16:07 +0200)]
0011812: add seq to lists

* Addressbook_List: made tag filter work again
* Addressbook_List: added missing seq column

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

Change-Id: I5d8d8ee640dda2a696a176ced860b95ad9a938a9
Reviewed-on: http://gerrit.tine20.com/customers/3093
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Mon, 2 May 2016 09:06:16 +0000 (11:06 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years agodon't create coverage for tests
Philipp Schüle [Mon, 2 May 2016 07:50:38 +0000 (09:50 +0200)]
don't create coverage for tests

Change-Id: I6be8da4194015592e0b62051aef55f7574557d86
Reviewed-on: http://gerrit.tine20.com/customers/3117
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoecho import exceptions in csv hook test
Philipp Schüle [Mon, 2 May 2016 07:54:25 +0000 (09:54 +0200)]
echo import exceptions in csv hook test

Change-Id: I7bde48447aa36eccc562bd7fb8ae7621b07a28c8
Reviewed-on: http://gerrit.tine20.com/customers/3118
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years ago0010132: Create Folder inside a folder with the same name
Philipp Schüle [Thu, 28 Apr 2016 11:06:50 +0000 (13:06 +0200)]
0010132: Create Folder inside a folder with the same name

* use array_diff_assoc instead of array_diff ...
* improve robustness of js tree node creation
* fixes test

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

Change-Id: Ic2e926f8fb1ebfc3ff97a15730eaaa04221f7514
Reviewed-on: http://gerrit.tine20.com/customers/3112
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 agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Fri, 29 Apr 2016 10:20:39 +0000 (12:20 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years agoMerge branch '2014.11-develop' into 2015.11
Philipp Schüle [Fri, 29 Apr 2016 10:16:33 +0000 (12:16 +0200)]
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tests/tine20/Tinebase/ControllerTest.php

Change-Id: Ia366fe87ea514e6f879c6b654432da04c1f6ae0e

5 years agoMerge branch '2014.11' into 2014.11-develop
Philipp Schüle [Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)]
Merge branch '2014.11' into 2014.11-develop

5 years agoadds phpunit.xml for setup tests
Philipp Schüle [Fri, 29 Apr 2016 09:37:24 +0000 (11:37 +0200)]
adds phpunit.xml for setup tests

Change-Id: I211853685c784f5131fe59f6fbb7b7aea2761e73
Reviewed-on: http://gerrit.tine20.com/customers/3114
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds vendor and library dirs to code coverage blacklist
Philipp Schüle [Fri, 29 Apr 2016 08:19:00 +0000 (10:19 +0200)]
adds vendor and library dirs to code coverage blacklist

* ... in phpunit.xml
* it seems that setting this in TestServer is not working
 any longer -> should be investigated

Change-Id: Ib1da96d64a689ad09b1c1bf61cdd67d46f520e2c
Reviewed-on: http://gerrit.tine20.com/customers/3113
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoimproves maintenanceMode test
Philipp Schüle [Mon, 25 Apr 2016 15:06:54 +0000 (17:06 +0200)]
improves maintenanceMode test

Change-Id: Id8a1376cadb0b1785a5b94af6555c087a7ea96eb
Reviewed-on: http://gerrit.tine20.com/customers/3096
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoonly call updateMultiple if something changed
Philipp Schüle [Wed, 27 Apr 2016 09:33:41 +0000 (11:33 +0200)]
only call updateMultiple if something changed

 ... in updateProductLifespan

Change-Id: Idaab6f1d75fc42f1f082e9dfdf9c2d4fa73a6742
Reviewed-on: http://gerrit.tine20.com/customers/3098
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds another sleep(1) to email tests
Philipp Schüle [Thu, 28 Apr 2016 12:49:59 +0000 (14:49 +0200)]
adds another sleep(1) to email tests

.... because mail servers sometimes needs
 more time to send/receive mails

Change-Id: I0c790d9826e973985de222053915b0a62f1c0024
Reviewed-on: http://gerrit.tine20.com/customers/3110
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Thu, 28 Apr 2016 14:16:44 +0000 (16:16 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years agoallow coverage-* options in phpunit
Philipp Schüle [Thu, 28 Apr 2016 12:43:59 +0000 (14:43 +0200)]
allow coverage-* options in phpunit

Change-Id: I91a3eda9781981e2e68bc993db8559c36c91520a
Reviewed-on: http://gerrit.tine20.com/customers/3109
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofix missing extraFreetime Icons
sstamer [Thu, 28 Apr 2016 12:13:42 +0000 (14:13 +0200)]
fix missing extraFreetime Icons

Change-Id: Idc996e34e352ac784cc3c3d60b9f20b195e597cc
Reviewed-on: http://gerrit.tine20.com/customers/3108
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Thu, 28 Apr 2016 09:47:21 +0000 (11:47 +0200)]
Merge branch '2015.11' into 2015.11-develop

5 years agoMerge branch '2015.11-develop-sambaad' into 2015.11-develop
Philipp Schüle [Thu, 28 Apr 2016 09:46:58 +0000 (11:46 +0200)]
Merge branch '2015.11-develop-sambaad' into 2015.11-develop

5 years ago0011814: ActiveDirectory: lazy load domain config
Philipp Schüle [Thu, 28 Apr 2016 08:56:19 +0000 (10:56 +0200)]
0011814: ActiveDirectory: lazy load domain config

* adds trait for AD domain config
* this prevents AD binding each time a
 Tinebase_Group_AD object is created

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

Change-Id: I4a8ffd11f13064c8eb77f07e252cca9c7fe20197
Reviewed-on: http://gerrit.tine20.com/customers/3104
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadded logging to Sales_Controller_Invoice
Paul Mehrer [Tue, 26 Apr 2016 14:43:48 +0000 (16:43 +0200)]
added logging to Sales_Controller_Invoice

Change-Id: Ie18d6b562f0c4a3c33011d468df5f0d0d4d93732
Reviewed-on: http://gerrit.tine20.com/customers/3097
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoRevert "skips testInvoiceRecreation again"
Philipp Schüle [Mon, 25 Apr 2016 11:06:31 +0000 (13:06 +0200)]
Revert "skips testInvoiceRecreation again"

This reverts commit 0c25b71ecaa570ae3ba4c6366641c9905a806a6a.

Change-Id: I625e6295c256a6a3e2ea531cbe0ece9939c202c2
Reviewed-on: http://gerrit.tine20.com/customers/3087
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds lists tag filter to gui
Philipp Schüle [Mon, 25 Apr 2016 13:17:22 +0000 (15:17 +0200)]
adds lists tag filter to gui

Change-Id: Ibdb31094b1f8762d6c2f647009dfd9d0f13230f6
Reviewed-on: http://gerrit.tine20.com/customers/3092
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoCrm Demo Data - Out of memory
Paul Mehrer [Thu, 14 Apr 2016 09:09:02 +0000 (11:09 +0200)]
Crm Demo Data - Out of memory

using filters instead of getting all addressbook contacts
in order to minimize memory footprint

Change-Id: Ifd2d29abd0b35e5327690b226e5da49faaa71d4e
Reviewed-on: http://gerrit.tine20.com/customers/3049
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoCrm Demo Data - Out of memory
Paul Mehrer [Thu, 14 Apr 2016 09:09:02 +0000 (11:09 +0200)]
Crm Demo Data - Out of memory

using filters instead of getting all addressbook contacts
in order to minimize memory footprint

Change-Id: Ifd2d29abd0b35e5327690b226e5da49faaa71d4e
Reviewed-on: http://gerrit.tine20.com/customers/3049
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodeactivate testStudentNameSchemaSpecialChars for AD backend
Philipp Schüle [Fri, 22 Apr 2016 09:10:16 +0000 (11:10 +0200)]
deactivate testStudentNameSchemaSpecialChars for AD backend

Change-Id: I4611a732fad1fd75f5e86316f1ba3aeb65bc88ce
Reviewed-on: http://gerrit.tine20.com/customers/3076
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodefault is a reserved keyword
Philipp Schüle [Mon, 25 Apr 2016 11:20:10 +0000 (13:20 +0200)]
default is a reserved keyword

... which makes jsb2tk fail :(

Change-Id: I05573fddfb815e62904652040d680801fdbd7b6a
Reviewed-on: http://gerrit.tine20.com/customers/3090
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes default handling of record types
Philipp Schüle [Mon, 25 Apr 2016 10:11:58 +0000 (12:11 +0200)]
fixes default handling of record types

... when new relation is added

Change-Id: I9e459db746b47280825000a20a5ff742fa116ad6
Reviewed-on: http://gerrit.tine20.com/customers/3083
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoskips testInvoiceRecreation again
Philipp Schüle [Fri, 22 Apr 2016 15:41:18 +0000 (17:41 +0200)]
skips testInvoiceRecreation again

1) Sales_InvoiceControllerTests::testInvoiceRecreation
Failed asserting that 3 matches expected 2.
tests/tine20/Sales/InvoiceControllerTests.php:429

Change-Id: Idc1f0752ef0e5f97daf9a9ad631ae0f1d6544f1c
Reviewed-on: http://gerrit.tine20.com/customers/3080
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agofixes testGetServiceMap in server tests
Philipp Schüle [Fri, 22 Apr 2016 10:41:02 +0000 (12:41 +0200)]
fixes testGetServiceMap in server tests

... for Inventory.saveInventoryItem method

Change-Id: I58e014e93a58f0da81d59ef86b3b55b1217b15f5
Reviewed-on: http://gerrit.tine20.com/customers/3077
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agodeactivate testStudentNameSchemaSpecialChars for AD backend
Philipp Schüle [Fri, 22 Apr 2016 09:10:16 +0000 (11:10 +0200)]
deactivate testStudentNameSchemaSpecialChars for AD backend

Change-Id: I4611a732fad1fd75f5e86316f1ba3aeb65bc88ce
Reviewed-on: http://gerrit.tine20.com/customers/3076
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoadds some tolerance to LDAP expiry date test case
Philipp Schüle [Fri, 22 Apr 2016 08:11:21 +0000 (10:11 +0200)]
adds some tolerance to LDAP expiry date test case

... to prevent this problem:
expiry date should still be the same
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'2016-04-22 07:29:30'
+'2016-04-22 07:29:29'

Change-Id: I3ae52b8ca1db0cd6104ec0d4de2a2998875d4898
Reviewed-on: http://gerrit.tine20.com/customers/3075
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoallows to set the testsuite in phpunit-exec target
Philipp Schüle [Fri, 22 Apr 2016 07:41:55 +0000 (09:41 +0200)]
allows to set the testsuite in phpunit-exec target

... now we can run the setup tests with the same command
... just set testsuite=setup

Change-Id: If293b08ecf235d5030ff095f0a08e451d3302126
Reviewed-on: http://gerrit.tine20.com/customers/3074
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
5 years agoMerge branch '2015.11' into 2015.11-develop
Philipp Schüle [Fri, 22 Apr 2016 07:08:11 +0000 (09:08 +0200)]
Merge branch '2015.11' into 2015.11-develop