Merge lp://staging/~renatofilho/ubuntu-calendar-app/account-name-and-calendars into lp://staging/ubuntu-calendar-app
- account-name-and-calendars
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 884 |
Merged at revision: | 858 |
Proposed branch: | lp://staging/~renatofilho/ubuntu-calendar-app/account-name-and-calendars |
Merge into: | lp://staging/ubuntu-calendar-app |
Prerequisite: | lp://staging/~renatofilho/ubuntu-calendar-app/fix-model-update-after-save |
Diff against target: |
1199 lines (+464/-157) 19 files modified
AgendaView.qml (+1/-1) CalendarChoicePopup.qml (+16/-0) DayView.qml (+7/-2) EventActions.qml (+2/-2) EventBubble.qml (+12/-5) EventDetails.qml (+7/-10) EventListModel.qml (+65/-31) MonthView.qml (+6/-1) MonthWithEventsComponent.qml (+2/-1) NewEvent.qml (+41/-37) RemindersModel.qml (+80/-1) RemindersPage.qml (+108/-0) SettingsPage.qml (+12/-2) TimeLineBase.qml (+23/-6) TimeLineBaseComponent.qml (+1/-10) WeekView.qml (+21/-8) calendar.qml (+50/-36) calendar_canvas_worker.js (+1/-1) tests/unittests/tst_event_list_model.qml (+9/-3) |
To merge this branch: | bzr merge lp://staging/~renatofilho/ubuntu-calendar-app/account-name-and-calendars |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Jenkins Bot | continuous-integration | Approve | |
Kunal Parmar | Pending | ||
Review via email: mp+297113@code.staging.launchpad.net |
Commit message
Show the account name as subtitle for calendars.
Description of the change
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
- 855. By Renato Araujo Oliveira Filho
-
Create active property to allow disable 'autoUpdate' even if the sync is not running.
Avoid conflicts with 'autoUpdate' changes. - 856. By Renato Araujo Oliveira Filho
-
Disable 'sync' button only if is sync is running.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:856
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 857. By Renato Araujo Oliveira Filho
-
Disable model update if the app is not active.
- 858. By Renato Araujo Oliveira Filho
-
Fix typo.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:858
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 859. By Renato Araujo Oliveira Filho
-
Fix typo.
- 860. By Renato Araujo Oliveira Filho
-
Add more debug.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:860
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 861. By Renato Araujo Oliveira Filho
-
Avoid reload events if the model has invalid filter.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:861
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 862. By Renato Araujo Oliveira Filho
-
Set year as initial view if settings is empty.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:862
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 863. By Renato Araujo Oliveira Filho
-
Remove debug messages.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:863
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 864. By Renato Araujo Oliveira Filho
-
Allow to enter custom values for reminders.
- 865. By Renato Araujo Oliveira Filho
-
Force focus on interval field in custom reminder dialog.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:865
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 866. By Renato Araujo Oliveira Filho
-
Removed debug message.
- 867. By Renato Araujo Oliveira Filho
-
Avoid runtinme warnings.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:867
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 868. By Renato Araujo Oliveira Filho
-
Removed more debug messages.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:868
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 869. By Renato Araujo Oliveira Filho
-
Pla hepatic feedback after click and hold over a event bubble.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:869
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:869
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 870. By Renato Araujo Oliveira Filho
-
Added 'qtdeclarative5
-qtorganizer- plugin' as build dep, necessary for tests.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:870
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:870
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 871. By Renato Araujo Oliveira Filho
-
Trunk merged.
- 872. By Renato Araujo Oliveira Filho
-
Updated test.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:872
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:872
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:872
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 873. By Renato Araujo Oliveira Filho
-
Show 'No reminder' if the reminder list is empty.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:873
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:873
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:873
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 874. By Renato Araujo Oliveira Filho
-
Make sure that the calendar list is updated if the collections changed.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:874
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:874
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 875. By Renato Araujo Oliveira Filho
-
Sort collections by name;
Full expand calendar selector when clicked;
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:875
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:875
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 876. By Renato Araujo Oliveira Filho
-
Make sure that new floating event is drawed over the other events.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:876
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 877. By Renato Araujo Oliveira Filho
-
Fallback to month view in case of no previous page selected.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:877
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:876
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:877
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 878. By Renato Araujo Oliveira Filho
-
Push tabs on main stack after component completed.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:878
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:878
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 879. By Renato Araujo Oliveira Filho
-
Does not update model if the page is not active.
- 880. By Renato Araujo Oliveira Filho
-
Update collections list when new event page is activated.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:880
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:880
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 881. By Renato Araujo Oliveira Filho
-
only auto update view if it is active.
- 882. By Renato Araujo Oliveira Filho
-
Destroy all events bubble durin the destruction.
- 883. By Renato Araujo Oliveira Filho
-
Update view when page became active.
- 884. By Renato Araujo Oliveira Filho
-
Make collections model always active.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:884
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:884
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:854 /core-apps- jenkins. ubuntu. com/job/ calendar- app-ci/ 854/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/918/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ calendar- app-ci/ 854/rebuild
https:/