Merge lp://staging/~marcokarlo/indicator-datetime/ubuntu14.10rtm into lp://staging/indicator-datetime/15.10
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~marcokarlo/indicator-datetime/ubuntu14.10rtm |
| Merge into: | lp://staging/indicator-datetime/15.10 |
| Diff against target: |
121 lines (+59/-8) (has conflicts) 3 files modified
debian/changelog (+49/-2) src/snap.cpp (+9/-0) src/wakeup-timer-powerd.cpp (+1/-6) Text conflict in debian/changelog Text conflict in src/snap.cpp |
| To merge this branch: | bzr merge lp://staging/~marcokarlo/indicator-datetime/ubuntu14.10rtm |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Up to now a short notification for calendar reminders is only shown.
It is important that the notification is also shown in the notification area, so that one can have a look on missed reminders.
Unmerged revisions
- 401. By Marco A. Harrendorf
-
Snap.cc: Show notifications for calendar entry if missed
- 400. By CI Train Bot Account
-
Releasing 13.10.0+
15.04.20150318~ rtm-0ubuntu1 - 399. By Charles Kerr
-
Work around glib's type initialization deadlock.
https:/
/bugzilla. gnome.org/ show_bug. cgi?id= 674885 Fixes: #1425297
Approved by: Ted Gould - 398. By CI Train Bot Account
-
Releasing 13.10.0+
15.04.20150226~ rtm-0ubuntu1 - 397. By Charles Kerr
-
Avoid ECANCELED errors in calls to timerfd_settime() Fixes: #1424966
Approved by: Ted Gould - 396. By CI Train Bot Account
-
Releasing 13.10.0+
15.04.20150213~ rtm-0ubuntu1 - 395. By Charles Kerr
-
change the WallClock to detect time changes from TFD_TIMER_
CANCEL_ ON_SET, e.g. when ntp<-->manual is toggled
Approved by: Ted Gould - 394. By CI Train Bot Account
-
Releasing 13.10.0+
15.04.20150122~ rtm-0ubuntu1 - 393. By Charles Kerr
-
Don't play calendar alarm sounds if Silent Mode is enabled. Use the alarm sound role for both clock and calendar alarms. Fixes: #1410874
Approved by: Antti Kaijanmäki - 392. By CI Train Bot Account
-
Releasing 13.10.0+
15.04.20150115~ rtm-0ubuntu1
