tine20
8 years agoMerge branch 'tine20.com/2012.10' into 2013.03
Philipp Schüle [Mon, 4 Mar 2013 10:18:28 +0000 (11:18 +0100)]
Merge branch 'tine20.com/2012.10' into 2013.03

8 years ago#7584: System returns after exclusion recipient
Philipp Schüle [Fri, 1 Mar 2013 12:26:12 +0000 (13:26 +0100)]
#7584: System returns after exclusion recipient

- added recipient record update on searchCombo blur again

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

Change-Id: I46cf8aaf9677b4354b7a3533bb384d812c16720c
Reviewed-on: https://gerrit.tine20.org/tine20/1698
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agolog output of cron job to syslog
Lars Kneschke [Sat, 2 Mar 2013 18:28:44 +0000 (19:28 +0100)]
log output of cron job to syslog

Change-Id: I4eed97ef47b9a6c7afaff5e8057f49bc1cc3236a
Reviewed-on: http://gerrit.tine20.com/customers/41
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Lars Kneschke <l.kneschke@metaways.de>
Conflicts:
scripts/packaging/debian/tine20-tinebase.cron.d

8 years agocreate demo data for applications
Alexander Stintzing [Tue, 26 Feb 2013 14:20:40 +0000 (15:20 +0100)]
create demo data for applications

 - admin
   - roles
   - groups
 - addressbook
 - crm
 - calendar
 - humanresources
 - tasks

Change-Id: I1c8da4823a2e9ffaad77bc1ed013a35c45e0928f
Reviewed-on: https://gerrit.tine20.org/tine20/1699
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoadded Kristina js client checklist
Philipp Schüle [Thu, 28 Feb 2013 10:01:16 +0000 (11:01 +0100)]
added Kristina js client checklist

Change-Id: I9e839e69c2f64ff2b54f7206eb73deb9860049cc
Reviewed-on: https://gerrit.tine20.org/tine20/1697
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agocan't switch back to attendee tab without edit grant
Cornelius Weiß [Thu, 28 Feb 2013 07:50:10 +0000 (08:50 +0100)]
can't switch back to attendee tab without edit grant

Change-Id: Ibaa94b33fdc58488f3695ee314187a23a4a986bf
Reviewed-on: https://gerrit.tine20.org/tine20/1695
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agocost center is allowed to be empty in Inventory
Cornelius Weiß [Wed, 27 Feb 2013 22:50:22 +0000 (23:50 +0100)]
cost center is allowed to be empty in Inventory

Change-Id: I6d541556c59357b155ace74d3b90d4833923f3be
Reviewed-on: https://gerrit.tine20.org/tine20/1692
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'tine20.com/2012.10'
Philipp Schüle [Wed, 27 Feb 2013 18:36:11 +0000 (19:36 +0100)]
Merge branch 'tine20.com/2012.10'

Conflicts:
tine20/HumanResources/Model/EmployeeFilter.php
tine20/HumanResources/Setup/Update/Release6.php
tine20/HumanResources/Setup/setup.xml
tine20/Tinebase/js/widgets/ContentTypeTreePanel.js

8 years ago #7912: health_insurance needs maxLength configured in edit dialog
Alexander Stintzing [Tue, 26 Feb 2013 11:18:54 +0000 (12:18 +0100)]
 #7912: health_insurance needs maxLength configured in edit dialog

- field size increased to 128

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

Change-Id: I91dca42b34612906d8db2b623dc80af78836613c
Reviewed-on: http://gerrit.tine20.com/customers/36
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Jenkins CI (http://ci.tine20.com/)
8 years agouse modelname instead of recordsName in ctPanel
Philipp Schüle [Wed, 27 Feb 2013 16:51:50 +0000 (17:51 +0100)]
use modelname instead of recordsName in ctPanel

- this did not work for Timeaccounts ("Time Accounts")

Change-Id: Idd9a20ca8720e95e69573ac21803005275efd229
Reviewed-on: http://gerrit.tine20.com/customers/40
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agofixed ext-all.js (Ext.isIEx)
Philipp Schüle [Wed, 27 Feb 2013 15:57:48 +0000 (16:57 +0100)]
fixed ext-all.js (Ext.isIEx)

Change-Id: Ie2b845614f869eb076f6e6ff6989976bba44bd34
Reviewed-on: https://gerrit.tine20.org/tine20/1691
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 #7904: Filter TAGS
Alexander Stintzing [Mon, 25 Feb 2013 10:39:27 +0000 (11:39 +0100)]
 #7904: Filter TAGS

If you want search for a TAG from a employee- there don´t become a result

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

Change-Id: I1455662d9a78695d58dfcd2d5b14ff166e5a7dc2
Reviewed-on: http://gerrit.tine20.com/customers/34
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #7928: quicksearch in module freetime does not work
Alexander Stintzing [Wed, 27 Feb 2013 12:30:31 +0000 (13:30 +0100)]
 #7928: quicksearch in module freetime does not work

 - add freetime query filter

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

Change-Id: I1c542ccfa858ec73ea9e47dc46cba012e3c75fca
Reviewed-on: http://gerrit.tine20.com/customers/39
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 agoupdated changelogs for 2013.03.1
Philipp Schüle [Wed, 27 Feb 2013 15:00:15 +0000 (16:00 +0100)]
updated changelogs for 2013.03.1

Change-Id: I72f76c365bf4f5d4147c7741b3fe69d823742f3b
Reviewed-on: https://gerrit.tine20.org/tine20/1690
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#7860: update transifex strings (using master)
Philipp Schüle [Wed, 27 Feb 2013 14:32:09 +0000 (15:32 +0100)]
#7860: update transifex strings (using master)

- updated strings once more

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

8 years agoupdate lang templates
Philipp Schüle [Wed, 27 Feb 2013 14:13:45 +0000 (15:13 +0100)]
update lang templates

8 years ago#7860: update transifex strings (using master)
Philipp Schüle [Wed, 27 Feb 2013 14:12:19 +0000 (15:12 +0100)]
#7860: update transifex strings (using master)

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

8 years ago#7920: update RELEASENOTES
Philipp Schüle [Wed, 27 Feb 2013 13:35:23 +0000 (14:35 +0100)]
#7920: update RELEASENOTES

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

Change-Id: Ib7dea3b53f1ed7aa6d0ab7808107d6c9e9f8c2d8
Reviewed-on: https://gerrit.tine20.org/tine20/1689
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'tine20.com/2012.10'
Philipp Schüle [Wed, 27 Feb 2013 13:59:30 +0000 (14:59 +0100)]
Merge branch 'tine20.com/2012.10'

Conflicts:
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/js/EmployeeEditDialog.js
tine20/HumanResources/js/Models.js

8 years ago#7926: add update script for resource grants
Philipp Schüle [Wed, 27 Feb 2013 13:02:22 +0000 (14:02 +0100)]
#7926: add update script for resource grants

- add anyone READ grant to resources without grants
- allow to deactivate container checks in resource controller

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

Change-Id: If36d07204a12e50bdfc530d189140c3529fe8c6e
Reviewed-on: https://gerrit.tine20.org/tine20/1687
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agolowered loglevel in update script
Philipp Schüle [Wed, 27 Feb 2013 12:40:26 +0000 (13:40 +0100)]
lowered loglevel in update script

Change-Id: I678ad3dc978ec49434f1e72e795816862a5604ad
Reviewed-on: https://gerrit.tine20.org/tine20/1688
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #7924: HR Modul - Description text not saved
Alexander Stintzing [Wed, 27 Feb 2013 11:53:41 +0000 (12:53 +0100)]
 #7924: HR Modul - Description text not saved

If you write some description on the right side from personal data - there don´t saved

https://forge.tine20.org/mantisbt/view.php?id=7924
Change-Id: I572b357cbb320d4c0cf20cc6100d2e77178eace0
Reviewed-on: http://gerrit.tine20.com/customers/38
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 agoadded missing semicolon
Philipp Schüle [Wed, 27 Feb 2013 10:51:58 +0000 (11:51 +0100)]
added missing semicolon

Change-Id: I5159feb27ee70690a97c67f0d580568e40d97e8b
Reviewed-on: https://gerrit.tine20.org/tine20/1686
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #7916: Inventory create default favorite
Alexander Stintzing [Tue, 26 Feb 2013 09:44:26 +0000 (10:44 +0100)]
 #7916: Inventory create default favorite

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

Change-Id: Ib0733be908344dee3ec6365a1a149f9a637ddb71
Reviewed-on: https://gerrit.tine20.org/tine20/1681
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: jenkins user
8 years ago#7848: Check performance of Admin.saveRole
Philipp Schüle [Wed, 27 Feb 2013 09:46:23 +0000 (10:46 +0100)]
#7848: Check performance of Admin.saveRole

- removed obsolete role cache invalidation
- invalidate rights cache by looping user ids and role rights

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

Change-Id: I1b7dfc07ad473093e45777bb0ea5b8ebd30babc4
Reviewed-on: http://gerrit.tine20.com/customers/33
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#7918: Update to Joey crashes Calender
Philipp Schüle [Wed, 27 Feb 2013 09:27:09 +0000 (10:27 +0100)]
#7918: Update to Joey crashes Calender

- update script needs to add models to personal contacts, too
- they had been ommitted because Tinebase_Container always adds ACL in
search()

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

Change-Id: I6338ad240e9d6f51fbeba7628d04d976e95db1aa
Reviewed-on: http://gerrit.tine20.com/customers/37
Tested-by: Jenkins CI (http://ci.tine20.com/)
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoforum is still on tine20.org
Philipp Schüle [Mon, 25 Feb 2013 12:52:20 +0000 (13:52 +0100)]
forum is still on tine20.org

Change-Id: I578a287c3ec8c0867c0294c6bfd5e6837ba2a24c
Reviewed-on: http://gerrit.tine20.com/customers/32
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#7908: actionqueue in config can't be deactivated
Philipp Schüle [Mon, 25 Feb 2013 12:26:03 +0000 (13:26 +0100)]
#7908: actionqueue in config can't be deactivated

- checks if actionqueue config is "active"

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

Change-Id: I0a7b98c6db77cf98eca0adb34604081f1b7a2b1d
Reviewed-on: http://gerrit.tine20.com/customers/31
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoWe must delete cf values before we can delete cf config
AirMike [Wed, 27 Feb 2013 08:21:37 +0000 (09:21 +0100)]
We must delete cf values before we can delete cf config

Change-Id: Ia89a4764c18a6b9395a1a36a0dcd3f8dffae3696
Reviewed-on: https://gerrit.tine20.org/tine20/1685
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoease westpanel/modulepicker handling
Cornelius Weiß [Tue, 26 Feb 2013 18:36:57 +0000 (19:36 +0100)]
ease westpanel/modulepicker handling

- remove old appPile Stuff
- remove unnessesary nestings
- use fit layout / autoHeigt / autoScroll

Change-Id: I8a4347af37f22132b2de90b92872ce1523bb369a
Reviewed-on: https://gerrit.tine20.org/tine20/1683
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0007884: IE10: Forced Document Mode Crashes Layout
Cornelius Weiß [Tue, 26 Feb 2013 09:25:24 +0000 (10:25 +0100)]
0007884: IE10: Forced Document Mode Crashes Layout

repair getAttribute for IE > 8
no IE fallback needed any longer

Change-Id: I5ac2a7365ae1ff5f3ba6b80558e38013c775f09a
Reviewed-on: https://gerrit.tine20.org/tine20/1680
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agofixed Inventory import tests (translations)
Philipp Schüle [Tue, 26 Feb 2013 12:39:42 +0000 (13:39 +0100)]
fixed Inventory import tests (translations)

Change-Id: I0b0972b1f8d934009770302e691d4077a8af0ba3
Reviewed-on: https://gerrit.tine20.org/tine20/1682
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #7914: number needs maxLength configured in edit dialog
Alexander Stintzing [Tue, 26 Feb 2013 11:13:35 +0000 (12:13 +0100)]
 #7914: number needs maxLength configured in edit dialog

https://forge.tine20.org/mantisbt/view.php?id=7914
Change-Id: I4701b54d3652caaaac487b13c1f12d2b00b8f205
Reviewed-on: http://gerrit.tine20.com/customers/35
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0007884: IE10: Forced Document Mode Crashes Layout
Cornelius Weiß [Tue, 26 Feb 2013 08:50:46 +0000 (09:50 +0100)]
0007884: IE10: Forced Document Mode Crashes Layout

detect IE>8 correctly

Change-Id: I99672097d5beed46b8c40375bb75a51e26620879
Reviewed-on: https://gerrit.tine20.org/tine20/1679
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0007898: IE8: JavaScript Errors and no not all widgets are rendered
Cornelius Weiß [Tue, 26 Feb 2013 08:46:49 +0000 (09:46 +0100)]
0007898: IE8: JavaScript Errors and no not all widgets are rendered

value 'none' is not allowed

Change-Id: Ie5dff18ee019048dff488bea2ceec9acb84894b8
Reviewed-on: https://gerrit.tine20.org/tine20/1678
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoupdate lang templates
Philipp Schüle [Tue, 26 Feb 2013 08:56:24 +0000 (09:56 +0100)]
update lang templates

8 years ago#7860 update translations
Philipp Schüle [Tue, 26 Feb 2013 08:55:27 +0000 (09:55 +0100)]
#7860 update translations

8 years ago0005144: Attendee can't move event to another container
Cornelius Weiß [Fri, 22 Feb 2013 13:41:00 +0000 (14:41 +0100)]
0005144: Attendee can't move event to another container

Change-Id: Ief20f9c0342454311930ddcf5a5592aed1e9f2d2
Reviewed-on: http://gerrit.tine20.com/customers/29
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'tine20.com/2012.10'
Philipp Schüle [Mon, 25 Feb 2013 12:11:23 +0000 (13:11 +0100)]
Merge branch 'tine20.com/2012.10'

Conflicts:
tine20/Calendar/js/MainScreenCenterPanel.js

8 years agoMerge "0007900: load mask does not hide on first occurrence exceptions" into tine20...
Philipp Schüle [Mon, 25 Feb 2013 11:58:58 +0000 (12:58 +0100)]
Merge "0007900: load mask does not hide on first occurrence exceptions" into tine20.com/2012.10

8 years agoMerge "0007652: date field is slightly grayed out for allday events" into tine20...
Philipp Schüle [Mon, 25 Feb 2013 11:54:38 +0000 (12:54 +0100)]
Merge "0007652: date field is slightly grayed out for allday events" into tine20.com/2012.10

8 years ago0007652: date field is slightly grayed out for allday events
Cornelius Weiß [Fri, 22 Feb 2013 12:18:29 +0000 (13:18 +0100)]
0007652: date field is slightly grayed out for allday events

Change-Id: If8babe5ed4696fb00a2d4dbdef58f7c93c8cb05d

8 years agoMerge "0007876: filter toolbar disappears when OR filter is removed" into tine20...
Philipp Schüle [Mon, 25 Feb 2013 11:41:38 +0000 (12:41 +0100)]
Merge "0007876: filter toolbar disappears when OR filter is removed" into tine20.com/2012.10

8 years agoadd attendee filter grid to westpanel
Cornelius Weiß [Mon, 10 Dec 2012 13:16:59 +0000 (14:16 +0100)]
add attendee filter grid to westpanel

Change-Id: If1eb38b7228b36cb9102a1b8b2869cbabc9c3ae1

Conflicts:
tine20/Calendar/js/AttendeeGridPanel.js
Change-Id: I1e5ec367141957e74cf2991ea7b22865094e3aa1
Reviewed-on: https://gerrit.tine20.org/tine20/1671
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge "0007878: attendee without email breaks sync" into tine20.com/2012.10
Philipp Schüle [Mon, 25 Feb 2013 11:21:41 +0000 (12:21 +0100)]
Merge "0007878: attendee without email breaks sync" into tine20.com/2012.10

8 years ago#7868: speed up modlog update
Philipp Schüle [Sat, 23 Feb 2013 11:12:34 +0000 (12:12 +0100)]
#7868: speed up modlog update

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

Change-Id: I2c47d68f09125687e0a439cd49d75e6cf862f283
Reviewed-on: https://gerrit.tine20.org/tine20/1674
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago#7736: ask user before sending reading confirmation
Philipp Schüle [Fri, 22 Feb 2013 14:23:03 +0000 (15:23 +0100)]
#7736: ask user before sending reading confirmation

- need to wait for body (and headers) of message to load

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

Change-Id: Ia8e51627e5a0c051692a5eff725a038fc49e98c0
Reviewed-on: https://gerrit.tine20.org/tine20/1673
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agocheck if 'field' exists in filter data
Philipp Schüle [Fri, 22 Feb 2013 13:42:46 +0000 (14:42 +0100)]
check if 'field' exists in filter data

Change-Id: I49095635d7c6b8bbef9bcb8f7699c3b69495efd3
Reviewed-on: https://gerrit.tine20.org/tine20/1670
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago0007900: load mask does not hide on first occurrence exceptions
Cornelius Weiß [Fri, 22 Feb 2013 15:31:43 +0000 (16:31 +0100)]
0007900: load mask does not hide on first occurrence exceptions

@2012-03

8 years ago0007876: filter toolbar disappears when OR filter is removed
Cornelius Weiß [Fri, 22 Feb 2013 11:04:15 +0000 (12:04 +0100)]
0007876: filter toolbar disappears when OR filter is removed

@2012.03

8 years ago0007706: Set price field to text for delimiter
Philipp Schüle [Fri, 22 Feb 2013 09:14:35 +0000 (10:14 +0100)]
0007706: Set price field to text for delimiter

- added missing update script that has been lost during merge

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

Change-Id: Ic40d4a5b8075a28adac0d34bed6ca9354ef85065

8 years agoupdated changelogs/spec for Kristina 2013.03.1~rc1
Philipp Schüle [Thu, 21 Feb 2013 16:18:29 +0000 (17:18 +0100)]
updated changelogs/spec for Kristina 2013.03.1~rc1

8 years agoMerge branch 'tine20.com/2012.10'
Philipp Schüle [Thu, 21 Feb 2013 16:15:35 +0000 (17:15 +0100)]
Merge branch 'tine20.com/2012.10'

8 years ago0007878: attendee without email breaks sync
Cornelius Weiß [Thu, 21 Feb 2013 15:53:36 +0000 (16:53 +0100)]
0007878: attendee without email breaks sync

Change-Id: I945ae5654d9ba68ca22711eaa75396d5a33f65f2

8 years agomore org => com
Lars Kneschke [Thu, 21 Feb 2013 15:27:22 +0000 (16:27 +0100)]
more org => com

Change-Id: Ifa4e415b4d9fb8759f86a9e423fcceb3e6d66441
Reviewed-on: https://gerrit.tine20.org/tine20/1669
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
8 years agoupdated changelog/specs for Joey 2012.10.4
Philipp Schüle [Thu, 21 Feb 2013 15:17:19 +0000 (16:17 +0100)]
updated changelog/specs for Joey 2012.10.4

8 years agoMerge branch 'pu/cal2013'
Philipp Schüle [Thu, 21 Feb 2013 14:46:38 +0000 (15:46 +0100)]
Merge branch 'pu/cal2013'

Conflicts:
tests/tine20/Calendar/JsonTests.php

8 years agoMerge branch 'pu/inventory'
Philipp Schüle [Thu, 21 Feb 2013 14:41:25 +0000 (15:41 +0100)]
Merge branch 'pu/inventory'

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

8 years agoMerge branch '2012.10'
Philipp Schüle [Thu, 21 Feb 2013 14:35:40 +0000 (15:35 +0100)]
Merge branch '2012.10'

8 years ago0007708: Improve import function
Michael Spahn [Wed, 20 Feb 2013 13:16:13 +0000 (14:16 +0100)]
0007708: Improve import function

Change-Id: I4686754b75d17eb81cf8a2efdb1ab0d1d83bb090
Reviewed-on: https://gerrit.tine20.org/tine20/1654
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0007562: busy check for when creating exceptions is missing
Cornelius Weiß [Wed, 20 Feb 2013 17:01:08 +0000 (18:01 +0100)]
0007562: busy check for when creating exceptions is missing

Change-Id: I4ddbae9791dc7c23a46fc27915eea086f8e882a8

Conflicts:
tine20/Calendar/js/MainScreenCenterPanel.js
Change-Id: I1c32a41f50136ff8193643318e219dacbaa8eea1
Reviewed-on: https://gerrit.tine20.org/tine20/1666
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agotest alarm skipping for declined attendee
Cornelius Weiß [Thu, 21 Feb 2013 09:31:06 +0000 (10:31 +0100)]
test alarm skipping for declined attendee

Change-Id: Id2d60c086cb3c9338dfa9bed89f838d3d30410ff
Reviewed-on: https://gerrit.tine20.org/tine20/1663
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago0007706: Set price field to text for delimiter like , or .
Michael Spahn [Wed, 20 Feb 2013 13:34:55 +0000 (14:34 +0100)]
0007706: Set price field to text for delimiter like , or .

Change-Id: I3bb591e361bfdae7804dfab2912907de76255120
Reviewed-on: https://gerrit.tine20.org/tine20/1655
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago #7870: Can't send mail without subject
Lars Kneschke [Thu, 21 Feb 2013 12:51:14 +0000 (13:51 +0100)]
 #7870: Can't send mail without subject

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

Change-Id: Ia3cc32a7456ad2e998f50ae06cda7b904fba3e8e
Reviewed-on: https://gerrit.tine20.org/tine20/1667
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoupdated Kristina RELEASENOTES
Philipp Schüle [Wed, 20 Feb 2013 14:21:48 +0000 (15:21 +0100)]
updated Kristina RELEASENOTES

Change-Id: I1167dddb51008576a8aadad771362f8bc85e9b10
Reviewed-on: https://gerrit.tine20.org/tine20/1656
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge2
Lars Kneschke [Thu, 21 Feb 2013 11:04:48 +0000 (12:04 +0100)]
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotonMerge2

8 years agoalways send the header. Otherwise iOS does not trigger provisioning
Lars Kneschke [Thu, 21 Feb 2013 11:00:11 +0000 (12:00 +0100)]
always send the header. Otherwise iOS does not trigger provisioning

8 years agoMerge branch 'pu/inventory'
Philipp Schüle [Thu, 21 Feb 2013 10:17:08 +0000 (11:17 +0100)]
Merge branch 'pu/inventory'

8 years agoMerge branch '2012.10'
Philipp Schüle [Thu, 21 Feb 2013 10:16:37 +0000 (11:16 +0100)]
Merge branch '2012.10'

Conflicts:
tine20/Setup/Controller.php

8 years agocatch error on duplicate adding of col
Philipp Schüle [Thu, 21 Feb 2013 09:50:28 +0000 (10:50 +0100)]
catch error on duplicate adding of col

Change-Id: I841c8fe3610c3c292ec36e46a5a32c60b737bcc1
Reviewed-on: https://gerrit.tine20.org/tine20/1664
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agofix hr update script, add semicolons to common.js
Alexander Stintzing [Thu, 21 Feb 2013 09:48:40 +0000 (10:48 +0100)]
fix hr update script, add semicolons to common.js

Change-Id: I1ee1c1e1b19428963e630cdf6ad53c10a0c86702
Reviewed-on: https://gerrit.tine20.org/tine20/1665
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotnMerge
Lars Kneschke [Thu, 21 Feb 2013 10:05:05 +0000 (11:05 +0100)]
Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotnMerge

Conflicts:
scripts/packaging/debian/control

8 years agodrop obsolete fk from modlog table on update
Philipp Schüle [Wed, 20 Feb 2013 17:31:39 +0000 (18:31 +0100)]
drop obsolete fk from modlog table on update

- plus: added some more update logging

Change-Id: Ia6c5cb6487e236c33ade8b21a8468cb58d4d1def
Reviewed-on: https://gerrit.tine20.org/tine20/1661
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #3664: allow to configure session backends in setup
Philipp Schüle [Wed, 20 Feb 2013 14:29:35 +0000 (15:29 +0100)]
 #3664: allow to configure session backends in setup

- added redis session/queue/cache options to gui
- added actionqueue section to gui
- added memcached backend to setup gui + controller
- check session/actionqueue in setup controller
- marked Tinebase_Redis_Queue as deprecated

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

Change-Id: Ie3db4cb473b1a8bdc723dc5a890e1d152161b0a3
Reviewed-on: https://gerrit.tine20.org/tine20/1657
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
8 years agofix buildscript (spacing has changed)
Lars Kneschke [Thu, 21 Feb 2013 07:30:39 +0000 (08:30 +0100)]
fix buildscript (spacing has changed)

Change-Id: I60d315778c291210e0cfdc8961342dd8cc2af769
Reviewed-on: https://gerrit.tine20.org/tine20/1662
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Lars Kneschke <l.kneschke@metaways.de>
8 years agoMerge branch '2012.10'
Philipp Schüle [Wed, 20 Feb 2013 15:38:51 +0000 (16:38 +0100)]
Merge branch '2012.10'

Conflicts:
tine20/HumanResources/translations/sv_SE.po

8 years ago#7858: could not parse structure of multipart/related msg
Philipp Schüle [Wed, 20 Feb 2013 14:45:36 +0000 (15:45 +0100)]
#7858: could not parse structure of multipart/related msg

- only add alternative content type to body if preferred type could not
be found

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

Change-Id: Ib14cf75092ce91454c1cbc991230580612f6b58d
Reviewed-on: https://gerrit.tine20.org/tine20/1659
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agocache mainscreen for 10 minutes
Lars Kneschke [Wed, 20 Feb 2013 05:58:24 +0000 (06:58 +0100)]
cache mainscreen for 10 minutes

Change-Id: Ie69f2433d91f8b4d6053ba995b77f75986d39ebd
Reviewed-on: https://gerrit.tine20.org/tine20/1649
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
8 years ago0007732: state contains sort info of a column that has been
Cornelius Weiß [Wed, 20 Feb 2013 14:31:32 +0000 (15:31 +0100)]
0007732: state contains sort info of a column that has been
renamed/deleted

Change-Id: I08463e23931c203d12e15a05f722725410ceaceb
Reviewed-on: https://gerrit.tine20.org/tine20/1658
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago #7638: edit phone settings button disabled
Alexander Stintzing [Tue, 12 Feb 2013 11:07:44 +0000 (12:07 +0100)]
 #7638: edit phone settings button disabled

it looks like the edit settings button is disabled most of the time.
this should be enabled when a phone is selected in the westpanel

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

Change-Id: I7ad572d0b0534ff8946267699925e56cf4dc025b
Reviewed-on: https://gerrit.tine20.org/tine20/1634
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#7858: could not parse structure of multipart/related msg
Philipp Schüle [Wed, 20 Feb 2013 10:24:31 +0000 (11:24 +0100)]
#7858: could not parse structure of multipart/related msg

- multipart type can contain another multipart type
- added some more logging
- added another test message

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

Change-Id: If5a606b278174881f4af1bb70c31d958d021b84d
Reviewed-on: https://gerrit.tine20.org/tine20/1651
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#7230: Quota being removed when using Cyrus in Tine Setup
Philipp Schüle [Thu, 14 Feb 2013 13:14:36 +0000 (14:14 +0100)]
#7230: Quota being removed when using Cyrus in Tine Setup

- the quota has been set to null when syncUser is called during login
- only set quota when emailUser is present

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

Change-Id: Idf66e9b0574775736ae0c4d9bfc97923a166f212
Reviewed-on: https://gerrit.tine20.org/tine20/1633
Tested-by: jenkins user
Tested-by: Philipp Schüle <p.schuele@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoreplace .org with .com
Lars Kneschke [Wed, 20 Feb 2013 11:14:02 +0000 (12:14 +0100)]
replace .org with .com

Change-Id: I8409580892e44a17a7a69962c654b483063aea53
Reviewed-on: https://gerrit.tine20.org/tine20/1653
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoupdate lang templates
Cornelius Weiß [Wed, 20 Feb 2013 11:49:49 +0000 (12:49 +0100)]
update lang templates

8 years agoAdd cli interface to inventory
Michael Spahn [Wed, 20 Feb 2013 10:04:29 +0000 (11:04 +0100)]
Add cli interface to inventory

Change-Id: I2e1d29255ce8264a3f1453c1f72d44dca6350bce
Reviewed-on: https://gerrit.tine20.org/tine20/1650
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years agoAllow multiple mapping sets aJsonObject in post mapping hook
Michael Spahn [Mon, 21 Jan 2013 13:31:40 +0000 (14:31 +0100)]
Allow multiple mapping sets aJsonObject in post mapping hook

Change-Id: I97ff30ebc9c72bb8b06b46d38f626f0e2bf31dc2
Reviewed-on: https://gerrit.tine20.org/tine20/1539
Tested-by: jenkins user
Reviewed-by: Cornelius Weiß <c.weiss@metaways.de>
8 years ago0007804: update transifex strings (using master) and notify translators
Cornelius Weiß [Wed, 20 Feb 2013 11:25:32 +0000 (12:25 +0100)]
0007804: update transifex strings (using master) and notify translators

8 years agoupdate release name
Lars Kneschke [Wed, 20 Feb 2013 10:50:54 +0000 (11:50 +0100)]
update release name

Change-Id: I7b9ccba2310f1ee171fc1e76ca405a231fb669a3
Reviewed-on: https://gerrit.tine20.org/tine20/1652
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
8 years agoMerge remote-tracking branch 'gerrit/2012.10' into MasterMerge
Lars Kneschke [Tue, 19 Feb 2013 15:17:41 +0000 (16:17 +0100)]
Merge remote-tracking branch 'gerrit/2012.10' into MasterMerge

8 years agoparse parameters with spaces correctly and minor corrections
Lars Kneschke [Tue, 19 Feb 2013 09:22:44 +0000 (10:22 +0100)]
parse parameters with spaces correctly and minor corrections

Change-Id: Ia355aa210b4bd076901a089dc2fee2000aad07e2
Reviewed-on: https://gerrit.tine20.org/tine20/1648
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
Tested-by: Lars Kneschke <l.kneschke@metaways.de>
8 years agopackaged Tine 2.0 worker
Lars Kneschke [Tue, 19 Feb 2013 06:35:36 +0000 (07:35 +0100)]
packaged Tine 2.0 worker

Change-Id: I3855dbf7aebcb735061e164823205f75516a1467
Reviewed-on: https://gerrit.tine20.org/tine20/1647
Tested-by: jenkins user
Reviewed-by: Lars Kneschke <l.kneschke@metaways.de>
8 years agocatch exceptions from WBXML encoder and log them
Lars Kneschke [Fri, 15 Feb 2013 14:52:52 +0000 (15:52 +0100)]
catch exceptions from WBXML encoder and log them

Change-Id: If0fe318c175e593a84d247e390010ff1d5897044

8 years agoupdated changelogs for Kristina 2013.03.1~beta1
Philipp Schüle [Thu, 14 Feb 2013 10:51:17 +0000 (11:51 +0100)]
updated changelogs for Kristina 2013.03.1~beta1

Change-Id: I14c42d908c0e7f1d0b7df07402562f99e1dbc1d4
Reviewed-on: https://gerrit.tine20.org/tine20/1645
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoMerge branch '2012.10'
Philipp Schüle [Thu, 14 Feb 2013 10:47:21 +0000 (11:47 +0100)]
Merge branch '2012.10'

Conflicts:
tine20/Tinebase/Config.php

8 years ago#7726: show inline images of multipart/related message parts
Philipp Schüle [Wed, 13 Feb 2013 17:42:15 +0000 (18:42 +0100)]
#7726: show inline images of multipart/related message parts

- added uri filter
- added html test mail for purifier
- do not remove img tags any longer
- allow inline base64 images
- this is part 1/2 for #7726

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

Change-Id: I5320b6e3deb39243f7fc5c7f5dcb7bd186c6378b
Reviewed-on: https://gerrit.tine20.org/tine20/1619
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years ago#7690: exdate: allow to update the whole series
Philipp Schüle [Wed, 13 Feb 2013 17:52:06 +0000 (18:52 +0100)]
#7690: exdate: allow to update the whole series

- add new range param to saveEvent
- add tests for ExdateUpdate*
- show range options in js client on update exdate

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

Change-Id: I0d63e08f9bff2a24567856143e0c3a79b34dcfd8
Reviewed-on: https://gerrit.tine20.org/tine20/1525
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoneed to check lists table, too when looking for adb
Philipp Schüle [Tue, 12 Feb 2013 15:23:35 +0000 (16:23 +0100)]
need to check lists table, too when looking for adb

Change-Id: I9abe6a1425d46a91cf8cf3b321462a6d4e98b6b0
Reviewed-on: https://gerrit.tine20.org/tine20/1640
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agoadded missing update_1
Philipp Schüle [Tue, 12 Feb 2013 15:04:40 +0000 (16:04 +0100)]
added missing update_1

Change-Id: I1299569c588fc0fe6b8df94bbe8e17a4c429e49a
Reviewed-on: https://gerrit.tine20.org/tine20/1639
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agowe have no user object during installation
Philipp Schüle [Tue, 12 Feb 2013 14:55:22 +0000 (15:55 +0100)]
we have no user object during installation

Change-Id: I49379929f99b6603c7c4e08c5ec930bd41110803
Reviewed-on: https://gerrit.tine20.org/tine20/1638
Tested-by: jenkins user
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
8 years agouse Tinebase_Core class in Tinebase for Logger
Philipp Schüle [Tue, 12 Feb 2013 14:51:38 +0000 (15:51 +0100)]
use Tinebase_Core class in Tinebase for Logger

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