lp://staging/~nskaggs/ubuntu-filemanager-app/revert-r209

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu-filemanager-app at revision 211

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-06-19

Ubuntu File Manager Developers: Pending requested 2014-06-19

Diff: 734 lines (+104/-401)

15 files modified

debian/control (+1/-12)
debian/qtdeclarative5-placesmodel0.1.install (+0/-1)
src/app/qml/components/PathBar.qml (+1/-1)
src/app/qml/components/PlacesSidebar.qml (+36/-13)
src/app/qml/filemanager.qml (+2/-7)
src/app/qml/ui/FolderListPage.qml (+28/-15)
src/app/qml/ui/PlacesPopover.qml (+35/-2)
src/plugin/CMakeLists.txt (+0/-1)
src/plugin/placesmodel/CMakeLists.txt (+0/-35)
src/plugin/placesmodel/placesmodel.cpp (+0/-174)
src/plugin/placesmodel/placesmodel.h (+0/-64)
src/plugin/placesmodel/placesmodel_plugin.cpp (+0/-34)
src/plugin/placesmodel/placesmodel_plugin.h (+0/-39)
src/plugin/placesmodel/qmldir (+0/-2)
tests/autopilot/filemanager/tests/test_places.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1331948: filemanager.tests.test_places.PlacesTestCase tests failed on mako #88

Undecided

Fix Released

Link a bug report

Related blueprints

213. By Nicholas Skaggs on 2014-06-19

also revert test_places ap change

212. By Nicholas Skaggs on 2014-06-19

add back r210's fixes for tests

211. By Nicholas Skaggs on 2014-06-19

rollback to rev 208

210. By Leo Arias on 2014-06-18

Refactored the first group of context menu tests.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

209. By David Planella on 2014-06-18

Add places model plugin.

Approved by Ubuntu Phone Apps Jenkins Bot.

208. By Carlos Jose Mazieri on 2014-06-17

High level selection methods.

Approved by Arto Jalkanen, Ubuntu Phone Apps Jenkins Bot.

207. By Carlos Jose Mazieri on 2014-06-17

some tests.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

206. By Carlos Jose Mazieri on 2014-06-17

Code to complete Trash opearations: move into / restore from / restore all / empty trash.

Approved by Ubuntu Phone Apps Jenkins Bot, Arto Jalkanen.

205. By Victor Thompson on 2014-06-17

* Don't turn off OSK
* Fix various test failures. Fixes: https://bugs.launchpad.net/bugs/1256856, https://bugs.launchpad.net/bugs/1316677, https://bugs.launchpad.net/bugs/1329818.

Approved by Brendan Donegan, Ubuntu Phone Apps Jenkins Bot, Leo Arias.

204. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-06-17

Launchpad automatic translations update.