tine20
6 years agocleanup remove tabs
Filip Visic [Tue, 12 Nov 2013 07:03:53 +0000 (08:03 +0100)]
cleanup remove tabs

Change-Id: Idc68e75bc53c99d70d2dc66fecc4a216a534c645
Reviewed-on: https://gerrit.tine20.org/tine20/2520
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch 'pu/2013.10-longrun'
Philipp Schüle [Tue, 12 Nov 2013 12:05:49 +0000 (13:05 +0100)]
Merge branch 'pu/2013.10-longrun'

6 years agoMerge branch '2013.10'
Philipp Schüle [Tue, 12 Nov 2013 12:05:41 +0000 (13:05 +0100)]
Merge branch '2013.10'

6 years ago0009240: Contract editable state
Alexander Stintzing [Tue, 12 Nov 2013 11:15:29 +0000 (12:15 +0100)]
0009240: Contract editable state

A contract should not be editable if vacation has been booked already.
Currently sickness days are also used, but shouldn't

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

Change-Id: I7fe52784ef953ebaac565a6be7e57645afc10c88
Reviewed-on: https://gerrit.tine20.org/tine20/2522
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009214: Allow to edit costcenters
Alexander Stintzing [Mon, 11 Nov 2013 17:28:13 +0000 (18:28 +0100)]
0009214: Allow to edit costcenters

Allow to edit costcenters and to show the relations

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

Change-Id: Ic89827ea6b5e7f2a9944630c8a0dd1109cd03a6c
Reviewed-on: https://gerrit.tine20.org/tine20/2518
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agouse clone to copy dtstart
Philipp Schüle [Mon, 11 Nov 2013 16:25:21 +0000 (17:25 +0100)]
use clone to copy dtstart

Change-Id: Idc7c39d7122f6eb6d8ac138ad3933c4db772514a
Reviewed-on: https://gerrit.tine20.org/tine20/2516
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9176: iCal adds another backslash to description field
Philipp Schüle [Wed, 30 Oct 2013 15:21:14 +0000 (16:21 +0100)]
#9176: iCal adds another backslash to description field

- added a converter test (which did not find any problems)
- fixed some minor validation issues in abstract converter class

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

Change-Id: I38082794040e6defa99e8f91283588e650d5ef31
Reviewed-on: https://gerrit.tine20.org/tine20/2484
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoavoid duplicate PRODID
Lars Kneschke [Tue, 12 Nov 2013 06:16:03 +0000 (07:16 +0100)]
avoid duplicate PRODID

Change-Id: I39cc96f201c3edcc236bc09f9926e3e72c6c93aa
Reviewed-on: https://gerrit.tine20.org/tine20/2519
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agocatch exceptions when trying to set customfield filter
Philipp Schüle [Mon, 11 Nov 2013 20:12:02 +0000 (21:12 +0100)]
catch exceptions when trying to set customfield filter

6 years ago#9230: customfield search fails in MC apps
Philipp Schüle [Mon, 11 Nov 2013 15:32:34 +0000 (16:32 +0100)]
#9230: customfield search fails in MC apps

- added customfield filters to modelconfig bootstrapping

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

Change-Id: I1cd452b0788cfd33c5f80d2482fb07023dd0e870
Reviewed-on: https://gerrit.tine20.org/tine20/2514
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009232: Booked sickness and vacation days, feastdays are not shown in firefox
Alexander Stintzing [Mon, 11 Nov 2013 15:57:56 +0000 (16:57 +0100)]
0009232: Booked sickness and vacation days, feastdays are not shown in firefox

On adding some vacation-/sickness - days to an employee, the feast-,
sickness- and vacationdays are not shown in the datepicker.

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

Change-Id: Ie101922a2ff1a587364960e83e993278460fc0d3
Reviewed-on: https://gerrit.tine20.org/tine20/2515
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009224: remaining vacation days
Alexander Stintzing [Mon, 11 Nov 2013 11:39:44 +0000 (12:39 +0100)]
0009224: remaining vacation days

when editing vacation days of an employee, the days are
not substracted if the employee hasn't been saved already.

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

Change-Id: I38546a214bfe224a4afac1a68d50b094966af76f
Reviewed-on: https://gerrit.tine20.org/tine20/2512
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Mon, 11 Nov 2013 16:06:41 +0000 (17:06 +0100)]
Merge branch '2013.10'

6 years agoMerge branch '2013.03' into 2013.10
Philipp Schüle [Mon, 11 Nov 2013 15:58:31 +0000 (16:58 +0100)]
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Calendar/Controller/EventNotifications.php

6 years agodo not ignore errors of class_exists()
Philipp Schüle [Mon, 11 Nov 2013 14:30:30 +0000 (15:30 +0100)]
do not ignore errors of class_exists()

- and some minor code improvements / debugging

Change-Id: Ifc587c6359a279c06bc5f85b1e03f99c0f1bef2b
Reviewed-on: https://gerrit.tine20.org/tine20/2513
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoFix problem with all day events with no DTEND
Nico Hessler [Mon, 11 Nov 2013 09:22:54 +0000 (10:22 +0100)]
Fix problem with all day events with no DTEND

Change-Id: If98c295ca26f91be95f74973540b8674ee7bbb88
Reviewed-on: https://gerrit.tine20.org/tine20/2510
Tested-by: jenkins user
Reviewed-by: Nico Hessler <tine20@nico-hessler.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#8644: error when sending mail with note (wrong charset)
Philipp Schüle [Mon, 11 Nov 2013 09:41:40 +0000 (10:41 +0100)]
#8644: error when sending mail with note (wrong charset)

- trying to reproduce the problem
- added more filtering and debugging to note saving

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

Change-Id: I32148dbddb18d9d4855cdc434df4ddad0d81a3c1
Reviewed-on: http://gerrit.tine20.com/customers/198
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009190: find workaround for iCal rrule_until interpretation
Cornelius Weiß [Sat, 9 Nov 2013 17:07:39 +0000 (18:07 +0100)]
0009190: find workaround for iCal rrule_until interpretation

- neglect minor UNTIL modifications for modlog/notifications

Change-Id: I0df81257264d94d653088758164e4b83e0f4325d
Reviewed-on: http://gerrit.tine20.com/customers/205
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Mon, 11 Nov 2013 09:44:02 +0000 (10:44 +0100)]
Merge branch '2013.10'

6 years agoswitched to new Tinebase_Model_Tag::resolveTagNameToTag function
Lars Kneschke [Sun, 10 Nov 2013 08:20:46 +0000 (09:20 +0100)]
switched to new Tinebase_Model_Tag::resolveTagNameToTag function

Change-Id: Id8ed88c43f63ebed8ffa28b9fdca829cfd16cfd4
Reviewed-on: https://gerrit.tine20.org/tine20/2508
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agoadded a new function to resolve tag names to Tinebase_Tag_Model
Lars Kneschke [Sun, 10 Nov 2013 08:10:16 +0000 (09:10 +0100)]
added a new function to resolve tag names to Tinebase_Tag_Model

Change-Id: I3a12678515af370d95652b38ddfe8f3f70b9777b
Reviewed-on: https://gerrit.tine20.org/tine20/2507
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years ago0006488: Import categories from VCards
Michael Spahn [Sat, 9 Nov 2013 16:47:41 +0000 (17:47 +0100)]
0006488: Import categories from VCards

Have a look at: https://forge.tine20.org/mantisbt/view.php?id=6488

Change-Id: Ifdb7b798d97816b4c3045c9f66f893f9f071c7ee
Reviewed-on: https://gerrit.tine20.org/tine20/2468
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years ago0009154: quoting in compounds and notes
Lars Kneschke [Mon, 28 Oct 2013 16:03:33 +0000 (17:03 +0100)]
0009154: quoting in compounds and notes

- Updated \Sabre\VObject from version 2 to 3

Change-Id: I963e0055ef023ea7c8ded4fd7d4bfb7929eaeb05
Reviewed-on: https://gerrit.tine20.org/tine20/2475
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Fri, 8 Nov 2013 20:18:54 +0000 (21:18 +0100)]
Merge branch '2013.10'

6 years agoMerge branch 'pu/2013.10-longrun'
Philipp Schüle [Fri, 8 Nov 2013 20:18:48 +0000 (21:18 +0100)]
Merge branch 'pu/2013.10-longrun'

6 years ago#9218: add getNodesByContainer function
Philipp Schüle [Fri, 8 Nov 2013 14:12:49 +0000 (15:12 +0100)]
#9218: add getNodesByContainer function

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

Change-Id: Ida8f93af390d1f07cd5c81a5466ccb65cb1bac15
Reviewed-on: https://gerrit.tine20.org/tine20/2504
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009214: Allow to edit costcenters
Alexander Stintzing [Fri, 8 Nov 2013 09:50:52 +0000 (10:50 +0100)]
0009214: Allow to edit costcenters

Allow to edit costcenters and to show the relations

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

Change-Id: Ie6fe3dd55a6609c975e702320d2b326090e9acd8
Reviewed-on: https://gerrit.tine20.org/tine20/2502
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofix browsePlugin if no dropEl
Alexander Stintzing [Fri, 8 Nov 2013 13:54:59 +0000 (14:54 +0100)]
fix browsePlugin if no dropEl

Change-Id: I4e846331553d924275f3a6e684a8e67df2728af6
Reviewed-on: https://gerrit.tine20.org/tine20/2505
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009210: Allow to change relations
Alexander Stintzing [Thu, 7 Nov 2013 10:24:17 +0000 (11:24 +0100)]
0009210: Allow to change relations

There should be a cli method to change all relations
to a record to another one having the same model

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

Change-Id: I91102970b4ba22c557b44faa5f447e267ff64dac
Reviewed-on: https://gerrit.tine20.org/tine20/2501
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
6 years agoMerge branch '2013.10'
Philipp Schüle [Fri, 8 Nov 2013 12:23:07 +0000 (13:23 +0100)]
Merge branch '2013.10'

6 years agoMerge branch '2013.03' into 2013.10
Philipp Schüle [Fri, 8 Nov 2013 12:22:01 +0000 (13:22 +0100)]
Merge branch '2013.03' into 2013.10

6 years agoimproved debugging for sending mail via smtp
Philipp Schüle [Fri, 8 Nov 2013 09:46:27 +0000 (10:46 +0100)]
improved debugging for sending mail via smtp

- show the current config in the log

Change-Id: I9a9393dcb4a8b4f94d09099bf12802954b411fe3
Reviewed-on: http://gerrit.tine20.com/customers/204
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009190: find workaround for iCal rrule_until interpretation
Cornelius Weiß [Fri, 1 Nov 2013 16:50:21 +0000 (17:50 +0100)]
0009190: find workaround for iCal rrule_until interpretation

Set until to end of the day of the last occurence.
NOTE: this is in contrast to the iCal spec which says until should
      be the dtstart of the last occurence. But as the client with
      the name of the spec sets it to the end of the day, we do it
      also.

Change-Id: I0df81257264d94d653088758164e4b83e0f4325c
Reviewed-on: http://gerrit.tine20.com/customers/197
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009216: When editing a contract again, the template shows a date
Alexander Stintzing [Fri, 8 Nov 2013 11:52:20 +0000 (12:52 +0100)]
0009216: When editing a contract again, the template shows a date

When editing a contract again, the template shows a date

 - also use float insted of integer when handling daily working hours

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

Change-Id: Ic7b658d1ad9549e3d0cd903258f7b58bbe6ac4ed
Reviewed-on: https://gerrit.tine20.org/tine20/2503
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoavoid CORS handling for file:// origins
Lars Kneschke [Sun, 3 Nov 2013 08:17:07 +0000 (09:17 +0100)]
avoid CORS handling for file:// origins

Change-Id: Ica2dc5f31cccd568736209a425d60bd7f90ccc66
Reviewed-on: https://gerrit.tine20.org/tine20/2498
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009202: contracts aren't editable and overlapping results in an unhandled exception
Alexander Stintzing [Tue, 5 Nov 2013 13:55:35 +0000 (14:55 +0100)]
0009202: contracts aren't editable and overlapping results in an unhandled exception

Contracts must not be editable if a vacation has been booked already, but they
aren't if a sickness has been booked already, too. If a new contract overlaps
with another one, thereshould be a nicer message than the bugreport dialog.

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

Change-Id: I9c5cc0e79d36b6dbf254d9296388c14793e0ad21
Reviewed-on: https://gerrit.tine20.org/tine20/2499
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009192: Vacation- and sickness-day grid sorting
Alexander Stintzing [Fri, 1 Nov 2013 15:48:50 +0000 (16:48 +0100)]
0009192: Vacation- and sickness-day grid sorting

the sorting is not local, so on clicking the header, all times of all employees and all types are shown.

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

Change-Id: I0e5466febca4a66c8d9aeb7059798e5933a1dfae
Reviewed-on: https://gerrit.tine20.org/tine20/2492
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009200: remaining vacation days doesn't get updated sometimes
Alexander Stintzing [Mon, 4 Nov 2013 18:49:52 +0000 (19:49 +0100)]
0009200: remaining vacation days doesn't get updated sometimes

sometimes switching the account does not switch the remaining vacation days in freetime edit dialog

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

Change-Id: I1e2183cae5493be9afbf2ffa14487c444f34dbcc
Reviewed-on: https://gerrit.tine20.org/tine20/2496
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Mon, 4 Nov 2013 11:35:03 +0000 (12:35 +0100)]
Merge branch '2013.10'

6 years agoMerge branch '2013.03' into 2013.10
Philipp Schüle [Mon, 4 Nov 2013 11:29:15 +0000 (12:29 +0100)]
Merge branch '2013.03' into 2013.10

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

6 years agoTypo
AirMike [Fri, 1 Nov 2013 21:51:40 +0000 (22:51 +0100)]
Typo

Change-Id: I47afb9133c6e2aa63a3fa08e1bb831a5aaf45d33
Reviewed-on: https://gerrit.tine20.org/tine20/2494
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoalso compress JSON content
Lars Kneschke [Sun, 3 Nov 2013 09:06:40 +0000 (10:06 +0100)]
also compress JSON content

Change-Id: I0a29aff59c7b54cf7fd069bef5bed89406f24376
Reviewed-on: https://gerrit.tine20.org/tine20/2495
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoTypo
AirMike [Fri, 1 Nov 2013 21:51:40 +0000 (22:51 +0100)]
Typo

Change-Id: I47afb9133c6e2aa63a3fa08e1bb831a5aaf45d33
Reviewed-on: https://gerrit.tine20.org/tine20/2494
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009186: OSX CalDAV does not sync
Cornelius Weiß [Thu, 31 Oct 2013 12:36:42 +0000 (13:36 +0100)]
0009186: OSX CalDAV does not sync

- only match for OSX Addressbook
- cope with reordered version

Change-Id: Ife8ce8ad87d3bbbb02a212329ce2877911245125
Reviewed-on: http://gerrit.tine20.com/customers/196
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#8976: Passwords in plaintext in apache2-log
Philipp Schüle [Thu, 31 Oct 2013 13:08:28 +0000 (14:08 +0100)]
#8976: Passwords in plaintext in apache2-log

- catch and log exception correctly
- improved handle() fn a little bit
- improved _removeCredentials regex

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

Change-Id: I013526eae877c59409ac45d0401e6b613ea233b0
Reviewed-on: https://gerrit.tine20.org/tine20/2490
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agolog exception in Tinebase_Server_Http which has been thrown in Tinebase_Http_Server
Alexander Stintzing [Thu, 31 Oct 2013 15:18:28 +0000 (16:18 +0100)]
log exception in Tinebase_Server_Http which has been thrown in Tinebase_Http_Server

Change-Id: I0b9195b27080811d3085da83767439c0a95626ed
Reviewed-on: https://gerrit.tine20.org/tine20/2491
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years ago0009188: some minor gui fixes
Alexander Stintzing [Fri, 1 Nov 2013 18:40:36 +0000 (19:40 +0100)]
0009188: some minor gui fixes

on deleting vacation, sickness or extra vacation, the title of the
dialog shows "(undefined.." instead of the description of the record

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

Change-Id: I6ea2aed4302c5bebaa07905fbd9829783c622d56
Reviewed-on: https://gerrit.tine20.org/tine20/2493
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Thu, 31 Oct 2013 12:23:17 +0000 (13:23 +0100)]
Merge branch '2013.10'

6 years agoMerge branch '2013.03' into 2013.10
Philipp Schüle [Thu, 31 Oct 2013 12:21:32 +0000 (13:21 +0100)]
Merge branch '2013.03' into 2013.10

6 years agocope with missing creation_time
Cornelius Weiß [Thu, 31 Oct 2013 09:23:43 +0000 (10:23 +0100)]
cope with missing creation_time

Change-Id: I69ef0abe4f696091f1befe0906a2eb1a958bfdff
Reviewed-on: https://gerrit.tine20.org/tine20/2488
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agouse tags for opendocument and tzconvert libs
Philipp Schüle [Wed, 30 Oct 2013 17:18:58 +0000 (18:18 +0100)]
use tags for opendocument and tzconvert libs

- and updated composer.lock

Change-Id: I0df81257264d94d653088758164e4b83e0f4325b
Reviewed-on: https://gerrit.tine20.org/tine20/2487
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agouse get_class to evaluate className
Philipp Schüle [Wed, 30 Oct 2013 16:39:17 +0000 (17:39 +0100)]
use get_class to evaluate className

Change-Id: I77bb8a1089ce705bd3672ff56f34e418c4224653
Reviewed-on: https://gerrit.tine20.org/tine20/2486
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9180: saveUser: Call to undefined method insertProperty
Philipp Schüle [Wed, 30 Oct 2013 17:27:56 +0000 (18:27 +0100)]
#9180: saveUser: Call to undefined method insertProperty

- insertProperty is called addProperty

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

Change-Id: I5bf7f6bf9a8986b53fea6e9993a85b209287fdc4
Reviewed-on: http://gerrit.tine20.com/customers/193
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoimproved another notes test
Philipp Schüle [Wed, 30 Oct 2013 15:42:45 +0000 (16:42 +0100)]
improved another notes test

Change-Id: Ife8ce8ad87d3bbbb02a212329ce2877911245124
Reviewed-on: https://gerrit.tine20.org/tine20/2485
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009178: HR fixes
Alexander Stintzing [Wed, 30 Oct 2013 15:12:31 +0000 (16:12 +0100)]
0009178: HR fixes

- saved record does not count own vacation days -> remaining too much
- if a vacation time gets deleted, the remaining vacation days in the freetime edit dialog are not updated (not enough days)
- if a vacation gets overbooked by sickness having more than one day, aan error occurs
- default status set to excused (sickness) and accepted (vacation),
- old vacaton days don't show days_count and end_date

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

Change-Id: I69ef0abe4f696091f1befe0906a2eb1a958bfdf9
Reviewed-on: https://gerrit.tine20.org/tine20/2483
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Wed, 30 Oct 2013 15:31:11 +0000 (16:31 +0100)]
Merge branch '2013.10'

6 years agoMerge branch '2013.03' into 2013.10
Philipp Schüle [Wed, 30 Oct 2013 13:56:59 +0000 (14:56 +0100)]
Merge branch '2013.03' into 2013.10

6 years ago#9148: fix test testRecuringAlarmWithThisAndFutureSplit
Philipp Schüle [Wed, 30 Oct 2013 13:19:25 +0000 (14:19 +0100)]
#9148: fix test testRecuringAlarmWithThisAndFutureSplit

- handle DST boundaries

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

Change-Id: Ib72808f6812b321f0455ba5a8e7e67ecf8590845
Reviewed-on: http://gerrit.tine20.com/customers/191
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Wed, 30 Oct 2013 12:48:19 +0000 (13:48 +0100)]
Merge branch '2013.10'

6 years ago#9090: can not save record after fixing validation error
Philipp Schüle [Tue, 29 Oct 2013 13:55:25 +0000 (14:55 +0100)]
#9090: can not save record after fixing validation error

- set saving flag of edit dialog to false

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

Change-Id: I2a71d2e2d6ef5044bef80f768d8c78c9b072d173
Reviewed-on: https://gerrit.tine20.org/tine20/2480
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago #9150 (#9168): sickness days should be bookable on vacation days
Alexander Stintzing [Mon, 28 Oct 2013 19:18:58 +0000 (20:18 +0100)]
 #9150 (#9168): sickness days should be bookable on vacation days

when an employee is sick in his vacation, this sickness days should be bookable

 - also resolved rendering failure of freetime days_count
 - respect extra vacation days in freetime edit dialog
 - highlight dates in freetime edit dialog (vacation, sickness, feast, days not to work on by contract)

also resolved https://forge.tine20.org/mantisbt/view.php?id=9168
 - when saving sickness days, the last and first date flips

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

Change-Id: Iad351b82d2e078905447a4a01f9b31b398e56d91
Reviewed-on: https://gerrit.tine20.org/tine20/2478
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9156: some names for favorites are not accepted
Philipp Schüle [Tue, 29 Oct 2013 09:23:02 +0000 (10:23 +0100)]
#9156: some names for favorites are not accepted

- improved error handling and program flow

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

Change-Id: Ied6b42d78e2d1d8e09b76c4ea65778e1bb9900df
Reviewed-on: https://gerrit.tine20.org/tine20/2477
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9152: saving of record fails because of too many relations
Philipp Schüle [Tue, 29 Oct 2013 09:24:54 +0000 (10:24 +0100)]
#9152: saving of record fails because of too many relations

- make sure, the old/new_value fields are longtext (clob)
- added getDb() getters to setup backends

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

Change-Id: I19fe360bc6b16169fbaa8feb73251b38e8aca4f1
Reviewed-on: https://gerrit.tine20.org/tine20/2476
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Wed, 30 Oct 2013 10:50:58 +0000 (11:50 +0100)]
Merge branch '2013.10'

6 years agosome minor typos
Philipp Schüle [Tue, 29 Oct 2013 13:48:31 +0000 (14:48 +0100)]
some minor typos

Change-Id: I83a42f653354263bab43e2dcc9cdd0af1515f41d
Reviewed-on: https://gerrit.tine20.org/tine20/2479
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009078: HR: booking unexcused sickness days as vacation days
Alexander Stintzing [Fri, 18 Oct 2013 16:13:32 +0000 (18:13 +0200)]
0009078: HR: booking unexcused sickness days as vacation days

when booking unexcused sickness days as vacation days and the
employee doesn't have any vacation days left, this should be indicated

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

Change-Id: I45155e532238e10858aaf9f486e78be5fd1dfc62
Reviewed-on: https://gerrit.tine20.org/tine20/2463
Tested-by: jenkins user
Reviewed-by: Alexander Stintzing <a.stintzing@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agorelation picker grid panel fixes
Alexander Stintzing [Tue, 22 Oct 2013 06:52:41 +0000 (08:52 +0200)]
relation picker grid panel fixes

Change-Id: I27057f547823158d2bea07b4b8f9ecdd5fd7b974
Reviewed-on: https://gerrit.tine20.org/tine20/2466
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agorecords property might be missing
Philipp Schüle [Mon, 28 Oct 2013 12:24:19 +0000 (13:24 +0100)]
records property might be missing

Change-Id: I7226399bcc441124994aac57b007db81dafd995a
Reviewed-on: https://gerrit.tine20.org/tine20/2474
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9116: fix testParallelAlarmTrigger
Philipp Schüle [Mon, 28 Oct 2013 19:23:53 +0000 (20:23 +0100)]
#9116: fix testParallelAlarmTrigger

- temporarily disable test as it fails randomly

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

Change-Id: I6de1a56d96b4f18e69eb867460988377b89b75e0

6 years ago8886: Translate WorkingTime records
Michael Spahn [Mon, 28 Oct 2013 12:35:25 +0000 (13:35 +0100)]
8886: Translate WorkingTime records

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

Change-Id: Id9a44f68e0d9b6717b3a4013b9ddcbc670f7e537
Reviewed-on: https://gerrit.tine20.org/tine20/2467
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0007658: Carddav multiple Adressbooks on MacOSX
Cornelius Weiß [Fri, 25 Oct 2013 14:44:03 +0000 (16:44 +0200)]
0007658: Carddav multiple Adressbooks on MacOSX

add global meta addressbook for OSX client

Change-Id: I963e0055ef023ea7c8ded4fd7d4bfb7929eaeb02
Reviewed-on: https://gerrit.tine20.org/tine20/2473
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.10'
Philipp Schüle [Mon, 28 Oct 2013 15:00:25 +0000 (16:00 +0100)]
Merge branch '2013.10'

6 years agoupdated to Syncroton 1.0
Lars Kneschke [Sat, 26 Oct 2013 14:19:58 +0000 (16:19 +0200)]
updated to Syncroton 1.0

Change-Id: I3b051f932d60457ea85719fdb99ebf88befa6b27
Reviewed-on: https://gerrit.tine20.org/tine20/2470
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009106: VCard converters broken and won't sync when image present
Cornelius Weiß [Fri, 25 Oct 2013 14:41:01 +0000 (16:41 +0200)]
0009106: VCard converters broken and won't sync when image present

images need to be b64 encoded as found out by ingoratsdorf

Change-Id: I963e0055ef023ea7c8ded4fd7d4bfb7929eaeb01
Reviewed-on: https://gerrit.tine20.org/tine20/2465
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009120: Enable edit dialog button after error while saving
Michael Spahn [Mon, 28 Oct 2013 11:07:43 +0000 (12:07 +0100)]
0009120: Enable edit dialog button after error while saving

- added this.saving = false to several edit dialogs (onRequestFailed)

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

Change-Id: I16e7d1f796d64e06dde35f48599dc3d941b4c13d
Reviewed-on: https://gerrit.tine20.org/tine20/2459
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch '2013.03' into 2013.10
Philipp Schüle [Mon, 28 Oct 2013 11:24:23 +0000 (12:24 +0100)]
Merge branch '2013.03' into 2013.10

6 years ago0009138: Increases birthday field size to make it visible
Michael Spahn [Sat, 26 Oct 2013 15:13:18 +0000 (17:13 +0200)]
0009138: Increases birthday field size to make it visible

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

Change-Id: I18ea3905433bf19262a097a27a8a22c99d1906eb
Reviewed-on: https://gerrit.tine20.org/tine20/2471
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9148: fix test testRecuringAlarmAfterSeriesEnds
Philipp Schüle [Mon, 28 Oct 2013 10:50:56 +0000 (11:50 +0100)]
#9148: fix test testRecuringAlarmAfterSeriesEnds

- use recur event for rrule assertion to prevent dst boundary problems

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

Change-Id: I7fb629c138d515e038b4358d920221c397f73a4b
Reviewed-on: http://gerrit.tine20.com/customers/190
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 ago0009140: Make Filemanager visible for regular users
Michael Spahn [Sat, 26 Oct 2013 12:44:28 +0000 (14:44 +0200)]
0009140: Make Filemanager visible for regular users

Change-Id: Ieaa77e14bed5411474b59c0e90fa36958f4fcb3a
Reviewed-on: https://gerrit.tine20.org/tine20/2469
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agohelper function for user agent dependent actions
Cornelius Weiß [Mon, 28 Oct 2013 09:28:49 +0000 (10:28 +0100)]
helper function for user agent dependent actions

Change-Id: I963e0055ef023ea7c8ded4fd7d4bfb7929eaeb04
Reviewed-on: http://gerrit.tine20.com/customers/189
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agodetect addressbook from OSX Mavericks
Cornelius Weiß [Mon, 28 Oct 2013 09:26:44 +0000 (10:26 +0100)]
detect addressbook from OSX Mavericks

Change-Id: I963e0055ef023ea7c8ded4fd7d4bfb7929eaeb03
Reviewed-on: http://gerrit.tine20.com/customers/188
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoimproved notes test
Philipp Schüle [Fri, 25 Oct 2013 19:06:58 +0000 (21:06 +0200)]
improved notes test

6 years agoMerge branch '2013.10'
Philipp Schüle [Fri, 25 Oct 2013 12:51:15 +0000 (14:51 +0200)]
Merge branch '2013.10'

6 years ago#9052: cache ImportExportDefinition::getOptionsAsZendConfigXml
Nico Hessler [Fri, 25 Oct 2013 11:09:14 +0000 (13:09 +0200)]
#9052: cache ImportExportDefinition::getOptionsAsZendConfigXml

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

Change-Id: I57759eb728e56cdae9381ecb2efbe04c9abccb4c
Reviewed-on: https://gerrit.tine20.org/tine20/2421
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago #9064 (#9074): allow to book vacation days from next year
Alexander Stintzing [Tue, 15 Oct 2013 10:53:41 +0000 (12:53 +0200)]
 #9064 (#9074): allow to book vacation days from next year

If an employee has no vacation days left in a year,
it should be possible to book vacation days from another account.

 - also resolved
#9074: the vacation and sickness grid should show the days count and the last date
https://forge.tine20.org/mantisbt/view.php?id=9074

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

Change-Id: I6ce19febae28862fee88b3dda758bb3d5c641fd1
Reviewed-on: https://gerrit.tine20.org/tine20/2462
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoavoid duplicate json encoding
Lars Kneschke [Fri, 25 Oct 2013 12:29:24 +0000 (14:29 +0200)]
avoid duplicate json encoding

Change-Id: I0dce426920d7be6fd2bf126dc0334c13b087a858
Reviewed-on: https://gerrit.tine20.org/tine20/2464
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago9032: Fixes license and credit links in the about dialog
Michael Spahn [Fri, 25 Oct 2013 07:52:33 +0000 (09:52 +0200)]
9032: Fixes license and credit links in the about dialog

Change-Id: Ic3a5723fb89a8044357e885dc96e02dcb9cd4369
Reviewed-on: https://gerrit.tine20.org/tine20/2461
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadded some TRACE logging when inserting TASKs
Philipp Schüle [Thu, 24 Oct 2013 14:08:45 +0000 (16:08 +0200)]
added some TRACE logging when inserting TASKs

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

Change-Id: I3dd60950d9ca180ed664e61357d2effb8e32d082
Reviewed-on: https://gerrit.tine20.org/tine20/2460
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009112: Method HumanResources.searchContracts not found
Alexander Stintzing [Tue, 22 Oct 2013 16:55:48 +0000 (18:55 +0200)]
0009112: Method HumanResources.searchContracts not found

 - disable sort in contracts grid panel

Change-Id: I0b0785ba83da9ab039929fd4efa091dd1f94625e

6 years ago0009092: Models without constraints config can't be related to a record
Alexander Stintzing [Mon, 21 Oct 2013 13:50:15 +0000 (15:50 +0200)]
0009092: Models without constraints config can't be related to a record

Models without constraints config can't be handled by the GenericPickerGridPanel (e.g. HR account)

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

Change-Id: I963e0055ef023ea7c8ded4fd7d4bfb7929eaeb00
Reviewed-on: https://gerrit.tine20.org/tine20/2457
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009088: HR QuickSearch
Alexander Stintzing [Mon, 21 Oct 2013 11:40:17 +0000 (13:40 +0200)]
0009088: HR QuickSearch

the quicksearch filter should work with employee names

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

Change-Id: Ia9f2117c1ec8273392ba2020bab2fb9251498ebe
Reviewed-on: https://gerrit.tine20.org/tine20/2438
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoincreased height of infopanel for survey panel
Philipp Schüle [Wed, 23 Oct 2013 15:33:47 +0000 (17:33 +0200)]
increased height of infopanel for survey panel

6 years agoupdated changelogs for 2013.10.1
Philipp Schüle [Wed, 23 Oct 2013 13:32:21 +0000 (15:32 +0200)]
updated changelogs for 2013.10.1

6 years ago#8624: update transifex strings
Philipp Schüle [Wed, 23 Oct 2013 13:26:18 +0000 (15:26 +0200)]
#8624: update transifex strings

6 years agoupdate lang templates
Philipp Schüle [Wed, 23 Oct 2013 12:55:41 +0000 (14:55 +0200)]
update lang templates

6 years ago0009114: Freeetime edit dialog doesn't calculate recurring feast days
Alexander Stintzing [Wed, 23 Oct 2013 10:38:02 +0000 (12:38 +0200)]
0009114: Freeetime edit dialog doesn't calculate recurring feast days

if a feast day is a recurring event in the feast calendar, recurrings won't be shown

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

Change-Id: Ifab5894c3efea89e01bdea489b395745a83dbd45
Reviewed-on: https://gerrit.tine20.org/tine20/2455
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
6 years ago0009110: Weekdays should have a spinner in the contract edit dialog
Alexander Stintzing [Tue, 22 Oct 2013 17:24:58 +0000 (19:24 +0200)]
0009110: Weekdays should have a spinner in the contract edit dialog

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

Change-Id: I97f1af4a4eb1417b4ee8e034ab857d09a05c44fc
Reviewed-on: https://gerrit.tine20.org/tine20/2453
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoUpdated Univention packaging (add missing files)
Lars Kneschke [Wed, 23 Oct 2013 05:48:19 +0000 (07:48 +0200)]
Updated Univention packaging (add missing files)

Change-Id: I49819230c4bab0f340c3a479eeaeeeb7ddb017bf
Reviewed-on: https://gerrit.tine20.org/tine20/2456
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Lars Kneschke <l.kneschke@metaways.de>
6 years agoallow to have \,, \: and space in setup options
Lars Kneschke [Wed, 23 Oct 2013 05:15:54 +0000 (07:15 +0200)]
allow to have \,, \: and space in setup options

needed to setup ldap settings from cli

Change-Id: I8dafdcdf34d84f00e007a2e957c262c68f7c6ee8
Reviewed-on: https://gerrit.tine20.org/tine20/2450
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoAdmin - fix print page for Containers and Customfields
AirMike [Tue, 22 Oct 2013 22:00:08 +0000 (00:00 +0200)]
Admin - fix print page for Containers and Customfields

Change-Id: If81817ba52653d27584c5a2b70447c907f2a6292
Reviewed-on: https://gerrit.tine20.org/tine20/2449
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>