tine20
8 years agoMerge branch 'pu/2013.03/modelconfig-hr'
Philipp Schüle [Thu, 25 Apr 2013 20:17:02 +0000 (22:17 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Inventory/Model/InventoryItem.php

8 years ago #8212: can't sort by tags
Alexander Stintzing [Tue, 23 Apr 2013 13:26:35 +0000 (15:26 +0200)]
 #8212: can't sort by tags

- should not be sortable by tags
  -> make tags not sortable in modelConfiguration

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

Change-Id: I1695edf5335c7954ee8c18739e65a92dcfdd889d
Reviewed-on: https://gerrit.tine20.org/tine20/1933
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #7704: current container is not preselected for new inventory
Alexander Stintzing [Fri, 12 Apr 2013 11:50:33 +0000 (13:50 +0200)]
 #7704: current container is not preselected for new inventory

current container is not preselected for new inventory

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

Change-Id: Ic51f7e38b2f119f5f02a3633e3baee097d19487d
Reviewed-on: https://gerrit.tine20.org/tine20/1897
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Wed, 24 Apr 2013 15:46:55 +0000 (17:46 +0200)]
Merge branch '2013.03'

8 years agoMerge branch 'pu/2013.03/modelconfig-hr'
Philipp Schüle [Wed, 24 Apr 2013 15:46:51 +0000 (17:46 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr'

8 years ago#7370: Unable to upload files
Philipp Schüle [Wed, 24 Apr 2013 14:16:57 +0000 (16:16 +0200)]
#7370: Unable to upload files

- use Tinebase_TempFile to open a temp file in the configured
tempdir (replaces tmpfile())
- clear tempdir files in cleanup task (can be called via CLI, too)
- pass all options for stream_context_set_option as an array
- add update script for scheduler task (clearTable
-> clearTableAndTempdir)

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

Change-Id: I1c605ebc3e6e39041f573c262b33c3427d5bc6ae
Reviewed-on: https://gerrit.tine20.org/tine20/1927
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#8222: allow email pw suffix
Philipp Schüle [Mon, 22 Apr 2013 11:59:36 +0000 (13:59 +0200)]
#8222: allow email pw suffix

- add pwsuffix (if configured) when fetching credentials for imap/smtp
connect and when saving email user (via sql plugin)
- it is already possible to set the credentials for the system account
- added some comments

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

Change-Id: I9a07c828b740ccf1bdde21836f49286b31bb6576
Reviewed-on: https://gerrit.tine20.org/tine20/1926
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8228: Change password is disabled
Philipp Schüle [Wed, 24 Apr 2013 14:12:20 +0000 (16:12 +0200)]
#8228: Change password is disabled

- fixed configManager: use Tine.Tinebase.registry again if app could not
be fetched
- definition is not needed atm

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

Change-Id: I99123533a6c94e4211719fdfbac908a051b7adfc
Reviewed-on: https://gerrit.tine20.org/tine20/1940
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8210: email grid: set flag does not work sometimes
Philipp Schüle [Wed, 24 Apr 2013 10:03:20 +0000 (12:03 +0200)]
#8210: email grid: set flag does not work sometimes

- the record loses its (grid) store when grid loads
new records after a record has been deleted

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

Change-Id: Ib5e79c905b75b8085668b35bafe46e0c20b999f5
Reviewed-on: https://gerrit.tine20.org/tine20/1923
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8242: Turkish does not work / throws an error
Philipp Schüle [Tue, 23 Apr 2013 15:44:58 +0000 (17:44 +0200)]
#8242: Turkish does not work / throws an error

- use language (without region) as fallback to find extjs translation
file

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

Change-Id: Ia10cb644ac1871eb4d7a9ecffbcb216a28a35ad6
Reviewed-on: https://gerrit.tine20.org/tine20/1930
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago0007940: update transifex strings
Philipp Schüle [Wed, 24 Apr 2013 13:33:16 +0000 (15:33 +0200)]
0007940: update transifex strings

8 years agoimproved testSaveAuthenticationRedirectSettings assertions #2
Philipp Schüle [Wed, 24 Apr 2013 13:03:24 +0000 (15:03 +0200)]
improved testSaveAuthenticationRedirectSettings assertions #2

Change-Id: I31e55c718ff96a7a0c5dd655c1f511d25f286cb8
Reviewed-on: https://gerrit.tine20.org/tine20/1939
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'pu/2013.03-modelconfig-hr/inventory'
Philipp Schüle [Wed, 24 Apr 2013 11:31:39 +0000 (13:31 +0200)]
Merge branch 'pu/2013.03-modelconfig-hr/inventory'

8 years ago0008240: Inventory_Import_CsvTest::testImportOfCSVWithHook fails
sstamer [Wed, 24 Apr 2013 08:44:53 +0000 (10:44 +0200)]
0008240: Inventory_Import_CsvTest::testImportOfCSVWithHook fails
sometimes

-Depending on the test execution directory the file is not found

Change-Id: I34a600ca08b8bf7e6767d804134fe58dfb29814a
Reviewed-on: https://gerrit.tine20.org/tine20/1932
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Wed, 24 Apr 2013 09:11:12 +0000 (11:11 +0200)]
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/js/ApplicationStarter.js

8 years agoMerge branch 'pu/2013.03/modelconfig-hr'
Philipp Schüle [Wed, 24 Apr 2013 09:08:11 +0000 (11:08 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr'

8 years ago #8178: multiedit field: allow to edit with one click
Alexander Stintzing [Tue, 23 Apr 2013 15:43:07 +0000 (17:43 +0200)]
 #8178: multiedit field: allow to edit with one click

- click / on focus: editable
- show 'x' to clear
- onkeypress: show undo button

https://forge.tine20.org/mantisbt/view.php?id=8178
Change-Id: I8cb4cb412fa43a1c147dbb16cf697dcf51754bee
Reviewed-on: https://gerrit.tine20.org/tine20/1935
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agofix bytes renderer in applicationstarter
Alexander Stintzing [Mon, 22 Apr 2013 17:19:56 +0000 (19:19 +0200)]
fix bytes renderer in applicationstarter

Change-Id: Ied1ffcdfd4c8b7f0ac682bd1a901c96a7f7c5822
Reviewed-on: https://gerrit.tine20.org/tine20/1934
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoimproved testSaveAuthenticationRedirectSettings assertions
Philipp Schüle [Tue, 23 Apr 2013 16:20:17 +0000 (18:20 +0200)]
improved testSaveAuthenticationRedirectSettings assertions

Change-Id: I716e07edfbaf096c657979246bdaa40c7b50c96d
Reviewed-on: https://gerrit.tine20.org/tine20/1937
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agofixed inventory test:
Alexander Stintzing [Tue, 23 Apr 2013 15:51:07 +0000 (17:51 +0200)]
fixed inventory test:

Inventory_Import_CsvTest::testImportOfExampleFile

Change-Id: I4fc4fc1d153170c109c39959a5e624d45e136cab
Reviewed-on: https://gerrit.tine20.org/tine20/1936
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Tue, 23 Apr 2013 12:29:48 +0000 (14:29 +0200)]
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/js/LoginPanel.js

8 years agoMerge branch 'pu/2013.03-modelconfig-hr/inventory'
Philipp Schüle [Tue, 23 Apr 2013 12:28:37 +0000 (14:28 +0200)]
Merge branch 'pu/2013.03-modelconfig-hr/inventory'

8 years agoinventory test for container_id filter
Alexander Stintzing [Thu, 4 Apr 2013 14:01:26 +0000 (16:01 +0200)]
inventory test for container_id filter

Change-Id: Ie2828b8ab396969793ff0564cd5989420de59296
Reviewed-on: https://gerrit.tine20.org/tine20/1860
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0008208: show translation status in language combo
Cornelius Weiß [Mon, 22 Apr 2013 11:46:37 +0000 (13:46 +0200)]
0008208: show translation status in language combo

Change-Id: I29f5a5bb57b7c299ab0dda61e5ef35804f6d16ab
Reviewed-on: https://gerrit.tine20.org/tine20/1912
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Mon, 22 Apr 2013 13:12:32 +0000 (15:12 +0200)]
Merge branch '2013.03'

8 years agoMantis#0006050 Expresso#5798
Fernando Lages [Wed, 10 Apr 2013 13:47:21 +0000 (10:47 -0300)]
Mantis#0006050 Expresso#5798

Allow multiple themes

Change-Id: If73fcabd0a0d9c4fea180b9dc7c000b8e9c6be00
Reviewed-on: https://gerrit.tine20.org/tine20/1899
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#7934: change pw button active even if it is not allowed
Philipp Schüle [Mon, 22 Apr 2013 09:57:19 +0000 (11:57 +0200)]
#7934: change pw button active even if it is not allowed

- allow to set default value in config definition
- added boolean config type sanitizing
- removed some old comments ("get all configs at once", ...)
- added transaction (with rollback) to Tinebase_JsonTests

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

Change-Id: I37f04c1a88b74fb654049288127f13fd24bc0ca9
Reviewed-on: https://gerrit.tine20.org/tine20/1914
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8184: files with umlauts cannot be attached with safari
Philipp Schüle [Fri, 19 Apr 2013 09:41:45 +0000 (11:41 +0200)]
#8184: files with umlauts cannot be attached with safari

- added TempFile tests class
- sanitize filename (convert to UTF8)

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

Change-Id: Idd56fbc7a65cf7b36036f1626fdf69ed0de811f4
Reviewed-on: https://gerrit.tine20.org/tine20/1925
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8076: wrong language on initial login
Philipp Schüle [Thu, 18 Apr 2013 20:24:36 +0000 (22:24 +0200)]
#8076: wrong language on initial login

- could not reproduce the error
- just improved the logging and removed an obsolete param

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

Change-Id: I0bd20083e1b48573294cca68edccff427ef052d1
Reviewed-on: https://gerrit.tine20.org/tine20/1924
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoupdate lang templates
Philipp Schüle [Fri, 19 Apr 2013 06:23:18 +0000 (08:23 +0200)]
update lang templates

8 years agoMerge branch '2013.03'
Philipp Schüle [Fri, 19 Apr 2013 06:18:49 +0000 (08:18 +0200)]
Merge branch '2013.03'

8 years ago#8114: Re-Syncing users and groups from LDAP throws exception
Philipp Schüle [Thu, 18 Apr 2013 19:10:21 +0000 (21:10 +0200)]
#8114: Re-Syncing users and groups from LDAP throws exception

- try to fetch the group by name, too
- delete group in sql backend if it does not exist in ldap

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

Change-Id: Id67a0f62078d29fcb37c497ce8935337c82ab0b1
Reviewed-on: https://gerrit.tine20.org/tine20/1916
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8062: add cleanup script for deleted files
Philipp Schüle [Thu, 18 Apr 2013 11:57:32 +0000 (13:57 +0200)]
#8062: add cleanup script for deleted files

- renamed TFS::clearDeletedFiles to clearDeletedFilesFromFilesystem
- added clearDeletedFiles() as CLI function for removing obsolete files
from filesystem and database
- added helper function to fileobject model that returns filesystem path
- added test (clearDeletedFilesFromDatabase)

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

Change-Id: Iab06812e1458a77effa20bddf0d43631cac4a545
Reviewed-on: https://gerrit.tine20.org/tine20/1922
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#7194: alias table in user admin dialog truncated
Philipp Schüle [Thu, 18 Apr 2013 20:39:35 +0000 (22:39 +0200)]
#7194: alias table in user admin dialog truncated

- could not reproduce the problem
- added test with 100 aliases

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

Change-Id: Ideba32de04879fe0b511b815fb8f5a24380e4770
Reviewed-on: https://gerrit.tine20.org/tine20/1813
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoSIP number with spaces and chars could crash
Nico Hessler [Mon, 15 Apr 2013 20:45:41 +0000 (22:45 +0200)]
SIP number with spaces and chars could crash

Change-Id: I58505c678753579f99aedde13b62f7c577037b22
Reviewed-on: https://gerrit.tine20.org/tine20/1904
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agosetting default minutes_before if missing
Philipp Schüle [Tue, 16 Apr 2013 15:12:42 +0000 (17:12 +0200)]
setting default minutes_before if missing

Change-Id: Idfc72c4bc57b66cd398fac57ed4bdb9a9b852737
Reviewed-on: https://gerrit.tine20.org/tine20/1908
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Thu, 18 Apr 2013 20:49:00 +0000 (22:49 +0200)]
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/Frontend/Json.php

8 years ago#6838: fix Calendar_Frontend_WebDAV_EventTests
Philipp Schüle [Tue, 16 Apr 2013 08:30:06 +0000 (10:30 +0200)]
#6838: fix Calendar_Frontend_WebDAV_EventTests

- fix if condition: we always need an attender here

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

Change-Id: I1b376826d8173bb3edfde04c6dc4605e91d26764
Reviewed-on: https://gerrit.tine20.org/tine20/1905
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#8118: Dates created on Pixi multiplied by each sync
Philipp Schüle [Thu, 18 Apr 2013 08:52:45 +0000 (10:52 +0200)]
#8118: Dates created on Pixi multiplied by each sync

- make sure that $event->attendee is a record set
- moved filtering of attendee with/without email to separate functions
- added helper function that fills the resolved attendee cache

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

Change-Id: I3024b0064c310aa2ac3048f266349b4d7d543bc4
Reviewed-on: https://gerrit.tine20.org/tine20/1920
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#7774: paging in group grid acts strange
Philipp Schüle [Thu, 18 Apr 2013 09:09:32 +0000 (11:09 +0200)]
#7774: paging in group grid acts strange

- fixed page size (25 -> 50)
- roles grid had the wrong page size, too

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

Change-Id: I8317b68f3c14075dae035aa2093f722194f72489
Reviewed-on: https://gerrit.tine20.org/tine20/1921
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#4686: RE: FWD: tags not recognized properly
Philipp Schüle [Wed, 17 Apr 2013 16:45:25 +0000 (18:45 +0200)]
#4686: RE: FWD: tags not recognized properly

- sanitize "Rép"

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

Change-Id: Idb8be8ef091890f5f513040bbf139e48f5d27e6b
Reviewed-on: https://gerrit.tine20.org/tine20/1919
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8130: Email Update Interval = 0 (never)
Philipp Schüle [Wed, 17 Apr 2013 16:34:39 +0000 (18:34 +0200)]
#8130: Email Update Interval = 0 (never)

- removed misleading description

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

Change-Id: I73412235abc05e95032d274e89b8c4abd203e41f
Reviewed-on: https://gerrit.tine20.org/tine20/1918
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#7576: New element in calendar: only calender, nothing else
Philipp Schüle [Wed, 17 Apr 2013 14:11:35 +0000 (16:11 +0200)]
#7576: New element in calendar: only calender, nothing else

- added missing property "splitAddButton"

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

Change-Id: I7bf3fb0915bab3cfbdfbfc44e709b5bdf4b18ada
Reviewed-on: https://gerrit.tine20.org/tine20/1915
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8066: deactivate phone app if phone backend not available
Philipp Schüle [Wed, 17 Apr 2013 15:13:45 +0000 (17:13 +0200)]
#8066: deactivate phone app if phone backend not available

- catch $applicationJson->getRegistryData() exceptions, too and disable
app

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

Change-Id: I4bfaa64d6da5170142c99aa2f12df4e747ebd0bc
Reviewed-on: https://gerrit.tine20.org/tine20/1917
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8216: HTMLPurifier: Allowed memory size exhausted
Philipp Schüle [Wed, 17 Apr 2013 13:18:44 +0000 (15:18 +0200)]
#8216: HTMLPurifier: Allowed memory size exhausted

- added some memory logging
- activate gc after purifiying a message

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

Change-Id: I3acee1dce921934da9e1ac09bd1309e31c4aca52
Reviewed-on: https://gerrit.tine20.org/tine20/1913
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agofixed fk handling in update script
Philipp Schüle [Wed, 17 Apr 2013 08:51:51 +0000 (10:51 +0200)]
fixed fk handling in update script

Change-Id: Icb0df5c2dfead4a6117080d54628df797f8c34cb
Reviewed-on: https://gerrit.tine20.org/tine20/1907
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agocheck PDO::MYSQL_ATTR_INIT_COMMAND constant before use
Philipp Schüle [Tue, 16 Apr 2013 15:34:42 +0000 (17:34 +0200)]
check PDO::MYSQL_ATTR_INIT_COMMAND constant before use

Change-Id: I8b3abe1bc0e9ac97e6e7da16107212dc1fd30a75
Reviewed-on: https://gerrit.tine20.org/tine20/1910
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agocatch fatal errors if iconv extension is missing
Philipp Schüle [Tue, 16 Apr 2013 15:31:34 +0000 (17:31 +0200)]
catch fatal errors if iconv extension is missing

Change-Id: Iaa8219d2ecc1648d8affaae475b724c990c264ca
Reviewed-on: https://gerrit.tine20.org/tine20/1909
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Thu, 18 Apr 2013 08:15:23 +0000 (10:15 +0200)]
Merge branch '2013.03'

8 years agofixed merge error in Calendar_Controller_Event
Philipp Schüle [Thu, 18 Apr 2013 08:13:59 +0000 (10:13 +0200)]
fixed merge error in Calendar_Controller_Event

8 years agoMantis#0008214 Expresso#5981
Antonio Carlos da Silva [Mon, 15 Apr 2013 18:32:10 +0000 (15:32 -0300)]
Mantis#0008214 Expresso#5981

Synchronize Contacts when login sucess, LDAP to BD.

Change-Id: I2e2df82d95ea75d818307e6098b68d33f13441a4
Reviewed-on: https://gerrit.tine20.org/tine20/1911
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Wed, 17 Apr 2013 17:18:28 +0000 (19:18 +0200)]
Merge branch '2013.03'

8 years agoMerge branch 'tine20.com/2012.10' into 2013.03
Philipp Schüle [Wed, 17 Apr 2013 17:17:35 +0000 (19:17 +0200)]
Merge branch 'tine20.com/2012.10' into 2013.03

Conflicts:
tine20/Calendar/Controller/Event.php

8 years ago#8172: displaycontainer_id not set when recur exception is created
Cornelius Weiß [Wed, 17 Apr 2013 16:40:31 +0000 (18:40 +0200)]
#8172: displaycontainer_id not set when recur exception is created

- repair script

@2012.03

Change-Id: I47137ded2934a2fb7464d683a8e003b951425ac3
Reviewed-on: http://gerrit.tine20.com/customers/75
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0008122: broken State after update to Kristina
Cornelius Weiß [Tue, 16 Apr 2013 13:26:41 +0000 (15:26 +0200)]
0008122: broken State after update to Kristina

handle situation when state has more contents than the code

Change-Id: Iacd6f174654f8bd03b9b8e7df62cbf377e1f56c2
Reviewed-on: https://gerrit.tine20.org/tine20/1906
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#8172: displaycontainer_id not set when exception is created
Philipp Schüle [Wed, 17 Apr 2013 08:22:16 +0000 (10:22 +0200)]
#8172: displaycontainer_id not set when exception is created

- always add displaycontainer when creating new attendee in
createRecurException
- some minor code and debugging improvements
- added test for caldav create+put with new recur exception

@2012.03

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

Change-Id: Ia1ca4863b75c8adfb567f4c43bf9515e9639a9f8
Reviewed-on: http://gerrit.tine20.com/customers/84
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Wed, 17 Apr 2013 14:06:33 +0000 (16:06 +0200)]
Merge branch '2013.03'

Conflicts:
tine20/Calendar/Frontend/Cli.php

8 years agoMerge branch 'tine20.com/2012.10' into 2013.03
Philipp Schüle [Wed, 17 Apr 2013 14:05:14 +0000 (16:05 +0200)]
Merge branch 'tine20.com/2012.10' into 2013.03

8 years ago#8182: event with lots of exceptions breaks calendar sync
Philipp Schüle [Mon, 15 Apr 2013 14:42:22 +0000 (16:42 +0200)]
#8182: event with lots of exceptions breaks calendar sync

- added a function for removal of duplicate events
- add cli call for deleteDuplicateEvents()
- added some debugging & hoping to find the error

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

Change-Id: Iae99366eebfaeadf736ac3b28aab75f4ba40ae23
Reviewed-on: http://gerrit.tine20.com/customers/82
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>
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
8 years agofixed CLI return codes
Philipp Schüle [Mon, 15 Apr 2013 10:38:10 +0000 (12:38 +0200)]
fixed CLI return codes

- needed for monitoring checks

Change-Id: I04ae7b42f789cff85faccbb7ffa74ec12713e25a
Reviewed-on: http://gerrit.tine20.com/customers/83
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>
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
8 years ago#7524: Ext.ux.log does not work in build
Philipp Schüle [Wed, 17 Apr 2013 10:12:24 +0000 (12:12 +0200)]
#7524: Ext.ux.log does not work in build

- fixed regexp for buildtype/date/revision (it replaced initial loglevel
with a string "DEBUG")

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

Change-Id: Ic5fa714ad002db7511de7aefd4149145fa3394f4
Reviewed-on: http://gerrit.tine20.com/customers/86
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
8 years ago0006582: filtertoolbar breaks when using subfilters in favorite
Cornelius Weiß [Tue, 16 Apr 2013 14:28:50 +0000 (16:28 +0200)]
0006582: filtertoolbar breaks when using subfilters in favorite

- don't use filter id's saved on server

Change-Id: I4695efda642f3bdae865bf265ace6cb29feb7aef
Reviewed-on: http://gerrit.tine20.com/customers/85
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>
8 years agoMerge branch '2013.03'
Philipp Schüle [Tue, 16 Apr 2013 08:00:04 +0000 (10:00 +0200)]
Merge branch '2013.03'

Conflicts:
tine20/Inventory/Model/InventoryItem.php

8 years ago#8124: removed unused columns from contact grid
Philipp Schüle [Mon, 15 Apr 2013 14:46:46 +0000 (16:46 +0200)]
#8124: removed unused columns from contact grid

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

Change-Id: I482069817191408a26a212bb6584f1fa7bb08ef2
Reviewed-on: https://gerrit.tine20.org/tine20/1898
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago0008040: import breaks with malformated datetimes
Cornelius Weiß [Mon, 15 Apr 2013 11:39:01 +0000 (13:39 +0200)]
0008040: import breaks with malformated datetimes

-add unittest for datetimes
-fix unittest
-fix inventoryItem
--missing types (datetime)

Change-Id: I1491db809adc27aaf64a1d3f24a5faff5dc56c8d
Reviewed-on: https://gerrit.tine20.org/tine20/1805
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoFilemanager minor fixes
Filip Visic [Mon, 15 Apr 2013 10:55:17 +0000 (12:55 +0200)]
Filemanager minor fixes

Change-Id: Ie2307d9d17fe5b9fb914c94eee3b7ac8290c6e49
Reviewed-on: https://gerrit.tine20.org/tine20/1878
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2013.03'
Philipp Schüle [Mon, 15 Apr 2013 11:31:35 +0000 (13:31 +0200)]
Merge branch '2013.03'

8 years agoMerge branch 'tine20.com/2012.10' into 2013.03
Philipp Schüle [Mon, 15 Apr 2013 11:31:06 +0000 (13:31 +0200)]
Merge branch 'tine20.com/2012.10' into 2013.03

Conflicts:
tine20/Calendar/Setup/Update/Release6.php
tine20/Calendar/Setup/setup.xml

8 years ago#8052: Change in user preference alters admin preferences
Philipp Schüle [Fri, 12 Apr 2013 11:47:19 +0000 (13:47 +0200)]
#8052: Change in user preference alters admin preferences

- fixed accidental overwriting of admin / default preferences
- added test + some code cleanup

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

Change-Id: I18475b11fec36f066dac020d041ef5c59fd53f45
Reviewed-on: http://gerrit.tine20.com/customers/81
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
8 years ago#8196: Preferences values contains translated value
Philipp Schüle [Fri, 12 Apr 2013 11:15:03 +0000 (13:15 +0200)]
#8196: Preferences values contains translated value

- fixed integer preference field validation
- added update script for broken default alarm prefs

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

Change-Id: I331707b5b7239fffc677df64c8166d7a57d0a3be
Reviewed-on: http://gerrit.tine20.com/customers/80
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
8 years agoMerge branch 'pu/2013.03/modelconfig-hr'
Philipp Schüle [Fri, 12 Apr 2013 09:14:26 +0000 (11:14 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr'

8 years agoMerge branch '2013.03'
Philipp Schüle [Fri, 12 Apr 2013 09:14:15 +0000 (11:14 +0200)]
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/js/widgets/dialog/EditDialog.js

8 years agoMerge branch 'tine20.com/2012.10' into 2013.03
Philipp Schüle [Fri, 12 Apr 2013 09:11:01 +0000 (11:11 +0200)]
Merge branch 'tine20.com/2012.10' into 2013.03

8 years ago #8186: catch Integrity constraint violations in state update script
Alexander Stintzing [Wed, 10 Apr 2013 10:23:48 +0000 (12:23 +0200)]
 #8186: catch Integrity constraint violations in state update script

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

Change-Id: I20ae37f61600b934725b0601ea545b7776d68848
Reviewed-on: https://gerrit.tine20.org/tine20/1889
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0008144: when setting "last used filter" as default favorite fb breaks
Cornelius Weiß [Thu, 11 Apr 2013 11:26:49 +0000 (13:26 +0200)]
0008144: when setting "last used filter" as default favorite fb breaks
sometimes

- fix OR filters

Change-Id: I8b3c2e19a58925f65f0d264f7617290e82c90a4f
Reviewed-on: http://gerrit.tine20.com/customers/78
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>
8 years agocleanup global vars
Cornelius Weiß [Wed, 10 Apr 2013 18:41:54 +0000 (20:41 +0200)]
cleanup global vars

Change-Id: I6582366e789753562546fba3798f91d896f23880
Reviewed-on: http://gerrit.tine20.com/customers/77
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agore add lost variable
Cornelius Weiß [Thu, 11 Apr 2013 10:00:56 +0000 (12:00 +0200)]
re add lost variable

Change-Id: Ic0c1755f61d1d8b284ebc23ded070626260ba63d
Reviewed-on: https://gerrit.tine20.org/tine20/1894
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago #8140: Numeric value out of range when saving employee
Alexander Stintzing [Wed, 10 Apr 2013 10:44:22 +0000 (12:44 +0200)]
 #8140: Numeric value out of range when saving employee

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

Change-Id: I180b4363baf650718cc39b293665e3fe41030971
Reviewed-on: https://gerrit.tine20.org/tine20/1888
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago #8188: displaypanel does not update empty fields
Alexander Stintzing [Wed, 10 Apr 2013 11:52:42 +0000 (13:52 +0200)]
 #8188: displaypanel does not update empty fields

updating a field of the displaypanel fails, if the field is empty. the value of the previous selected record is shown.

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

Change-Id: Ibaa7a113ba4f2ab5f0b8185fe2911b0dd43306ee
Reviewed-on: https://gerrit.tine20.org/tine20/1890
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago0008144: when setting "last used filter" as default favorite fb breaks
Cornelius Weiß [Tue, 9 Apr 2013 12:24:06 +0000 (14:24 +0200)]
0008144: when setting "last used filter" as default favorite fb breaks
sometimes

state encoding converts null to empty object
-> take encoder/decoder from Ext 4.1 where this is fixed

Change-Id: I5548a1239db177a304ce2073a71858a4b7923915
Reviewed-on: https://gerrit.tine20.org/tine20/1882
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago #8132: Humanresources breaks with PostgreSQL
Alexander Stintzing [Wed, 10 Apr 2013 14:31:21 +0000 (16:31 +0200)]
 #8132: Humanresources breaks with PostgreSQL

 - fix import

https://forge.tine20.org/mantisbt/view.php?id=8132
Change-Id: If2381edca58ecabf100b4b6570e4238fde3a0df9
Reviewed-on: https://gerrit.tine20.org/tine20/1891
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoapplicationstarter - create js boolean filter correctly
Alexander Stintzing [Wed, 10 Apr 2013 16:17:39 +0000 (18:17 +0200)]
applicationstarter - create js boolean filter correctly

Change-Id: I18d5197ba16a280f842caaa58b9f650ea80d4a09
Reviewed-on: https://gerrit.tine20.org/tine20/1892
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#8154: Unable to view multiple mails in different windows
Philipp Schüle [Fri, 5 Apr 2013 13:14:18 +0000 (15:14 +0200)]
#8154: Unable to view multiple mails in different windows

- record is passed as json encoded string now
- added json decode to fetch record id

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

Change-Id: I2b5fb365a0109f531006c53a5e2e9a99a6e57803
Reviewed-on: https://gerrit.tine20.org/tine20/1864
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago0008192: javascript error after copy record
Cornelius Weiß [Wed, 10 Apr 2013 18:40:08 +0000 (20:40 +0200)]
0008192: javascript error after copy record

Change-Id: I450188cef87a95c8c5fb7455d0980d5ecada4092
Reviewed-on: https://gerrit.tine20.org/tine20/1893
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoMerge branch 'pu/2013.03/modelconfig-hr'
Philipp Schüle [Tue, 9 Apr 2013 17:18:11 +0000 (19:18 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr'

8 years agoMerge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory
Philipp Schüle [Tue, 9 Apr 2013 17:17:39 +0000 (19:17 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory

8 years agohr fixes
Alexander Stintzing [Tue, 9 Apr 2013 08:57:01 +0000 (10:57 +0200)]
hr fixes
 - set correct timezone of dependent records in json
 - fixed tests
 - fixed container feastcalendar in contract details panel

Change-Id: Ib8668fb7f32967ad5804c9c6e442c5ba90b3311e
Reviewed-on: https://gerrit.tine20.org/tine20/1884
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #8148: js error when switching to addressbook
Alexander Stintzing [Tue, 9 Apr 2013 16:18:54 +0000 (18:18 +0200)]
 #8148: js error when switching to addressbook

https://forge.tine20.org/mantisbt/view.php?id=8148
Change-Id: I90e0f957e160b68946b6471876693d5a715940b3
Reviewed-on: https://gerrit.tine20.org/tine20/1886
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory
Philipp Schüle [Tue, 9 Apr 2013 12:49:57 +0000 (14:49 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory

8 years agoadd search question in FAQ and add button to Projects app
Filip Visic [Mon, 8 Apr 2013 09:22:33 +0000 (11:22 +0200)]
add search question in FAQ and add button to Projects app
Change-Id: Ic316e18d5b3e9d8ee57bb64ad2173bb666dc0ebf
Reviewed-on: https://gerrit.tine20.org/tine20/1876
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoremove unused var
Cornelius Weiß [Tue, 9 Apr 2013 08:18:07 +0000 (10:18 +0200)]
remove unused var

Change-Id: I11c766720f8dee216612a342c0c7f39bfddb0f17
Reviewed-on: https://gerrit.tine20.org/tine20/1880
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
8 years agoFix Import Example
sstamer [Tue, 9 Apr 2013 08:12:24 +0000 (10:12 +0200)]
Fix Import Example

- small fix
- 17-13-2013 is not a valid date and will break the import.
This is kinda bad for an import example file.
- add test for example file

Change-Id: I0988fb482130906bd389026b5394ee873ccfac6a
Reviewed-on: https://gerrit.tine20.org/tine20/1879
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'pu/2013.03/modelconfig-hr'
Philipp Schüle [Tue, 9 Apr 2013 08:24:29 +0000 (10:24 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr'

8 years agohr fixes, features, translations
Alexander Stintzing [Thu, 4 Apr 2013 16:03:52 +0000 (18:03 +0200)]
hr fixes, features, translations

- add number to costcenter on grid view
- translate to german: costcentergridpanel startdate, Book as vacation, Summary
- make contract details panel higher
- rearrange contract edit dialog fields
- always allow changing end date of contracts
- split freetime edit dialog to sickness, vacation
- show remaining vacation days in vacation edit dialog
- fix freetime edit dialog error on more than one contract
- delete accounts on employee deletion
- fix #8132: Humanresources breaks with PostgreSQL
    https://forge.tine20.org/mantisbt/view.php?id=8132
- fix #8158: fix german po file
    https://forge.tine20.org/mantisbt/view.php?id=8158
- fix #8140: Numeric value out of range when saving employee
    https://forge.tine20.org/mantisbt/view.php?id=8140
- fix #8138: could not edit a new employee contract a second time
    https://forge.tine20.org/mantisbt/view.php?id=8138
    - also affects freetimes
- fix #8150: HumanResources_JsonTests::testAccount fails sometimes
    https://forge.tine20.org/mantisbt/view.php?id=8150

Change-Id: I5596b8ab77bbc1d7dd24f7193c05829f4667abb5
Reviewed-on: https://gerrit.tine20.org/tine20/1863
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMantis#0008152 Expresso#5363
Antonio Carlos da Silva [Tue, 2 Apr 2013 12:01:24 +0000 (09:01 -0300)]
Mantis#0008152 Expresso#5363

Automatically fill username at login screen

Change-Id: Ib3ec34e1b7aec115f443286720bb459a4c93b1ed
Reviewed-on: https://gerrit.tine20.org/tine20/1862
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory
Philipp Schüle [Mon, 8 Apr 2013 11:39:55 +0000 (13:39 +0200)]
Merge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory

8 years agoreverted ifElse change and use correct dbCommand member var
Philipp Schüle [Mon, 8 Apr 2013 08:38:37 +0000 (10:38 +0200)]
reverted ifElse change and use correct dbCommand member var

Change-Id: I624d5a78ba45018f078c450865cee7d7080239ce
Reviewed-on: https://gerrit.tine20.org/tine20/1875
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoFelamimail minor fixes
Filip Visic [Mon, 1 Apr 2013 21:24:55 +0000 (23:24 +0200)]
Felamimail minor fixes
hange-Id: Idf4ef86644e8a2b28cc201b0eb327834b664f4ac
Change-Id: Ic7a7e5e93b98f6a3f933be232a9fc026f3931432
Reviewed-on: https://gerrit.tine20.org/tine20/1872
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoAdmin minor fixes
Filip Visic [Mon, 1 Apr 2013 21:05:57 +0000 (23:05 +0200)]
Admin minor fixes
Change-Id: I59f8f7981f24647ca18dfcfb1dff21abbe0f88b5
Reviewed-on: https://gerrit.tine20.org/tine20/1844
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoAddressbook minor fixes
Filip Visic [Mon, 1 Apr 2013 20:58:47 +0000 (22:58 +0200)]
Addressbook minor fixes
Change-Id: I23b990fe27292713d261731eb3795d3b43d687a8
Reviewed-on: https://gerrit.tine20.org/tine20/1843
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>