Commit by winterz :: r1105380 /branches/kdepim/enterprise/kdepim/korganizer/koagenda.cpp:

don't prompt for the resource when moving a recurring incidence
and then dissociating future or this-one-only.
kolab/issue4220
MERGE: trunk

Commit by winterz :: r1105299 /branches/kdepim/enterprise/kdepim/korganizer/koeditorgeneral.cpp:

if the reminder offset is 0, then always use minutes as the units.
kolab/issue4230
MERGE: trunk

Commit by winterz :: r1105274 /branches/kdepim/enterprise/kdepim/korganizer/ (3 files):

allow 0m pre-starttime reminders. also detect these as simple reminders
even if the user has opened the [Advanced] reminder dialog.
kolab/issue4230
MERGE: trunk,4.4

Commit by winterz :: r1105269 /trunk/KDE/kdepim/:

SVN_SILENT:
Blocked revisions 1104921 via svnmerge

........
  r1104921 | winterz | 2010-03-18 18:24:43 -0400 (Thu, 18 Mar 2010) | 4 lines

  Check the Time Associated button if the Start or the Due time is set.
  kolab/issue4227
  MERGE: none (already in trunk)
........

Commit by winterz :: r1105268 /trunk/KDE/kdepim/:

SVN_SILENT:
Blocked revisions 1105071,1105126 via svnmerge

........
  r1105071 | tmcguire | 2010-03-19 03:59:47 -0400 (Fri, 19 Mar 2010) | 1 line

  SVN_SILENT Update version numbers for today's release.
........
  r1105126 | tmcguire | 2010-03-19 04:23:00 -0400 (Fri, 19 Mar 2010) | 1 line

  Update Newslog.txt
........

Commit by winterz :: r1105267 /trunk/KDE/kdepim/:

SVN_SILENT:
Blocked revisions 1104988 via svnmerge

........
  r1104988 | tmcguire | 2010-03-19 03:09:41 -0400 (Fri, 19 Mar 2010) | 2 lines

  Update comment to reflect new reality.
........

Commit by winterz :: r1105255 /tags/kdepim/enterprise35.0.20100319.1105067/kdepim/korganizer/korgac/ (. alarmdialog.cpp):

merge SVN commit 1105253 by winterz:

on [Dismiss All], make sure to remove all the items from the QListView.

Commit by winterz :: r1105253 /branches/kdepim/enterprise/kdepim/korganizer/korgac/alarmdialog.cpp:

on [Dismiss All], make sure to remove all the items from the QListView.
kolab/issue4203
MERGE: none (already in trunk)

Commit by winterz :: r1105193 /tags/kdepim/enterprise35.0.20100319.1105067/kdepim/kresources/kolab/kcal/incidence.cpp:

merge SVN commit 1105191 by winterz:

handle empty or illegal recurrence interval values that may have been
incorrectly written into a Kolab incidence (possibly by proko2/resmgr)
kolab/issue4229

Commit by winterz :: r1105192 /tags/kdepim/enterprise35.0.20100312.1102367/kdepim/kresources/kolab/kcal/ (. incidence.cpp):

merge SVN commit 1105191 by winterz:

handle empty or illegal recurrence interval values that may have been
incorrectly written into a Kolab incidence (possibly by proko2/resmgr)

Commit by winterz :: r1105191 /branches/kdepim/enterprise/kdepim/kresources/kolab/kcal/incidence.cpp:

handle empty or illegal recurrence interval values that may have been
incorrectly written into a Kolab incidence (possibly by proko2/resmgr)
kolab/issue4229
MERGE: trunk,4.4

Commit by winterz :: r1104921 /branches/kdepim/enterprise/kdepim/korganizer/koeditorgeneraltodo.cpp:

Check the Time Associated button if the Start or the Due time is set.
kolab/issue4227
MERGE: none (already in trunk)

Commit by winterz :: r1104916 korganizer/trunk/KDE/kdepim/korganizer/korgac/alarmdialog.cpp:

SVN_MERGE:
Merged revisions 1104910 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1104910 | winterz | 2010-03-18 17:38:13 -0400 (Thu, 18 Mar 2010) | 4 lines

  if the user closes the dialog (escape), make that equivalent to [DismissAll]
  kolab/issue4203
  MERGE: trunk
........

Commit by winterz :: r1104915 /branches/kdepim/enterprise/kdepim/korganizer/ (3 files):

more fixes for properly setting beforeStart vs. beforeDue in advanced alarms.
kolab/issue4194
MERGE: trunk

Commit by winterz :: r1104911 /tags/kdepim/enterprise35.0.20100312.1102367/kdepim/korganizer/korgac/alarmdialog.cpp:

merge SVN commit 1104910 by winterz:

if the user closes the dialog (escape), make that equivalent to [DismissAll]

Commit by winterz :: r1104910 /branches/kdepim/enterprise/kdepim/korganizer/korgac/alarmdialog.cpp:

if the user closes the dialog (escape), make that equivalent to [DismissAll]
kolab/issue4203
MERGE: trunk

Commit by winterz :: r1104791 korganizer/trunk/KDE/kdepim/korganizer/koeventviewerdialog.cpp:

SVN_MERGE:
Merged revisions 1104757 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1104757 | winterz | 2010-03-18 10:48:00 -0400 (Thu, 18 Mar 2010) | 5 lines

  increase the size of the show incidence dialog.
  kolab/issue4224
  MERGE: trunk
........

Commit by winterz :: r1104757 /branches/kdepim/enterprise/kdepim/korganizer/koeventviewerdialog.cpp:

increase the size of the show incidence dialog.
kolab/issue4224
MERGE: trunk

Commit by winterz :: r1104749 korganizer/trunk/KDE/kdepim/korganizer/incidenceeditor/koeditoralarms.cpp:

SVN_MERGE:
Merged revisions 1078299 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1078299 | winterz | 2010-01-21 18:52:05 -0500 (Thu, 21 Jan 2010) | 8 lines

  on slotOk, make sure to save all changes to the current item.
  this is useful because some widgets (like QSpinBox) don't
  get a valueChanged signal when input is done via keyboard
  unless the return key is pressed.
  fixes kolab/issue4042

  MERGE: trunk
........

Commit by winterz :: r1104748 /trunk/KDE/kdepim/:

SVN_SILENT:
Recorded merge of revisions 1078274 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1078274 | winterz | 2010-01-21 17:38:18 -0500 (Thu, 21 Jan 2010) | 7 lines

  change CalHelper:::hasMyWritableEventsFolders() to use a family string
  argument so we can read the correct manager config files.  Use this
  in text_calendar bodypartformatter accordingly.
  fixes kolab/issue1783

  MERGE: trunk
........