Merge lp://qastaging/~dpniel/ubuntu-calendar-app/uitk-1.3 into lp://qastaging/ubuntu-calendar-app
Proposed by
Dan Chapman ξΏ
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | Alan Pope πΊπ§π± π¦ | ||||
| Proposed branch: | lp://qastaging/~dpniel/ubuntu-calendar-app/uitk-1.3 | ||||
| Merge into: | lp://qastaging/ubuntu-calendar-app | ||||
| Diff against target: |
1583 lines (+372/-337) 49 files modified
AgendaView.qml (+2/-2) AllDayEventComponent.qml (+2/-2) CalendarChoicePopup.qml (+56/-60) CalendarListButtonDelegate.qml (+28/-30) ColorPickerDialog.qml (+3/-3) ContactChoicePopup.qml (+2/-2) DayHeaderBackground.qml (+1/-1) DayView.qml (+2/-2) DeleteConfirmationDialog.qml (+2/-2) EditEventConfirmationDialog.qml (+2/-2) EventActions.qml (+2/-2) EventBubble.qml (+2/-2) EventDetails.qml (+41/-23) EventListModel.qml (+2/-2) EventReminder.qml (+2/-2) EventRepetition.qml (+8/-9) EventUtils.qml (+2/-2) HeaderDateComponent.qml (+2/-2) KeyboardRectangle.qml (+1/-1) LimitLabelModel.qml (+1/-1) MonthComponent.qml (+2/-2) MonthComponentDateDelegate.qml (+1/-1) MonthView.qml (+2/-2) NewEvent.qml (+80/-68) NewEventEntryField.qml (+2/-2) NewEventTimePicker.qml (+2/-2) OnlineAccountsHelper.qml (+1/-1) PathViewBase.qml (+1/-1) RecurrenceLabelDefines.qml (+2/-2) RemindersModel.qml (+1/-1) ScrollAnimation.qml (+1/-1) Scroller.qml (+2/-2) SectionHeader.qml (+23/-0) Settings.qml (+20/-31) TimeLineBackground.qml (+2/-2) TimeLineBase.qml (+2/-2) TimeLineBaseComponent.qml (+10/-9) TimeLineHeader.qml (+1/-1) TimeLineHeaderComponent.qml (+2/-2) TimeLineTimeScale.qml (+1/-1) TimeSeparator.qml (+1/-1) ViewHeader.qml (+2/-2) WeekView.qml (+2/-2) YearView.qml (+2/-3) YearViewDelegate.qml (+2/-2) calendar.qml (+4/-4) calendarTests.qml (+2/-2) click/manifest.json.in (+1/-1) po/com.ubuntu.calendar.pot (+35/-35) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dpniel/ubuntu-calendar-app/uitk-1.3 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alan Pope πΊπ§π± π¦ (community) | Needs Fixing | ||
| Jenkins Bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
Update to UITK 1.3
Description of the change
Update Calendar to Ubuntu.Components 1.3
All imports have been changed to reflect newer uitk,
also switched all ListItems to use the new ListItem & ListItemLayouts
Not sure if the autopilot tests are working or not. I can't seem to get the environment setup correctly on xenial :-/
To post a comment you must log in.
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Alan Pope πΊπ§π± π¦ (popey) wrote | # |
Revision history for this message
| Dan Chapman ξΏ (dpniel) wrote | # |
Unmerged revisions
- 745. By Dan Chapman ξΏ
-
Update Calendar to Ubuntu.Components 1.3
All imports have been changed to reflect newer uitk,
also switched all ListItems to use the new ListItem & ListItemLayouts
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:745
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/