[california/wip/725778-allday: 22/22] Merge branch 'master' into wip/725778-allday
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/725778-allday: 22/22] Merge branch 'master' into wip/725778-allday
- Date: Thu, 24 Apr 2014 00:33:48 +0000 (UTC)
commit 973bc24b33724c6647fb620bba8bbf45e3e1f522
Merge: b454cd1 503780b
Author: Jim Nelson <jim yorba org>
Date: Wed Apr 23 17:33:52 2014 -0700
Merge branch 'master' into wip/725778-allday
Makefile.am | 8 +-
configure.ac | 24 +-
data/Makefile.am | 20 +
data/california.desktop.in.in | 16 +
po/POTFILES.in | 10 +-
po/POTFILES.skip | 8 +
po/cs.po | 331 +++++++++++++---
po/he.po | 75 +++-
po/pl.po | 73 +++-
po/sr.po | 162 +++++++--
po/sr latin po | 162 +++++++--
src/Makefile.am | 26 +-
src/activator/activator-instance-list.vala | 4 +-
src/activator/activator-window.vala | 2 +-
.../activator-google-calendar-list-pane.vala | 17 +-
src/activator/webcal/activator-webcal-pane.vala | 7 +-
src/application/california-application.vala | 68 +++-
src/application/california-commandline.vala | 67 +++
src/application/main.vala | 2 +-
src/backing/backing-calendar-source.vala | 6 +
src/backing/backing-source.vala | 10 +
src/backing/eds/backing-eds-calendar-source.vala | 14 +
src/base/base-properties.vala | 31 ++
src/calendar/calendar-date.vala | 16 +-
src/calendar/calendar-day-of-week.vala | 24 +-
src/calendar/calendar-duration.vala | 86 ++++
src/calendar/calendar-month.vala | 25 +-
src/calendar/calendar-wall-time.vala | 79 ++++-
src/calendar/calendar.vala | 20 +
src/california-resources.xml | 9 +
src/collection/collection-lookahead-stack.vala | 133 ++++++
src/collection/collection.vala | 22 +
src/component/component-details-parser.vala | 422 ++++++++++++++++++++
src/component/component-event.vala | 65 +++-
src/component/component-icalendar.vala | 132 ++++++
src/component/component-instance.vala | 18 +-
src/component/component.vala | 63 +++
src/host/host-calendar-list-item.vala | 48 +++
src/host/host-create-update-event.vala | 188 +++++-----
src/host/host-import-calendar.vala | 70 ++++
src/host/host-main-window.vala | 116 +++---
src/host/host-quick-create-event.vala | 77 ++++
src/host/host-show-event.vala | 24 +-
src/manager/manager-calendar-list.vala | 2 +-
src/manager/manager-window.vala | 2 +-
src/rc/calendar-import.ui | 129 ++++++
src/rc/calendar-list-item.ui | 47 +++
src/rc/create-update-event.ui | 47 +--
src/rc/quick-create-event.ui | 165 ++++++++
src/rc/show-event.ui | 59 ++-
src/tests/tests-quick-add.vala | 143 +++++++
src/tests/tests.vala | 16 +
src/toolkit/toolkit-card.vala | 74 +++-
src/toolkit/toolkit-combo-box-text-model.vala | 166 ++++++++
src/toolkit/toolkit-deck-window.vala | 35 ++-
src/toolkit/toolkit-deck.vala | 79 +++-
src/toolkit/toolkit-listbox-model.vala | 74 ++--
.../toolkit-mutable-widget.vala} | 9 +-
src/toolkit/toolkit.vala | 8 +
src/unit-test/unit-test-harness.vala | 143 +++++++
src/util/util-gfx.vala | 16 +-
src/util/util-string.vala | 53 +++
vapi/libecal-1.2.vapi | 20 +-
vapi/libecal-1.2/libecal-1.2.metadata | 5 +-
vapi/libical.vapi | 16 +-
65 files changed, 3575 insertions(+), 513 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]