Ubuntu Calendar App

Merge lp://staging/~gary-wzl77/ubuntu-calendar-app/fix_1440583 into lp://staging/ubuntu-calendar-app

fix_1440583
Merge into trunk

Proposed by Gary.Wang on 2015-07-12

Status:

Merged

Approved by:

Alan Pope 🍺🐧🐱 🦄 on 2015-08-07

Approved revision:

707

Merged at revision:

707

Proposed branch:

lp://staging/~gary-wzl77/ubuntu-calendar-app/fix_1440583

Merge into:

lp://staging/ubuntu-calendar-app

Diff against target:

360 lines (+59/-51)

5 files modified

EventDetails.qml (+3/-0)
EventRepetition.qml (+13/-8)
NewEvent.qml (+9/-9)
TimeLineBase.qml (+1/-1)
po/com.ubuntu.calendar.pot (+33/-33)

To merge this branch:

bzr merge lp://staging/~gary-wzl77/ubuntu-calendar-app/fix_1440583

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Pope 🍺🐧🐱 🦄 (community)		2015-07-12	Approve on 2015-08-07
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-08-04
Mihir Soni			Needs Fixing on 2015-07-30
Review via email: mp+264487@code.staging.launchpad.net

Commit message

Remove recurrence rule for non-repeating event.

Description of the change

Remove recurrence rule for non-repeating event.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-07-12:

PASSED: Continuous integration, rev:693
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1211/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3068
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3068/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/682
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/208

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

review: Approve (continuous-integration)

lp://staging/~gary-wzl77/ubuntu-calendar-app/fix_1440583 updated on 2015-07-30

693. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-13

Launchpad automatic translations update.

694. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-16

Launchpad automatic translations update.

695. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-17

Launchpad automatic translations update.

696. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-23

Launchpad automatic translations update.

697. By Kunal Parmar on 2015-07-23

resolves 1426519

handing the invocation from URL. Fixes: https://bugs.launchpad.net/bugs/1426519, https://bugs.launchpad.net/bugs/1439049.

Approved by Ubuntu Phone Apps Jenkins Bot, Bartosz Kosiorek.

698. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-24

Launchpad automatic translations update.

699. By Kunal Parmar on 2015-07-25

Resolves Bug #1470583. Fixes: https://bugs.launchpad.net/bugs/1470583.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

700. By Kunal Parmar on 2015-07-25

resolves bug #1347836. Fixes: https://bugs.launchpad.net/bugs/1347836.

Approved by Ubuntu Phone Apps Jenkins Bot.

701. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-28

Launchpad automatic translations update.

702. By Kunal Parmar on 2015-07-30

By default no selection in weekview, this is current implementation in MonthView as well.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

Revision history for this message

Mihir Soni (mihirsoni) wrote on 2015-07-30:

Hi ,

The attached bug code looks , fine it seems you have also added code for WeekNumber in this MP.

Could you please remove that and push the changes again ?

review: Needs Fixing

lp://staging/~gary-wzl77/ubuntu-calendar-app/fix_1440583 updated on 2015-08-02

703. By Gary.Wang on 2015-07-30

1.fix display bug for multiple all day events
2.skip event bubble display in case of endDateTime == dd-MM-yyyy 12:00 AM. Fixes: https://bugs.launchpad.net/bugs/1472081.

Approved by Mihir Soni, Alan Pope , Ubuntu Phone Apps Jenkins Bot.

704. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-07-31