Merge lp:~ibelieve/ubuntu-filemanager-app/advanced-options into lp:ubuntu-filemanager-app
Proposed by
Michael Spencer
Status: | Merged |
---|---|
Approved by: | Nicholas Skaggs |
Approved revision: | 49 |
Merged at revision: | 56 |
Proposed branch: | lp:~ibelieve/ubuntu-filemanager-app/advanced-options |
Merge into: | lp:ubuntu-filemanager-app |
Diff against target: |
294 lines (+198/-10) 5 files modified
FolderListPage.qml (+12/-2) OptionsPopover.qml (+31/-7) SettingsSheet.qml (+40/-0) Storage.qml (+58/-0) ubuntu-filemanager-app.qml (+57/-1) |
To merge this branch: | bzr merge lp:~ibelieve/ubuntu-filemanager-app/advanced-options |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Nicholas Skaggs (community) | Approve | ||
Arto Jalkanen | Pending | ||
Review via email:
|
Commit message
Added settings sheet and advanced option to filter files
Description of the change
Adds a settings sheet and the ability to hide/show advanced features. This allows the app to have features that advanced/power users want, while still being simple for regular users.
This also adds an advanced option to filter the files by a regex, so for example, a user can only see JPGs by using the "*.jpg" regex.
To post a comment you must log in.
FAILED: Continuous integration, rev:48 /code.launchpad .net/~mdspencer /ubuntu- filemanager- app/advanced- options/ +merge/ 175440/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// 91.189. 93.70:8080/ job/ubuntu- filemanager- app-ci/ 8/ 91.189. 93.70:8080/ job/ubuntu- filemanager- app-precise- amd64-ci/ 6 91.189. 93.70:8080/ job/ubuntu- filemanager- app-quantal- amd64-ci/ 9 91.189. 93.70:8080/ job/ubuntu- filemanager- app-raring- amd64-ci/ 9 91.189. 93.70:8080/ job/ubuntu- filemanager- app-saucy- amd64-ci/ 6
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- filemanager- app-ci/ 8/rebuild
http://