Ubuntu Notes app

Merge lp://qastaging/~rottinrob/reminders-app/trunk into lp://qastaging/reminders-app

  1. trunk
  2. Merge into trunk
Proposed by Robert D Rees
Status: Rejected
Rejected by: Michael Zanetti
Proposed branch: lp://qastaging/~rottinrob/reminders-app/trunk
Merge into: lp://qastaging/reminders-app
Diff against target: 43864 lines (has conflicts) 
Conflict adding file .excludes.  Moved existing file to .excludes.moved.
Conflict adding file Makefile.  Moved existing file to Makefile.moved.
Conflict adding file components.  Moved existing file to components.moved.
Conflict adding file manifest.json.  Moved existing file to manifest.json.moved.
Conflict adding file tests.  Moved existing file to tests.moved.
To merge this branch: bzr merge lp://qastaging/~rottinrob/reminders-app/trunk
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Disapprove
David Planella Needs Fixing
Ubuntu Phone Apps Jenkins Bot continuous-integration Pending
Review via email: mp+195840@code.qastaging.launchpad.net

Description of the change

Implemented a PageStack UI with a Flickable feature to Notebooks, Notes and Reminders.

To post a comment you must log in.
lp://qastaging/~rottinrob/reminders-app/trunk updated
12. By Robert D Rees

Working PageStack UI - Tweek Exploration

Revision history for this message
Jordan Keyes (jkeyes0) wrote :

Minor bug/comment: the "notebookView" page doesn't have a definition for the Back button, so it defaults to using the one provided by PageStack. If you go into a notebook, then into a note, and hit "Back", you go back to the notebook. Hitting "Back" again takes you back into the note, instead of back up to the list of notebooks. If that's by design, we might consider adding a "Home" button to the toolbar as well.

Revision history for this message
David Planella (dpm) wrote :

Thanks Rob for the merge proposal!

I've found a couple of things that might need tweaking, if you could address them before the branch lands into trunk, that'd be awesome. Here they are:

3 === added file 'Gruntfile.js'

What is the purpose of this file?

221 === added file 'Reminders app wireframes.pdf'

I'd recommend not adding binary files to the source tree. The wireframes and other resources can be consulted at https://wiki.ubuntu.com/Touch/CoreApps/RemindersApp

Looking at the merge page, it seems that the branch has got some conflicts you might need to resolve as well.

review: Needs Fixing
Revision history for this message
David Planella (dpm) wrote :

On second thoughts, and given the fact that Nekhelesh has been working on the PageStack structure too, for the sake of simplicity I'd recommend the following:

1. Pull trunk with bzr pull lp:reminders-app

2. Since you are working on the Notebooks view, add your changes to the ui/Notebooks.qml file, commit and push a new branch

3. Submit a new merge proposal for the new branch.

I think this will make things a lot simpler. Let me know if that makes sense and if it works for you.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

I don't think we should have hand written Makefiles around, now that we use C++/Qt and qmake.

review: Needs Fixing
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Rejecting this due to lack of activity and conflicts everywhere.

review: Disapprove

Unmerged revisions

12. By Robert D Rees

Working PageStack UI - Tweek Exploration

11. By Robert D Rees

Working PageStack UI for Reminders App

10. By Robert D Rees

UI Utilizing PageStack

9. By Robert D Rees

UI Hack

8. By Robert D Rees

replacing deleted files

7. By Robert D Rees

UI Hacks

6. By Robert D Rees

Latest Hack Utilizing JS, HTML, jsOAuth

5. By Robert D Rees

jsOAuth Added For Reference

4. By Robert D Rees

Added the EvernoteJS SDK

3. By Robert D Rees

Latest Hack

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