Ubuntu Calendar App

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

filesRestructure
Merge into trunk

Proposed by Mihir Soni on 2014-09-11

Status:	Work in progress
Proposed branch:	lp://qastaging/~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure
Merge into:	lp://qastaging/ubuntu-calendar-app
Diff against target:	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)
To merge this branch:	bzr merge lp://qastaging/~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2014-10-20
Nekhelesh Ramananthan		2014-09-11	Needs Fixing on 2014-09-12
Review via email: mp+234365@code.qastaging.launchpad.net

Commit message

Restructure of files.

Description of the change

Restructure of files.

1.Please suggest if any changes are required.
2.I have done bifurcation based on my understanding and files that are being used in project.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-11:

FAILED: Continuous integration, rev:443
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/786/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/291/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/344/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-11:

FAILED: Continuous integration, rev:445
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/787/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/292
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/345

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-11:

FAILED: Continuous integration, rev:446
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/788/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/293/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/293/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/346

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-09-12:

On an brief look and testing, I feel that we can organize it even more by moving the following into a folder called "app",

- components
- events
- images
- timelineComponents
- views
- js
- calendar.qml
- calendar-app@30.png
- calendar-app@30.png

The following files are not required and can be removed,

- calendarTests.qml
- Scroller.qml
- calendar-app.in

This obviously will require further fixes in the cmake files. But we can get zbenjamin's help on that.

review: Needs Fixing

Revision history for this message

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

FAILED: Continuous integration, rev:447
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/790/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/312/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/348/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:449
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/792/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/319/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/350/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-20:

FAILED: Continuous integration, rev:452
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/932/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1067/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/490/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure updated on 2014-10-20

453. By Mihir Soni on 2014-10-20: Moved Recurrence.js to event directory

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-20:

FAILED: Continuous integration, rev:453
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/933/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1069/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/491/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure updated on 2014-10-20

454. By Mihir Soni on 2014-10-20: added proper reference to autopilot & added new reference to new files
455. By Mihir Soni on 2014-10-20: merge with trunk

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-20:

FAILED: Continuous integration, rev:455
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/934/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1072/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/492/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure updated on 2014-10-20

456. By Mihir Soni on 2014-10-20: reverted pot changes in cmake

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-20:

FAILED: Continuous integration, rev:456
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/936/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1075/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/494/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Samith

Ubuntu Calendar Developers

to status/vote changes:

Nohat Bughead