lp://qastaging/~timo-jyrinki/ubuntu-calendar-app/bug_1293489_mega-merge
Created by
Timo Jyrinki
and last modified
- Get this branch:
- bzr branch lp://qastaging/~timo-jyrinki/ubuntu-calendar-app/bug_1293489_mega-merge
Only
Timo Jyrinki
can upload to this branch. If you are
Timo Jyrinki
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Nicholas Skaggs (community): Disapprove
- Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration)
-
Diff: 802 lines (+243/-294)8 files modifiedDayView.qml (+4/-3)
MonthView.qml (+17/-12)
WeekView.qml (+69/-69)
YearView.qml (+61/-63)
calendar.qml (+46/-101)
tests/autopilot/calendar_app/emulators.py (+3/-0)
tests/autopilot/calendar_app/tests/__init__.py (+29/-34)
tests/autopilot/calendar_app/tests/test_calendar.py (+14/-12)
Branch information
Recent revisions
- 222. By Timo Jyrinki
-
Merge lp:~vthompson/ubuntu-calendar-app/scroll-in-test , resolving conflict (no "#input people" section here)
- 220. By Timo Jyrinki
-
Merge the lp:~nskaggs/ubuntu-calendar-app/standalone-ap-for-1293489 (already included)
- 217. By Nicholas Skaggs
-
switch to mocking, ensure new_event test passes by enforcing event occurence / lookup as today
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu-calendar-app