← Back to branch summary

~ubuntu-clock-dev/ubuntu-clock-app/night-mode

~ubuntu-clock-dev/ubuntu-clock-app/night-mode

Viewing all changes in revision 203.

Committer: Victor Thompson
Date: 2015-07-17 03:44:51 UTC
mfrom: (201.1.101 utopic-3.0)
Revision ID: victor.thompson@gmail.com-20150717034451-dcuecd1k7d8bn0gl

Merge of trunk

files added:
AUTHORS

app/components/ExpandableListItem.qml

backend/modules/Timezone/statictimezonemodel.cpp

backend/modules/Timezone/statictimezonemodel.h

po/aa.po

po/ar.po

po/az.po

po/cy.po

po/el.po

po/en_AU.po

po/gd.po

po/he.po

po/id.po

po/km.po

po/kn.po

po/ko.po

po/lv.po

po/nb.po

po/nl.po

po/pl.po

po/pt_BR.po

po/ro.po

po/sr.po

po/tk.po

po/uk.po

po/vi.po

tests/autopilot/ubuntu_clock_app/CMakePluginParser.py

tests/autopilot/ubuntu_clock_app/fixture_setup.py

files removed:
app/worldclock/world-city-list.xml

backend/modules/Timezone/xmltimezonemodel.cpp

backend/modules/Timezone/xmltimezonemodel.h

tests/autopilot/ubuntu_clock_app/emulators.py

files modified:
CMakeLists.txt

README.autopilot

README.developers

app/alarm/AlarmDelegate.qml

app/alarm/AlarmLabel.qml

app/alarm/AlarmList.qml

app/alarm/AlarmModelComponent.qml

app/alarm/AlarmPage.qml

app/alarm/AlarmRepeat.qml

app/alarm/AlarmSettingsPage.qml

app/alarm/AlarmSound.qml

app/alarm/AlarmUtils.qml

app/alarm/EditAlarmPage.qml

app/clock-app@30.png

app/clock/ClockPage.qml

app/clock/MainClock.qml

app/components/AnalogMode.qml

app/components/AnalogShadow.qml

app/components/Background.qml

app/components/Clock.qml

app/components/ClockCircle.qml

app/components/DigitalMode.qml

app/components/DigitalShadow.qml

app/components/EmptyState.qml

app/components/HeaderButton.qml

app/components/Shadow.qml

app/components/SubtitledListItem.qml

app/ubuntu-clock-app.qml

app/upstreamcomponents/FakeHeader.qml

app/upstreamcomponents/FastScroll.qml

app/upstreamcomponents/ListItemWithActions.qml

app/upstreamcomponents/ListItemWithActionsCheckBox.qml

app/upstreamcomponents/MultipleSelectionListView.qml

app/upstreamcomponents/MultipleSelectionVisualModel.qml

app/upstreamcomponents/PageWithBottomEdge.qml

app/worldclock/AddWorldCityButton.qml

app/worldclock/UserWorldCityDelegate.qml

app/worldclock/UserWorldCityList.qml

app/worldclock/WorldCityList.qml

backend/CMakeLists.txt

backend/modules/GeoLocation/geolocation.cpp

backend/modules/Timezone/backend.cpp

debian/changelog

manifest.json.in

po/CMakeLists.txt

po/am.po

po/ast.po

po/br.po

po/ca.po

po/ca@valencia.po

po/com.ubuntu.clock.pot

po/cs.po

po/da.po

po/de.po

po/en_GB.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/fur.po

po/gl.po

po/hu.po

po/it.po

po/pa.po

po/pt.po

po/ru.po

po/sl.po

po/sv.po

po/tr.po

po/zh_CN.po

po/zh_TW.po

tests/autopilot/run

tests/autopilot/ubuntu_clock_app/__init__.py

tests/autopilot/ubuntu_clock_app/tests/__init__.py

tests/autopilot/ubuntu_clock_app/tests/test_alarm.py

tests/autopilot/ubuntu_clock_app/tests/test_clock.py

tests/unit/CMakeLists.txt

tests/unit/ClockTestCase.qml

tests/unit/MockClockApp.qml

tests/unit/tst_alarm.qml

tests/unit/tst_alarmLabel.qml

tests/unit/tst_alarmRepeat.qml

tests/unit/tst_alarmSound.qml

tests/unit/tst_alarmUtils.qml

tests/unit/tst_worldClock.qml

ubuntu-clock-app.desktop.in.in

ubuntu-clock-app.json

Show diffs side-by-side

added added

removed removed

README.autopilot

README.developers

app/alarm/AlarmDelegate.qml

app/alarm/AlarmLabel.qml

app/alarm/AlarmList.qml

app/alarm/AlarmModelComponent.qml

app/alarm/AlarmPage.qml

app/alarm/AlarmRepeat.qml

app/alarm/AlarmSettingsPage.qml

app/alarm/AlarmSound.qml

app/alarm/AlarmUtils.qml

app/alarm/EditAlarmPage.qml

app/clock-app@30.png

app/clock/ClockPage.qml

app/clock/MainClock.qml

app/components/AnalogMode.qml

app/components/AnalogShadow.qml

app/components/Background.qml

app/components/Clock.qml

app/components/ClockCircle.qml

app/components/DigitalMode.qml

app/components/DigitalShadow.qml

app/components/EmptyState.qml

app/components/ExpandableListItem.qml

app/components/HeaderButton.qml

app/components/Shadow.qml

app/components/SubtitledListItem.qml

app/ubuntu-clock-app.qml

app/upstreamcomponents/FakeHeader.qml

app/upstreamcomponents/FastScroll.qml

app/upstreamcomponents/ListItemWithActions.qml

app/upstreamcomponents/ListItemWithActionsCheckBox.qml

app/upstreamcomponents/MultipleSelectionListView.qml

app/upstreamcomponents/MultipleSelectionVisualModel.qml

app/upstreamcomponents/PageWithBottomEdge.qml

app/worldclock/AddWorldCityButton.qml

app/worldclock/UserWorldCityDelegate.qml

app/worldclock/UserWorldCityList.qml

app/worldclock/WorldCityList.qml

app/worldclock/world-city-list.xml

backend/CMakeLists.txt

backend/modules/GeoLocation/geolocation.cpp

backend/modules/Timezone/backend.cpp

backend/modules/Timezone/statictimezonemodel.cpp

backend/modules/Timezone/statictimezonemodel.h

backend/modules/Timezone/xmltimezonemodel.cpp

backend/modules/Timezone/xmltimezonemodel.h

debian/changelog

manifest.json.in

po/CMakeLists.txt

po/ca@valencia.po

po/com.ubuntu.clock.pot

tests/autopilot/run

tests/autopilot/ubuntu_clock_app/CMakePluginParser.py

tests/autopilot/ubuntu_clock_app/__init__.py

tests/autopilot/ubuntu_clock_app/emulators.py

tests/autopilot/ubuntu_clock_app/fixture_setup.py

tests/autopilot/ubuntu_clock_app/tests/__init__.py

tests/autopilot/ubuntu_clock_app/tests/test_alarm.py

tests/autopilot/ubuntu_clock_app/tests/test_clock.py

tests/unit/CMakeLists.txt

tests/unit/ClockTestCase.qml

tests/unit/MockClockApp.qml

tests/unit/tst_alarm.qml

tests/unit/tst_alarmLabel.qml

tests/unit/tst_alarmRepeat.qml

tests/unit/tst_alarmSound.qml

tests/unit/tst_alarmUtils.qml

tests/unit/tst_worldClock.qml

ubuntu-clock-app.desktop.in.in

ubuntu-clock-app.json

Older »