tine20
6 years agoMerge branch 'pu/2013.10-longrun'
Philipp Schüle [Thu, 11 Sep 2014 10:07:53 +0000 (12:07 +0200)]
Merge branch 'pu/2013.10-longrun'

6 years agoFix incorrect update script for Tinebase
Michael Spahn [Wed, 10 Sep 2014 12:28:06 +0000 (14:28 +0200)]
Fix incorrect update script for Tinebase

Change-Id: Ie53fbdf8ee7279527fbc5c1e19730e532f83f82d
Reviewed-on: https://gerrit.tine20.org/tine20/2883
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch 'pu/2013.10-emaillinks'
Philipp Schüle [Wed, 10 Sep 2014 17:22:35 +0000 (19:22 +0200)]
Merge branch 'pu/2013.10-emaillinks'

Conflicts:
tests/tine20/Tinebase/AllTests.php

Change-Id: I575126534bb580135cc70a062a1de760084031cb

6 years ago0009840: urls without anchor tags should be replaced
Michael Spahn [Tue, 2 Sep 2014 14:07:39 +0000 (16:07 +0200)]
0009840: urls without anchor tags should be replaced

... with links in html mail parts

heavly inspired by
https://gitorious.org/expresso_livre/fgsl-expressolivre3/
commit/c17d391e3863705538adac91c43b72b703d210a8

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

Change-Id: I8d0b2d9c7d58c7d18726529e33ad0652e3c736a7
Reviewed-on: http://gerrit.tine20.com/customers/792
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010042: Show Organizer in Task-Grid of a Lead (2)
Alexander Stintzing [Fri, 5 Sep 2014 10:18:42 +0000 (12:18 +0200)]
0010042: Show Organizer in Task-Grid of a Lead (2)

The organizer should be shown in the task gridpanel of the lead-edit-dialog

 - show horizontal scrollbar

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

Change-Id: I421711a3abf4d4c1362a69e6b4e8b43af79bd28e
Reviewed-on: http://gerrit.tine20.com/customers/1098
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 agoTranslations
sstamer [Wed, 10 Sep 2014 12:55:21 +0000 (14:55 +0200)]
Translations

Change-Id: If69cc8e053cbae87ea1486cb638e11354d0f15d2
Reviewed-on: https://gerrit.tine20.org/tine20/2886
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoFix merge mistake
Michael Spahn [Wed, 10 Sep 2014 12:51:08 +0000 (14:51 +0200)]
Fix merge mistake

 - duplicate function

Change-Id: I96645880c4cc1fa824511fe32c4306a55b89c421
Reviewed-on: https://gerrit.tine20.org/tine20/2885
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMerge branch 'pu/2013.10-longrun'
Philipp Schüle [Wed, 10 Sep 2014 11:17:20 +0000 (13:17 +0200)]
Merge branch 'pu/2013.10-longrun'

Conflicts:
tests/tine20/Sales/JsonTest.php
tine20/Calendar/Model/Rrule.php
tine20/Sales/Controller/NumberableAbstract.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/WebDav/Root.php
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot
tine20/composer.lock

Change-Id: I9105c48440ae5f0341528122abbfdc3b627cd2db

6 years agovarious packaging updates
Lars Kneschke [Fri, 5 Sep 2014 09:38:58 +0000 (11:38 +0200)]
various packaging updates

- splitted debian patches into smaller chunks, to make future updates
easier
- added init_plugins.php to tine20-tinebase package

Change-Id: Ic0b46d41a2f2c8945fce341259889249ae8fd674
Reviewed-on: https://gerrit.tine20.org/tine20/2880
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010176: Dependent Records: Do not try to normalize id of existing records
Alexander Stintzing [Thu, 28 Aug 2014 11:31:48 +0000 (13:31 +0200)]
0010176: Dependent Records: Do not try to normalize id of existing records

Do not try to normalize id of existing records if the dependent record has
been created already.

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

Change-Id: Ibf992e96fb093bc74e18e357472c5710e0ec0516
Reviewed-on: http://gerrit.tine20.com/customers/1058
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoCrm: add translation for "Organizer"
Alexander Stintzing [Fri, 15 Aug 2014 14:23:17 +0000 (16:23 +0200)]
Crm: add translation for "Organizer"

Change-Id: Ibca9103faeca95640c1c4f6d2f9df068ce2f561a
Reviewed-on: http://gerrit.tine20.com/customers/999
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010042: Show Organizer in Task-Grid of a Lead
Alexander Stintzing [Tue, 8 Jul 2014 14:08:25 +0000 (16:08 +0200)]
0010042: Show Organizer in Task-Grid of a Lead

The organizer should be shown in the task gridpanel of the lead-edit-dialog

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

Change-Id: I7e61af0728c2b2b5ef7e9432aa630d4de16b9ce3
Reviewed-on: http://gerrit.tine20.com/customers/837
Tested-by: Jenkins CI (http://ci.tine20.com/)
Tested-by: sstamer <s.stamer@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010036: Highlight important tasks
Alexander Stintzing [Tue, 8 Jul 2014 09:11:58 +0000 (11:11 +0200)]
0010036: Highlight important tasks

tasks with leadstate_id is not closed or accepted (ending) and
having a resubmission date or scheduled end date which is in
the past should be highlighted in the grid

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

Change-Id: Iefa2b41664d1ce24789e96057ac1751ba8153bc7
Reviewed-on: http://gerrit.tine20.com/customers/833
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: sstamer <s.stamer@metaways.de>
6 years ago0009958: replace _setRightChecks with doRightChecks
Alexander Stintzing [Thu, 17 Jul 2014 10:15:48 +0000 (12:15 +0200)]
0009958: replace _setRightChecks with doRightChecks

_setRightChecks() -> doRightChecks() in Tinebase_Controller_Record_Abstract

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

Change-Id: I11c2bd01db217913b582218674b82d00fa3d2e07
Reviewed-on: http://gerrit.tine20.com/customers/878
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoallow to group the grid
Alexander Stintzing [Fri, 11 Jul 2014 17:08:27 +0000 (19:08 +0200)]
allow to group the grid

Change-Id: I1f1b5d12b1864b5edc928cd297f3d283dd04f613
Reviewed-on: http://gerrit.tine20.com/customers/856
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010050: Delete last dependent record fails
Alexander Stintzing [Thu, 10 Jul 2014 13:45:32 +0000 (15:45 +0200)]
0010050: Delete last dependent record fails

When removing the latest dependent record of a parent record and
saving the parent record, the dependent record won't be deleted.

Also allows to set the message height of the ExceptionHandlerDialog.

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

Change-Id: Ibbc8809324285cd17d597c9fc868771f97881801
Reviewed-on: http://gerrit.tine20.com/customers/844
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010038: add estimated_end to grid
Alexander Stintzing [Tue, 8 Jul 2014 09:24:02 +0000 (11:24 +0200)]
0010038: add estimated_end to grid

it should be sortable and filterable

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

Change-Id: Ib76fdd248e9537a0757c7a5d13c01507d5b85ff4
Reviewed-on: http://gerrit.tine20.com/customers/834
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 agotest adding contract
Alexander Stintzing [Mon, 30 Jun 2014 10:01:44 +0000 (12:01 +0200)]
test adding contract

 - with manually setting the end_date of the contract before

Change-Id: I7aaddf93102ae96dc5246299d467622590553ee0
Reviewed-on: http://gerrit.tine20.com/customers/803
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoenable container acl checks for calendar tests by default
Philipp Schüle [Thu, 12 Jun 2014 19:14:12 +0000 (21:14 +0200)]
enable container acl checks for calendar tests by default

Change-Id: I2da44420eed154c50a764bc0ac86f1ab564a3376
Reviewed-on: http://gerrit.tine20.com/customers/765
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agodate time enhancements
Alexander Stintzing [Wed, 11 Jun 2014 11:37:14 +0000 (13:37 +0200)]
date time enhancements

 - allow before/after OR Equals parameter

Change-Id: I70551c4a08607349d75e9aa5f47a6f7292051c3f
Reviewed-on: http://gerrit.tine20.com/customers/754
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
6 years ago0009962: do not update related records per default
Alexander Stintzing [Wed, 4 Jun 2014 16:05:26 +0000 (18:05 +0200)]
0009962: do not update related records per default

on updating records, the controller should not update
related records, but relations on update per default

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

Change-Id: Ica5bc10361bbb045a75972cffa8a829d34a021c6
Reviewed-on: http://gerrit.tine20.com/customers/734
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agotimetracker - faster controllers
Alexander Stintzing [Fri, 30 May 2014 10:50:48 +0000 (12:50 +0200)]
timetracker - faster controllers

 - allow to disable some expensive checks

Change-Id: Ie8eb02dacf07ea206e8b8a8b3803fa52431ace75
Reviewed-on: http://gerrit.tine20.com/customers/718
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoallow to disable rights check public
Alexander Stintzing [Fri, 30 May 2014 11:01:14 +0000 (13:01 +0200)]
allow to disable rights check public

Change-Id: I80eb166b5790157df21590cfc9a17e24cae02b14
Reviewed-on: http://gerrit.tine20.com/customers/710
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009938: Change AccountPickerValue on Year Change
Alexander Stintzing [Mon, 26 May 2014 09:37:16 +0000 (11:37 +0200)]
0009938: Change AccountPickerValue on Year Change

When changing the year by using the datepicker,
the account picker does not show the current account.

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

Change-Id: Iae516dd6c817a1db294192121b107d0fba08da86
Reviewed-on: http://gerrit.tine20.com/customers/694
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009928: do not fetch relations the user do not have the right for
Alexander Stintzing [Tue, 20 May 2014 11:29:24 +0000 (13:29 +0200)]
0009928: do not fetch relations the user do not have the right for

If a user does not have the manage right for a model, and
a manage right is defined, the relations should not be returned
anymore.

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

Change-Id: I04941d8adde4dc35c5e26ea4b14b3698e2a3a999
Reviewed-on: http://gerrit.tine20.com/customers/687
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago9920: set CSP and STS security header
Lars Kneschke [Tue, 13 May 2014 20:14:07 +0000 (22:14 +0200)]
9920: set CSP and STS security header

Task-Url: https://forge.tine20.org/mantisbt/view.php?id=9920

Change-Id: Ib874952b2a3810815352560b6a3e93b15023d6aa
Reviewed-on: http://gerrit.tine20.com/customers/685
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 agoadd before_or_equals, after_or_equals operator to month filter
Alexander Stintzing [Thu, 22 May 2014 13:00:04 +0000 (15:00 +0200)]
add before_or_equals, after_or_equals operator to month filter

Change-Id: I67e576e87e7bd080e187928b9a241b717ca6525c
Reviewed-on: http://gerrit.tine20.com/customers/679
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agodon't fetch records fields on search per default
Philipp Schüle [Wed, 21 May 2014 15:18:51 +0000 (17:18 +0200)]
don't fetch records fields on search per default

* sets $multiple param to false by default

Change-Id: I484304d4393da3970bf3eda5b55c1c1e5c15fe7e
Reviewed-on: http://gerrit.tine20.com/customers/675
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agosales really fix numberable.abstract
Alexander Stintzing [Wed, 21 May 2014 12:32:44 +0000 (14:32 +0200)]
sales really fix numberable.abstract

Change-Id: I3a13d513e6266d6d5cf80f5f459bb3a104501a53
Reviewed-on: http://gerrit.tine20.com/customers/670
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agosales.numberable handle prefix
Alexander Stintzing [Wed, 21 May 2014 11:56:20 +0000 (13:56 +0200)]
sales.numberable handle prefix

Change-Id: If12134499b709b74541cffbe57e08e5879a120bf
Reviewed-on: http://gerrit.tine20.com/customers/669
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agodon't fetch records fields on search per default
Alexander Stintzing [Mon, 19 May 2014 11:59:23 +0000 (13:59 +0200)]
don't fetch records fields on search per default

 - search get's slower
   -> create "omitOnSearch" - parameter for models
      using the modelconfiguration

Change-Id: I99b769a22d037e11d9b9c14176d0df8191530c22
Reviewed-on: http://gerrit.tine20.com/customers/656
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agocorrect handling of prefix
Alexander Stintzing [Wed, 14 May 2014 15:14:15 +0000 (17:14 +0200)]
correct handling of prefix

Change-Id: I7b8b7ea259008033c6409fc7a85bbf8e226717c1
Reviewed-on: http://gerrit.tine20.com/customers/637
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoactivates cost center and product modlog
Alexander Stintzing [Thu, 15 May 2014 11:04:26 +0000 (13:04 +0200)]
activates cost center and product modlog

Change-Id: I2e837f4bcad9757be3908710617957e878805d2a
Reviewed-on: http://gerrit.tine20.com/customers/644
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoNew Example Application
sstamer [Tue, 13 May 2014 11:45:19 +0000 (13:45 +0200)]
New Example Application

- Using Model Config
- Tests

Change-Id: I5ce2fce9bfae4120b6dc21bdff76cf428a88fb4e
Reviewed-on: http://gerrit.tine20.com/customers/633
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoRevert "0009460: Updating vacation days does not update grid before saving the employee"
Alexander Stintzing [Tue, 6 May 2014 14:32:12 +0000 (16:32 +0200)]
Revert "0009460: Updating vacation days does not update grid before saving the employee"

This reverts commit 6c60fa1b019c45987f305b496fce05e8cadf3c0e.

Change-Id: I1f34df216b7af5202739ac479b3e8d94f8b8dcd8
Reviewed-on: http://gerrit.tine20.com/customers/605
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009884: Allow to show totalcount of exported records
Alexander Stintzing [Tue, 29 Apr 2014 14:59:15 +0000 (16:59 +0200)]
0009884: Allow to show totalcount of exported records

the ods export allow to show the total
count of all exported records

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

Change-Id: Id0e4b0c290850dae043d0f653026616fd6d9ba27
Reviewed-on: http://gerrit.tine20.com/customers/590
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9872: fix duplicate translations in de.po
Philipp Schüle [Tue, 29 Apr 2014 07:30:40 +0000 (09:30 +0200)]
#9872: fix duplicate translations in de.po

* removes duplicate "Cost Center" translation

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

6 years ago0009872: fix duplicate translations in de.po
Alexander Stintzing [Mon, 28 Apr 2014 10:30:36 +0000 (12:30 +0200)]
0009872: fix duplicate translations in de.po

fix duplicate translations in de.po

 - added filter sales.costcenter

Change-Id: I108bf374d5a2fd1998aa29077e7bbb37c39b9096
Reviewed-on: http://gerrit.tine20.com/customers/565
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009862: Allow a grouping grid
Alexander Stintzing [Wed, 23 Apr 2014 13:58:37 +0000 (15:58 +0200)]
0009862: Allow a grouping grid

Allow to group a grid by a property

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

Change-Id: I4f593841e11f0460901c009983d8d61e000bea02
Reviewed-on: http://gerrit.tine20.com/customers/552
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofix generic picker grid panel
Alexander Stintzing [Thu, 17 Apr 2014 08:39:30 +0000 (10:39 +0200)]
fix generic picker grid panel

* checks if constraints config for model is available
* corrects typo (constrains -> constraints)
* checks property existance first

Change-Id: If9dcc7b198152a52b8eef079a6f739bc2dbf1c89
Reviewed-on: http://gerrit.tine20.com/customers/542
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofix conditions panel in felamimail sieve rules
Alexander Stintzing [Tue, 15 Apr 2014 11:06:01 +0000 (13:06 +0200)]
fix conditions panel in felamimail sieve rules

Change-Id: I055e35ceea48c5a132f999ee83f3c520a2a7d393
Reviewed-on: http://gerrit.tine20.com/customers/525
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 ago@see: 0009768: Use ModelConfig for Timetracker models
Alexander Stintzing [Tue, 1 Apr 2014 11:34:28 +0000 (13:34 +0200)]
@see: 0009768: Use ModelConfig for Timetracker models

 - create js title renderer registry
 - better mc input filter handling
 - better mc date handling

Change-Id: I05949982a0acfe6003ec68095b726d367f9582bb
Reviewed-on: http://gerrit.tine20.com/customers/497
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009460: Updating vacation days does not update grid before saving the employee
Alexander Stintzing [Mon, 17 Feb 2014 17:12:36 +0000 (18:12 +0100)]
0009460: Updating vacation days does not update grid before saving the employee

When editing an already saved vacation, the vacation gridpanel
does not update the last day before saving the employee again.

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

Change-Id: Ic9e5d21cd99fa3c76d9fa104fbae5ac0ed906c5e
Reviewed-on: http://gerrit.tine20.com/customers/488
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0008840: relations config - constraints from the other side
Alexander Stintzing [Wed, 19 Feb 2014 18:09:24 +0000 (19:09 +0100)]
0008840: relations config - constraints from the other side

relation panel does not respect the constraints config
if defined on the side of the related_record.

 - validate in backend
 - nicer gui, better exception handling

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

Change-Id: I058277930004387a4a4ac4e21c589cbf73705daa
Reviewed-on: http://gerrit.tine20.com/customers/453
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 ago0009774: allow to define which relations should be fetched on search
Alexander Stintzing [Thu, 13 Mar 2014 16:50:40 +0000 (17:50 +0100)]
0009774: allow to define which relations should be fetched on search

if searching for records having many relations, it's very expensive.
So we need a parameter which allows to fetch relations with a special
related model.

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

Change-Id: I77ff8ed082b2481b7f8c32159e91ef3d7020ab44
Reviewed-on: http://gerrit.tine20.com/customers/472
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 ago@see: 0009786: remove container from grid
Alexander Stintzing [Fri, 21 Mar 2014 11:07:00 +0000 (12:07 +0100)]
@see: 0009786: remove container from grid

Change-Id: Icadbf5f86e7a92eab3c0e15edcb315d24d903333
Reviewed-on: http://gerrit.tine20.com/customers/462
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoresize account description field
Alexander Stintzing [Wed, 19 Mar 2014 14:10:26 +0000 (15:10 +0100)]
resize account description field

Change-Id: I6377850f2f65c97dafb8b7cdfe8f4f4bf400e2e6
Reviewed-on: http://gerrit.tine20.com/customers/454
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009760: resolve dependent records with virtual fields properly
Alexander Stintzing [Wed, 12 Mar 2014 11:46:17 +0000 (12:46 +0100)]
0009760: resolve dependent records with virtual fields properly

resolve dependent records with virtual fields properly

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

Change-Id: I4d803a316d22a1095d2e93dfd40f5e461385407e
Reviewed-on: http://gerrit.tine20.com/customers/438
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agothrow meaningful exception if non-array record is detected
Philipp Schüle [Sat, 8 Mar 2014 09:31:43 +0000 (10:31 +0100)]
throw meaningful exception if non-array record is detected

Change-Id: Ic68031a5abf9333b8f2c2b20a9ea31b19e7ce6a9
Reviewed-on: http://gerrit.tine20.com/customers/422
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009746: ODS export empty lines
Philipp Schüle [Wed, 12 Mar 2014 21:26:40 +0000 (22:26 +0100)]
0009746: ODS export empty lines

- fixes test case for other locales than "en"

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

Change-Id: I13e1a9975e4a29cbc7a36051527ae18d9cc04431
Reviewed-on: http://gerrit.tine20.com/customers/433
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agocreate tinebase month filter
Alexander Stintzing [Fri, 7 Mar 2014 11:52:41 +0000 (12:52 +0100)]
create tinebase month filter

Change-Id: Iee4d3cad0c5f87807bbf87fa030422d8f1ea4502
Reviewed-on: http://gerrit.tine20.com/customers/409
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agochecks if relations are present
Philipp Schüle [Fri, 7 Mar 2014 11:07:34 +0000 (12:07 +0100)]
checks if relations are present

Change-Id: I9b6d2d3be92450edf58c88b7e075a39d2ab6766f
Reviewed-on: http://gerrit.tine20.com/customers/408
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009726: relation grid panel does not cleanup invalid rows on delete
Alexander Stintzing [Mon, 3 Mar 2014 14:38:10 +0000 (15:38 +0100)]
0009726: relation grid panel does not cleanup invalid rows on delete

if adding a relation which is forbidden by constraints config, the panel
marks the new relation with a red border, but not the old one. On deleting
the old one, validating still fails, the grid doesn't get updated.

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

Change-Id: If335b6305f9b82801203c4d080530b60a3f29f79
Reviewed-on: https://gerrit.tine20.org/tine20/2807
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoRevert "0008840: relations config - constraints from the other side"
Philipp Schüle [Wed, 19 Feb 2014 18:07:27 +0000 (19:07 +0100)]
Revert "0008840: relations config - constraints from the other side"

This reverts commit 085e49d097e40a085552d28c792d463b2ce52a73.

6 years ago0008840: relations config - constraints from the other side
Alexander Stintzing [Tue, 19 Nov 2013 13:35:01 +0000 (14:35 +0100)]
0008840: relations config - constraints from the other side

relation panel does not respect the constraints config
if defined on the side of the related_record.

 - validate in backend

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

Change-Id: I058277930004387a4a4ac4e21c589cbf73705d78
Reviewed-on: https://gerrit.tine20.org/tine20/2798
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009622: Allow to configure the default mail client
Alexander Stintzing [Fri, 31 Jan 2014 10:38:18 +0000 (11:38 +0100)]
0009622: Allow to configure the default mail client

Some applications have mailto links (Addressbook DetailsPanel) which
opens FelamiMail per default. Some users use an external client per
default which should be opened on click that link.

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

Change-Id: I84ea116fb4df8a48b25b4d7c0cf78db6c6dfc00b
Reviewed-on: https://gerrit.tine20.org/tine20/2770
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009592: Adding a new cost center to a employee fails
Alexander Stintzing [Fri, 31 Jan 2014 13:14:55 +0000 (14:14 +0100)]
0009592: Adding a new cost center to a employee fails

Adding a new cost center to a employee fails if there are vacations booked already
 - do not try update dependent records if they haven't changed

 - extends commit ea15381456727a77308c5afef6e298284c4fdb9d

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

Change-Id: I54329ed59f24d56e3384d1a35bae8478b769d79d
Reviewed-on: https://gerrit.tine20.org/tine20/2771
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-on: https://gerrit.tine20.org/tine20/2773

6 years agoRevert "0009592: Adding a new cost center to a employee fails"
Philipp Schüle [Fri, 31 Jan 2014 19:59:47 +0000 (20:59 +0100)]
Revert "0009592: Adding a new cost center to a employee fails"

the change caused some test failures which should be examined

This reverts commit 8a94f17e3be6884264f99823dd03cc9e4c11685b.

6 years agomakes update script more robust
Philipp Schüle [Fri, 31 Jan 2014 14:25:27 +0000 (15:25 +0100)]
makes update script more robust

6 years ago0009596: fix failing HR and Sales tests in pgsql tests
Alexander Stintzing [Tue, 28 Jan 2014 13:33:03 +0000 (14:33 +0100)]
0009596: fix failing HR and Sales tests in pgsql tests

fix failing HR and Sales tests in pgsql tests

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

Change-Id: I1ffb95cf07d3d0634cd357598e1ae611bd6af9f7
Reviewed-on: https://gerrit.tine20.org/tine20/2765
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agomake tcj a bit more robust
Alexander Stintzing [Wed, 29 Jan 2014 09:51:17 +0000 (10:51 +0100)]
make tcj a bit more robust

Change-Id: I183d305bbf40f1c13c9c6bd5ec894ec5773d2a59
Reviewed-on: https://gerrit.tine20.org/tine20/2764
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009572: Apply Modelconfig to Sales
Alexander Stintzing [Thu, 23 Jan 2014 11:35:52 +0000 (12:35 +0100)]
0009572: Apply Modelconfig to Sales

 - needs: https://gerrit.tine20.org/tine20/#/c/2759/

 - apply MC to the Sales App
 - Divisions: make module
 - Divisions: add history
 - Contracts: add start- and enddate
 - Contracts: remove fields: status, cleared, cleared_in

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

Change-Id: I68a10452ca844e710091f86bb736af64c05fef04
Reviewed-on: https://gerrit.tine20.org/tine20/2755
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009550: fix Sales_JsonTest.testAllCostCenterMethods
Alexander Stintzing [Thu, 23 Jan 2014 14:49:01 +0000 (15:49 +0100)]
0009550: fix Sales_JsonTest.testAllCostCenterMethods

fix Sales_JsonTest.testAllCostCenterMethods

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

Change-Id: I48c39371e0cf9349fd111ce8d8c936a89f1a1a8d
Reviewed-on: https://gerrit.tine20.org/tine20/2758
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoODS Export: allow column styles
Alexander Stintzing [Wed, 15 Jan 2014 15:24:12 +0000 (16:24 +0100)]
ODS Export: allow column styles

- updates composer.json / lockfile (metaways/opendocument)

Change-Id: Ia5043982b0a6f0cc94a2a59fcc786387623433de
Reviewed-on: https://gerrit.tine20.org/tine20/2732
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoallow to resolve relations in Tinebase_Convert_Json
Alexander Stintzing [Wed, 15 Jan 2014 13:50:12 +0000 (14:50 +0100)]
allow to resolve relations in Tinebase_Convert_Json

Change-Id: I851624a6689c9783eb5b20e37213beb4224e1d79
Reviewed-on: https://gerrit.tine20.org/tine20/2730
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago#9550: fix Sales_JsonTest.testAllCostCenterMethods
Philipp Schüle [Thu, 16 Jan 2014 09:02:43 +0000 (10:02 +0100)]
#9550: fix Sales_JsonTest.testAllCostCenterMethods

- disables the test

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

Change-Id: I4ca306209b7b0ad2823e1b2aea28c7feea51a4c6
Reviewed-on: https://gerrit.tine20.org/tine20/2737
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoMinor enhancements, modelConfig, RelationPickerCombo
Alexander Stintzing [Wed, 15 Jan 2014 13:57:06 +0000 (14:57 +0100)]
Minor enhancements, modelConfig, RelationPickerCombo

 - ModelConfig: add field key to field definition
 - create facade method for setReadOnly of RelationPickerCombo

Change-Id: I12cc9a89e3b3abeee2d7591740956b775aa3dd05
Reviewed-on: https://gerrit.tine20.org/tine20/2731
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoHumanResources: allow creating demo data twice
Alexander Stintzing [Wed, 15 Jan 2014 13:44:08 +0000 (14:44 +0100)]
HumanResources: allow creating demo data twice

Change-Id: Ic80472887d2d47899c1f1bbc62b64b9545cda64c
Reviewed-on: https://gerrit.tine20.org/tine20/2729
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadd description field to hr-account
Alexander Stintzing [Mon, 6 Jan 2014 10:07:23 +0000 (11:07 +0100)]
add description field to hr-account

Change-Id: I9857e9fdbfede69412ec5ed7341155caa9f3ba22
Reviewed-on: https://gerrit.tine20.org/tine20/2696
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agobetter resolving of dependent records when using modelconfig
Alexander Stintzing [Mon, 23 Dec 2013 15:59:56 +0000 (16:59 +0100)]
better resolving of dependent records when using modelconfig

Change-Id: Ibf16bca26acfa3fbc37e74f7c1013b7e6a7e1a8a
Reviewed-on: https://gerrit.tine20.org/tine20/2683
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agofix sales numberable
Alexander Stintzing [Tue, 17 Dec 2013 17:10:25 +0000 (18:10 +0100)]
fix sales numberable

Change-Id: Ib723a00eb3c5257a407631826bbf2ed1ee5d781f
Reviewed-on: https://gerrit.tine20.org/tine20/2667
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agorefactor sales
Alexander Stintzing [Wed, 11 Dec 2013 16:43:17 +0000 (17:43 +0100)]
refactor sales

 - use model instead of type in numbers to allow
   use of different models, will be more general later

 - Parent class of Sales_Exception changed from
   Exception to Tinebase_Exception

 - create abstract numberable class

 - whitespace changes and using php 5.3 style

 - added abstract ods export class

 - changed Sales_Model_Number + tests

Change-Id: Ie63362a4b93355f93fdd2640f18fad5bcf0cff58
Reviewed-on: https://gerrit.tine20.org/tine20/2651
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoresolve dependent records recursively
Alexander Stintzing [Mon, 9 Dec 2013 12:00:09 +0000 (13:00 +0100)]
resolve dependent records recursively

 - test will follow, when there is a case (atm. we don't
   have any models needing it in the current branch)
   -> https://forge.tine20.org/mantisbt/view.php?id=9378

Change-Id: Iaa6b28d66dbd640a2979a1b2c82750bb9738eb08
Reviewed-on: https://gerrit.tine20.org/tine20/2634
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009364: Make autocomplete field globally available
Alexander Stintzing [Mon, 9 Dec 2013 12:04:12 +0000 (13:04 +0100)]
0009364: Make autocomplete field globally available

autocomplete works in inventory, but we need that as a general feature.

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

Change-Id: I965f70e3fde93bf4202e428b752d2b007747a318
Reviewed-on: https://gerrit.tine20.org/tine20/2635
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agomake tags in demo data work well
Alexander Stintzing [Mon, 9 Dec 2013 12:15:47 +0000 (13:15 +0100)]
make tags in demo data work well

Change-Id: I3ae0ce03bd4071efe9beb90eddbf4a903b8ee143
Reviewed-on: https://gerrit.tine20.org/tine20/2636
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoadd missing property
Alexander Stintzing [Mon, 9 Dec 2013 13:07:12 +0000 (14:07 +0100)]
add missing property

Change-Id: I85b8a5988b3c3b39383ca65df74dadcea420fbe0
Reviewed-on: https://gerrit.tine20.org/tine20/2642
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
6 years agorefactor Sales_Frontend_Json
Alexander Stintzing [Mon, 9 Dec 2013 13:41:43 +0000 (14:41 +0100)]
refactor Sales_Frontend_Json

 - remove this->..controller properties

Change-Id: Id61a16a2301a2c860aadc53a5b1128482b27ba67
Reviewed-on: https://gerrit.tine20.org/tine20/2641
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
6 years ago0009372: Allow to add custom columns to gridpanel
Alexander Stintzing [Mon, 9 Dec 2013 11:47:12 +0000 (12:47 +0100)]
0009372: Allow to add custom columns to gridpanel

Sometimes we need additional columns in the grid. So make this possible

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

Change-Id: Iac689d8b98f0e7fc0c4dc9c315dd9ec713b2c19f
Reviewed-on: https://gerrit.tine20.org/tine20/2632
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009374: Allow to add actions to the grid rows
Alexander Stintzing [Mon, 9 Dec 2013 11:57:16 +0000 (12:57 +0100)]
0009374: Allow to add actions to the grid rows

Allow to add actions to the grid rows

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

Change-Id: If35b096950f22e0440da6acfa6eec4e18c016764
Reviewed-on: https://gerrit.tine20.org/tine20/2633
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoremove double return
Alexander Stintzing [Mon, 9 Dec 2013 12:24:10 +0000 (13:24 +0100)]
remove double return

Change-Id: Ifaa2b72efc7483db13a167e7f1e05de700ebcc65
Reviewed-on: https://gerrit.tine20.org/tine20/2637
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoHR has a new webdav frontend
Philipp Schüle [Thu, 14 Nov 2013 19:52:16 +0000 (20:52 +0100)]
HR has a new webdav frontend

6 years agoduplicate message definitions
Alexander Stintzing [Wed, 13 Nov 2013 12:03:59 +0000 (13:03 +0100)]
duplicate message definitions

Change-Id: Ic9635b7c14cd92c9d5f98714a952fce2dda67c1d
Reviewed-on: https://gerrit.tine20.org/tine20/2535
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoprepare reporting
Alexander Stintzing [Wed, 13 Nov 2013 14:44:21 +0000 (15:44 +0100)]
prepare reporting

Change-Id: I32193cedb20d6c66d400987bac0e5f2b08cb6395
Reviewed-on: https://gerrit.tine20.org/tine20/2529
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 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 agoUpdate Translations
sstamer [Wed, 10 Sep 2014 10:29:35 +0000 (12:29 +0200)]
Update Translations

Change-Id: I5599f40e9c06ca8cdd3147df31545ae5dcfda779
Reviewed-on: http://gerrit.tine20.com/customers/1118
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0009994: Use css classes instead of direct formats
Michael Spahn [Mon, 23 Jun 2014 15:36:34 +0000 (17:36 +0200)]
0009994: Use css classes instead of direct formats

Hi, I noticed that the Background Colors for the Day cells in the
Monthview Calendar, were set directly through a javascript file.
So it is not possible to change the colors in theme.

a detailed description can be found in the german sub-forum:
https://www.tine20.org/forum/viewtopic.php?f=12&t=16272#p57288

and a possible solution too...
https://www.tine20.org/forum/viewtopic.php?f=12&t=16272#p57314

(by ravermeister)

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

Change-Id: I00684e08f3b5909d4b45f22985614f01b694ed5e
Reviewed-on: https://gerrit.tine20.org/tine20/2846
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoskip user if syncUserHook fails
Philipp Schüle [Mon, 8 Sep 2014 18:57:58 +0000 (20:57 +0200)]
skip user if syncUserHook fails

Change-Id: Ica41decc16c996a916ea4c2f411538d68b1b6f7a
Reviewed-on: http://gerrit.tine20.com/customers/1106
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agocatch syncUserHook exceptions
Philipp Schüle [Mon, 8 Sep 2014 13:13:56 +0000 (15:13 +0200)]
catch syncUserHook exceptions

Change-Id: I4b5321fd717f23f179968812c39fdbc3ab7882e9
Reviewed-on: http://gerrit.tine20.com/customers/1104
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years ago0010214: improve calendar performance
Philipp Schüle [Thu, 4 Sep 2014 12:02:26 +0000 (14:02 +0200)]
0010214: improve calendar performance

... by reducing the number of recurring events fetched

+ adjusts some tests

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

Change-Id: Iec2592679d15f88e9c5ac9b1e3045dc45c038cef

Reviewed-on: http://gerrit.tine20.com/customers/1093
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdate build script for Koriander
Philipp Schüle [Thu, 4 Sep 2014 19:26:13 +0000 (21:26 +0200)]
update build script for Koriander

Change-Id: I164d24aa1b8062b93bcbf34fb9952e278d9f86d8
Reviewed-on: https://gerrit.tine20.org/tine20/2879
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
6 years agorun filter acl update script again
Philipp Schüle [Thu, 4 Sep 2014 19:19:35 +0000 (21:19 +0200)]
run filter acl update script again

... if it did not run before.

this might be the case if acl had been added before.

Change-Id: If2cea5df3b1cf8d42e9da32cb29534a14b729f27
Reviewed-on: https://gerrit.tine20.org/tine20/2878
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoupdates changelogs for Koriander 2014.09.0~preview1
Philipp Schüle [Thu, 4 Sep 2014 14:52:45 +0000 (16:52 +0200)]
updates changelogs for Koriander 2014.09.0~preview1

6 years agofixes merge failure (again)
Philipp Schüle [Thu, 4 Sep 2014 13:12:06 +0000 (15:12 +0200)]
fixes merge failure (again)

Change-Id: I76ecb56a01306b4adff4c6ca92d38109a7fca5a1
Reviewed-on: https://gerrit.tine20.org/tine20/2876
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
6 years agoRevert "0004934: Ical subscription support: new container"
Philipp Schüle [Thu, 4 Sep 2014 14:39:31 +0000 (16:39 +0200)]
Revert "0004934: Ical subscription support: new container"

This reverts commit 063d7811e454a8216307dd2dee844e5d2acf5ebb.

6 years agoMerge branch 'pu/2013.10-icsimport'
Philipp Schüle [Thu, 4 Sep 2014 12:42:41 +0000 (14:42 +0200)]
Merge branch 'pu/2013.10-icsimport'

Conflicts:
tine20/Calendar/Frontend/Json.php
tine20/Calendar/Import/Ical.php
tine20/Calendar/js/ImportDialog.js
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot

Change-Id: I5a152d031d553d992f7c791ee0655bc647edced3

6 years agoMerge branch 'pu/2013.10-caldav'
Philipp Schüle [Thu, 4 Sep 2014 12:40:38 +0000 (14:40 +0200)]
Merge branch 'pu/2013.10-caldav'

Conflicts:
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/Frontend/iMIPTest.php
tests/tine20/Calendar/Import/CalDAV/ClientMock.php
tests/tine20/Calendar/Import/CalDAVTest.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Calendar/Model/AttenderTests.php
tests/tine20/Calendar/TestCase.php
tests/tine20/Felamimail/Frontend/WebDAVTest.php
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Calendar/Import/CalDav/Client.php
tine20/Calendar/Model/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Tinebase/Container.php

Change-Id: Ic1fdac05e2ffb5cd300771639a905586bba90949

6 years agoMerge branch '2013.10'
Philipp Schüle [Thu, 4 Sep 2014 12:28:18 +0000 (14:28 +0200)]
Merge branch '2013.10'

6 years ago0004934: Ical subscription support: new container
Alexander Stintzing [Thu, 4 Sep 2014 11:08:03 +0000 (13:08 +0200)]
0004934: Ical subscription support: new container

* make importing into new containers work, show new container in tree, as soon as import window closes

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

Change-Id: I9726b064ca3f5acb15c5d6a0cd8afcc1fbb7517a

6 years ago0004934: Ical subscription support
sstamer [Tue, 2 Sep 2014 12:53:46 +0000 (14:53 +0200)]
0004934: Ical subscription support

Hi, I think that it would be great to be able to
subscribe to external ical feeds (via local or
online urls) thanks

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

Change-Id: I9726b064ca3f5acb15c5d6a0cd8afcc1fbb751aa
Reviewed-on: http://gerrit.tine20.com/customers/1094
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>