lp:~vthompson/ubuntu-clock-app/fix-1340326

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-clock-app at revision 16

Nekhelesh Ramananthan: Approve on 2014-07-11

Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration) on 2014-07-11

Diff: 16 lines (+4/-3)

1 file modified

ubuntu-clock-app.json (+4/-3)

api

Superseded for merging into lp:ubuntu-clock-app/saucy

Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration) on 2014-07-11

Ubuntu Clock Developers: Pending requested 2014-07-11

Diff: 3399 lines (+3156/-0) (has conflicts)

42 files modified

.bzrignore (+1/-0)
CMakeLists.txt (+70/-0)
COPYING (+674/-0)
README (+9/-0)
README.developers (+16/-0)
app/CMakeLists.txt (+16/-0)
app/alarm/AlarmLabel.qml (+61/-0)
app/alarm/AlarmList.qml (+161/-0)
app/alarm/AlarmPage.qml (+53/-0)
app/alarm/AlarmRepeat.qml (+108/-0)
app/alarm/AlarmSound.qml (+115/-0)
app/alarm/AlarmUtils.qml (+136/-0)
app/alarm/CMakeLists.txt (+6/-0)
app/alarm/EditAlarmPage.qml (+203/-0)
app/clock/AddCityButton.qml (+70/-0)
app/clock/CMakeLists.txt (+6/-0)
app/clock/Clock.qml (+131/-0)
app/clock/ClockPage.qml (+124/-0)
app/components/Background.qml (+33/-0)
app/components/CMakeLists.txt (+6/-0)
app/components/ClockCircle.qml (+116/-0)
app/components/PageWithBottomEdge.qml (+392/-0)
app/components/PullToAdd.qml (+77/-0)
app/components/SubtitledListItem.qml (+55/-0)
app/components/Utils.js (+23/-0)
app/graphics/CMakeLists.txt (+6/-0)
app/tests/autopilot/run (+11/-0)
app/tests/autopilot/ubuntu-clock-app/__init__.py (+132/-0)
app/tests/autopilot/ubuntu-clock-app/main/__init__.py (+1/-0)
app/tests/autopilot/ubuntu-clock-app/main/test_main.py (+23/-0)
app/tests/unit/tst_hellocomponent.qml (+49/-0)
app/ubuntu-clock-app.desktop.in (+10/-0)
app/ubuntu-clock-app.qml (+107/-0)
backend/CMakeLists.txt (+21/-0)
backend/modules/Timezone/backend.cpp (+17/-0)
backend/modules/Timezone/backend.h (+38/-0)
backend/modules/Timezone/qmldir (+2/-0)
backend/modules/Timezone/zone.cpp (+12/-0)
backend/modules/Timezone/zone.h (+25/-0)
cmake/Click.cmake (+17/-0)
manifest.json (+15/-0)
ubuntu-clock-app.json (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1340326: No security policy to allow reading the /usr/share/ubuntu/ringtones folder

High

Fix Released

Link a bug report

Related blueprints

16. By Victor Thompson on 2014-07-11

Fix apparmor ringtone issue once fixed in the platform

15. By Nekhelesh Ramananthan on 2014-07-09

- Updated framework version to ubuntu-sdk-14.10-dev2
- Renamed application ID to com.ubuntu.clock.devel to allow both clock apps to coexist on the phone
- Fixed desktop file name
- Added calendar security policy group to access alarms
- Fixed desktop file icon path

14. By Nekhelesh Ramananthan on 2014-07-07

Adds support to edit saved alarms.

13. By Nekhelesh Ramananthan on 2014-07-07

Added support for creating new alarms and made the pulltoadd component as a generic component since it is required in two places.

12. By Nekhelesh Ramananthan on 2014-07-03

Returns the clock time in the proper user locale.

11. By Nekhelesh Ramananthan on 2014-06-27

Fix CMakeLists.txt for apparmor file

10. By Nekhelesh Ramananthan on 2014-06-26

Allow text animation in clock face

9. By Nekhelesh Ramananthan on 2014-06-26

Split labels to allow for a different color time divider. Added support for 12-hour time display of period (AM/PM)

8. By Nekhelesh Ramananthan on 2014-06-19

Updates the font size of several UI elements according to the latest design spec. Added a new app and clock texture background. Clock app will respect system time format now.

7. By Nekhelesh Ramananthan on 2014-06-19

Implemented the new bottom edge with alarm lists. Also added a PageStack to support add city and alarm pages.