Merge lp://staging/~nskaggs/reminders-app/oauth-ap into lp://staging/reminders-app
Proposed by
Nicholas Skaggs
Status: | Rejected |
---|---|
Rejected by: | David Planella |
Proposed branch: | lp://staging/~nskaggs/reminders-app/oauth-ap |
Merge into: | lp://staging/reminders-app |
Diff against target: |
668 lines (+424/-159) 9 files modified
src/app/qml/reminders.qml (+2/-0) src/app/qml/ui/AccountSelectorPage.qml (+2/-0) src/app/qml/ui/NotesPage.qml (+1/-0) tests/autopilot/reminders/main/__init__.py (+0/-1) tests/autopilot/reminders/main/test_main.py (+0/-28) tests/autopilot/reminders_app/__init__.py (+7/-130) tests/autopilot/reminders_app/emulators.py (+47/-0) tests/autopilot/reminders_app/tests/__init__.py (+304/-0) tests/autopilot/reminders_app/tests/test_reminders.py (+61/-0) |
To merge this branch: | bzr merge lp://staging/~nskaggs/reminders-app/oauth-ap |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Planella | Disapprove | ||
Review via email: mp+204107@code.staging.launchpad.net |
Commit message
OAuth hackery in order to allow AP tests to run
Description of the change
OAuth hackery in order to allow AP tests to run
To post a comment you must log in.
Unmerged revisions
- 46. By Nicholas Skaggs
-
merge carla's changes
- 45. By Nicholas Skaggs
-
fix content dir and ap naming
- 44. By Nicholas Skaggs
-
add tweaks for oauth from lp:~nskaggs/reminders-app/fake-oauth-for-ap
Rejected as per the discussion with Nick. Leo's new branches render these changes obsolete.