Merge lp:~pkunal-parmar/ubuntu-calendar-app/1240810_yearoverflow into lp:ubuntu-calendar-app

[Kunal Parmar]

bug#1240810 fixed

bug#1240810, fixed

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/163/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1149
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/163
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/163
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/163
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/163

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/163/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Good work Kunal, now year view it's ok!

review: Approve

[Kunal Parmar (pkunal-parmar)]

HI Riccardo, Thanks for review, If code change is fine than can you change MR's Status to Approved as well ?

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/8

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/1240810_yearoverflow]

158. By Kunal Parmar on 2013-11-27

Merge from trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:158
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/220/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/304
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/54

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/220/rebuild

review: Approve (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/1240810_yearoverflow]

159. By Kunal Parmar on 2013-11-27

Merge from trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:159
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/222/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/312
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/222
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/222
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/56

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/222/rebuild

review: Approve (continuous-integration)

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2013-10-22 17:32:19 +0000
+++ MonthComponent.qml	2013-11-27 23:13:57 +0000
@@ -32,6 +32,7 @@
 
             anchors.top: parent.top
             anchors.topMargin: units.gu(1.5)
+            anchors.bottomMargin: units.gu(1)
             anchors.fill: parent
             spacing: units.gu(1.5)
 

=== modified file 'YearView.qml'
--- YearView.qml	2013-10-09 10:46:23 +0000
+++ YearView.qml	2013-11-27 23:13:57 +0000
@@ -51,7 +51,7 @@
         anchors.top: parent.top
 
         cellWidth: width/2
-        cellHeight: cellWidth * 1.2
+        cellHeight: cellWidth * 1.4
 
         model: 12 /* months in a year */
         snapMode: GridView.SnapOneRow