lp:~vthompson/ubuntu-calendar-app/merge-ap-fix-branches

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-calendar-app at revision 168

Nicholas Skaggs (community): Needs Fixing on 2013-11-22

Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration) on 2013-11-22

Diff: 241 lines (+65/-34)

7 files modified

WeekView.qml (+1/-0)
debian/control (+1/-1)
tests/autopilot/calendar_app/emulators.py (+9/-2)
tests/autopilot/calendar_app/tests/test_dayview.py (+1/-2)
tests/autopilot/calendar_app/tests/test_monthview.py (+1/-1)
tests/autopilot/calendar_app/tests/test_weekview.py (+6/-11)
tests/autopilot/calendar_app/tests/test_yearview.py (+46/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

174. By Victor Thompson on 2013-11-16

Use property with first day of the week.

173. By Victor Thompson on 2013-11-16

Use locale to determine first day of week

172. By Victor Thompson on 2013-11-16

Fix pep8 failures

171. By Victor Thompson on 2013-11-16

Fix pep8 failures

170. By Victor Thompson on 2013-11-16

Fix test_selecting_a_month_switch_to_month_view test

169. By Victor Thompson on 2013-11-16

Fix test_current_week_is_selected test

168. By Victor Thompson on 2013-11-16

Fix test_current_day_is_selected test

167. By Victor Thompson on 2013-11-16

Merge failing-tests branch

166. By Victor Thompson on 2013-11-16

No op

165. By Victor Thompson on 2013-11-14

Merge fix ap1.4 branch