[california/wip/736262-first: 12/12] Merge branch 'master' into wip/736262-first
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/736262-first: 12/12] Merge branch 'master' into wip/736262-first
- Date: Fri, 12 Sep 2014 23:39:44 +0000 (UTC)
commit ff87e9b04ad79713a3278bd45b80e32ee14d5d8a
Merge: 8442144 7092eaa
Author: Jim Nelson <jim yorba org>
Date: Fri Sep 12 16:39:38 2014 -0700
Merge branch 'master' into wip/736262-first
po/POTFILES.in | 3 +
po/POTFILES.skip | 1 +
po/fi.po | 1222 ++++++++++++++++++--
src/Makefile.am | 2 +
src/activator/generic/generic-subscribe.vala | 2 +-
.../google/google-calendar-list-pane.vala | 2 +-
src/application/california-application.vala | 18 +-
.../backing-calendar-source-subscription.vala | 2 +-
src/backing/backing-calendar-source.vala | 4 +-
src/backing/backing-source.vala | 29 +-
src/backing/backing-store.vala | 15 +
.../backing-eds-calendar-source-subscription.vala | 24 +
src/backing/eds/backing-eds-calendar-source.vala | 11 +-
src/backing/eds/backing-eds-store.vala | 42 +-
src/california-resources.xml | 3 +
src/host/host-create-update-event.vala | 8 +-
src/host/host-main-window.vala | 10 +-
src/host/host-quick-create-event.vala | 6 +-
src/manager/manager-calendar-list.vala | 20 +-
src/manager/manager-remove-calendar.vala | 79 ++
src/manager/manager-window.vala | 2 +-
src/rc/activator-list.ui | 6 +-
src/rc/app-menu.interface | 5 +
src/rc/calendar-manager-list-item.ui | 1 +
src/rc/calendar-manager-list.ui | 7 +-
src/rc/generic-subscribe.ui | 5 +-
src/rc/google-authenticating.ui | 9 +-
src/rc/remove-calendar.ui | 119 ++
src/toolkit/toolkit-card.vala | 71 +-
src/toolkit/toolkit-deck-popover.vala | 11 +-
src/toolkit/toolkit-deck-window.vala | 34 +-
src/toolkit/toolkit-deck.vala | 27 +-
src/view/common/common-events-cell.vala | 4 +-
src/view/month/month-cell.vala | 12 +-
src/view/month/month-controller.vala | 4 +
src/view/month/month-grid.vala | 101 +--
src/view/week/week-day-pane.vala | 6 +
src/view/week/week-grid.vala | 14 +
38 files changed, 1630 insertions(+), 311 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]