lp://qastaging/~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/ubuntu-calendar-app

Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration) on 2014-10-20

Nekhelesh Ramananthan: Needs Fixing on 2014-09-12

Diff: 780 lines (+123/-224)

28 files modified

CMakeLists.txt (+3/-2)
Scroller.qml (+0/-147)
app/CMakeLists.txt (+21/-0)
app/EventActions.qml (+4/-2)
app/calendar.qml (+13/-9)
app/components/CMakeLists.txt (+6/-0)
app/components/DayHeaderBackground.qml (+3/-2)
app/events/CMakeLists.txt (+6/-0)
app/events/NewEvent.qml (+1/-0)
app/images/CMakeLists.txt (+6/-0)
app/timelineComponents/AllDayEventComponent.qml (+6/-6)
app/timelineComponents/CMakeLists.txt (+6/-0)
app/timelineComponents/TimeLineBackground.qml (+1/-0)
app/timelineComponents/TimeLineBase.qml (+5/-3)
app/timelineComponents/TimeLineBaseComponent.qml (+4/-2)
app/timelineComponents/TimeLineHeader.qml (+3/-1)
app/timelineComponents/TimeLineHeaderComponent.qml (+4/-2)
app/views/AgendaView.qml (+4/-2)
app/views/CMakeLists.txt (+6/-0)
app/views/DayView.qml (+6/-2)
app/views/MonthComponent.qml (+4/-4)
app/views/MonthView.qml (+3/-2)
app/views/WeekView.qml (+4/-2)
app/views/YearView.qml (+2/-1)
calendar-app.in (+0/-3)
calendarTests.qml (+0/-30)
tests/autopilot/calendar_app/tests/__init__.py (+1/-1)
tests/unittests/tst_date.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

456. By Mihir Soni on 2014-10-20

reverted pot changes in cmake

455. By Mihir Soni on 2014-10-20

merge with trunk

454. By Mihir Soni on 2014-10-20

added proper reference to autopilot & added new reference to new files

453. By Mihir Soni on 2014-10-20

Moved Recurrence.js to event directory

452. By Mihir Soni on 2014-10-20

merged mzanetti cmake patch

451. By Mihir Soni on 2014-10-20

resolved merge issue

450. By Mihir Soni on 2014-10-20

Merge from trunk

449. By Nekhelesh Ramananthan on 2014-09-12

reverted manifest file change

448. By Nekhelesh Ramananthan on 2014-09-12

Some small cmake fixes

447. By Mihir Soni on 2014-09-12

Moved everything under app directory