lp://qastaging/~timo-jyrinki/ubuntu-calendar-app/revert_213_that_reverted_212

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/ubuntu-calendar-app

Roman Shchekin (community): Needs Fixing on 2014-04-01

Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration) on 2014-03-24

Ubuntu Calendar Developers: Pending requested 2014-03-24

Diff: 741 lines (+266/-223)

8 files modified

DayView.qml (+3/-4)
MonthView.qml (+12/-17)
WeekView.qml (+74/-76)
YearView.qml (+63/-61)
calendar.qml (+100/-49)
tests/autopilot/calendar_app/emulators.py (+0/-3)
tests/autopilot/calendar_app/tests/__init__.py (+1/-4)
tests/autopilot/calendar_app/tests/test_calendar.py (+13/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

221. By Timo Jyrinki on 2014-03-24

Revert bzr213 that reverted bzr212, taking into accound conflicts in calendar.qml and WeekView.qml.

220. By Kunal Parmar on 2014-03-23

fix for Bug #1290728,

Click on today will move yearview to current year. Fixes: https://bugs.launchpad.net/bugs/1290728.

Approved by Ubuntu Phone Apps Jenkins Bot, Mihir Soni.

219. By Kunal Parmar on 2014-03-23

fixes Bug #1279842
Setting minimum height of eventbubble to height of time label. Fixes: https://bugs.launchpad.net/bugs/1279842, https://bugs.launchpad.net/bugs/1294672.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

218. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2014-03-23

Launchpad automatic translations update.

217. By Kunal Parmar on 2014-03-22

Resolves Bug #1295068,Bug #1294679,

When Week or day tab is selected, view scrolls to current time

When inside week or day view when user changes the week or day, keep current scrolled time. Fixes: https://bugs.launchpad.net/bugs/1294679, https://bugs.launchpad.net/bugs/1295068.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

216. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2014-03-21

Launchpad automatic translations update.

215. By ybon on 2014-03-21

Add a method for getting the correct end of day date, and use it on dayview. Fixes: https://bugs.launchpad.net/bugs/1279933.

Approved by Ubuntu Phone Apps Jenkins Bot, Olivier Tilloy.

214. By Nicholas Skaggs on 2014-03-20

Backup db's while running tests for now instead of patching.

Approved by Ubuntu Phone Apps Jenkins Bot.

213. By Nicholas Skaggs on 2014-03-20

Revert rev 212. Fixes: https://bugs.launchpad.net/bugs/1294181.

Approved by Timo Jyrinki, Ubuntu Phone Apps Jenkins Bot.

212. By Kunal Parmar on 2014-03-13

Not loading all page at startup, instead now using loader element to load particular view on tab selection,.

Approved by Ubuntu Phone Apps Jenkins Bot, Olivier Tilloy.