← Back to branch summary

~popey/ubuntu-filemanager-app/add-click-deps

~popey/ubuntu-filemanager-app/add-click-deps

Viewing all changes in revision 468.

Committer: Alan Pope
Date: 2015-10-13 16:49:05 UTC
mfrom: (462.1.15 ubuntu-filemanager-app)
Revision ID: popey@ubuntu.com-20151013164905-nzl8iys0yz02z1dq

Merge trunk

files added:
src/app/qml/components/NetAuthenticationHandler.qml

src/app/qml/ui/NetAuthenticationDialog.qml

src/plugin/test_placesmodel

src/plugin/test_placesmodel/placesmodeltest.cpp

src/plugin/test_placesmodel/test_placesmodel.pro

files modified:
CMakeLists.txt

po/am.po

po/ar.po

po/ast.po

po/be.po

po/bg.po

po/br.po

po/bs.po

po/ca.po

po/ckb.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hu.po

po/id.po

po/it.po

po/ja.po

po/km.po

po/kn.po

po/lo.po

po/lt.po

po/lv.po

po/ml.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sa.po

po/shn.po

po/sk.po

po/sl.po

po/sr.po

po/sv.po

po/ta.po

po/tr.po

po/ug.po

po/uk.po

po/uz.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/app/qml/components/FolderIconDelegate.qml

src/app/qml/components/FolderListDelegate.qml

src/app/qml/components/PlacesSidebar.qml

src/app/qml/ui/FolderListPage.qml

src/plugin/folderlistmodel/diriteminfo.cpp

src/plugin/folderlistmodel/diriteminfo.h

src/plugin/folderlistmodel/dirmodel.cpp

src/plugin/folderlistmodel/dirmodel.h

src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.h

src/plugin/folderlistmodel/smb/smblistworker.cpp

src/plugin/folderlistmodel/smb/smblistworker.h

src/plugin/folderlistmodel/smb/smblocation.cpp

src/plugin/folderlistmodel/urliteminfo.cpp

src/plugin/placesmodel/placesmodel.cpp

src/plugin/placesmodel/placesmodel.h

Show diffs side-by-side

added added

removed removed

src/app/qml/components/FolderIconDelegate.qml

src/app/qml/components/FolderListDelegate.qml

src/app/qml/components/NetAuthenticationHandler.qml

src/app/qml/components/PlacesSidebar.qml

src/app/qml/ui/FolderListPage.qml

src/app/qml/ui/NetAuthenticationDialog.qml

src/plugin/folderlistmodel/diriteminfo.cpp

src/plugin/folderlistmodel/diriteminfo.h

src/plugin/folderlistmodel/dirmodel.cpp

src/plugin/folderlistmodel/dirmodel.h

src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.h

src/plugin/folderlistmodel/smb/smblistworker.cpp

src/plugin/folderlistmodel/smb/smblistworker.h

src/plugin/folderlistmodel/smb/smblocation.cpp

src/plugin/folderlistmodel/urliteminfo.cpp

src/plugin/placesmodel/placesmodel.cpp

src/plugin/placesmodel/placesmodel.h

src/plugin/test_placesmodel/

src/plugin/test_placesmodel/placesmodeltest.cpp

src/plugin/test_placesmodel/test_placesmodel.pro

Older »