Viewing all changes in revision 139.
- Committer: Leo Arias
- Date: 2014-09-10 14:53:18 UTC
- mfrom: (134.1.44 ubuntu-system-settings-online-accounts)
- Revision ID: leo.arias@canonical.com-20140910145318-uclki0rhte8h0vc6
Merged with trunk.
- files added:
- online-accounts-service
- tests/online-accounts-service
- tests/online-accounts-service/mock
- files removed:
- system-settings-plugin/plugin.cpp
- files renamed:
- src/com.canonical.indicators.webcredentials.xml => online-accounts-service/com.canonical.indicators.webcredentials.xml
- src/com.ubuntu.OnlineAccountsUi.service.in => online-accounts-service/com.ubuntu.OnlineAccountsUi.service.in
- src/com.ubuntu.OnlineAccountsUi.xml => online-accounts-service/com.ubuntu.OnlineAccountsUi.xml
- src/inactivity-timer.cpp => online-accounts-service/inactivity-timer.cpp
- src/inactivity-timer.h => online-accounts-service/inactivity-timer.h
- src/indicator-service.cpp => online-accounts-service/indicator-service.cpp
- src/indicator-service.h => online-accounts-service/indicator-service.h
- src/reauthenticator.cpp => online-accounts-service/reauthenticator.cpp
- src/reauthenticator.h => online-accounts-service/reauthenticator.h
- src/request-manager.cpp => online-accounts-service/request-manager.cpp
- src/request-manager.h => online-accounts-service/request-manager.h
- src/service.cpp => online-accounts-service/service.cpp
- src/service.h => online-accounts-service/service.h
- src/signonui-service.cpp => online-accounts-service/signonui-service.cpp
- src/signonui-service.h => online-accounts-service/signonui-service.h
- src/ => online-accounts-ui/
- src/online-accounts-ui.pro => online-accounts-ui/online-accounts-ui-helper.pro
- src/src.pro => online-accounts-ui/online-accounts-ui.pro
- src/qml/AccountEditPage.qml => system-settings-plugin/AccountEditPage.qml
- src/qml/AccountItem.qml => system-settings-plugin/AccountItem.qml
- src/qml/AccountsPage.qml => system-settings-plugin/AccountsPage.qml
- src/qml/AddAccountLabel.qml => system-settings-plugin/AddAccountLabel.qml
- src/qml/MainPage.qml => system-settings-plugin/MainPage.qml
- src/qml/NewAccountPage.qml => system-settings-plugin/NewAccountPage.qml
- src/qml/NoAccountsPage.qml => system-settings-plugin/NoAccountsPage.qml
- src/qml/NormalStartupPage.qml => system-settings-plugin/NormalStartupPage.qml
- src/qml/ProviderPluginList.qml => system-settings-plugin/ProviderPluginList.qml
- src/qml/ProvidersList.qml => system-settings-plugin/ProvidersList.qml
- tests/online-accounts-ui/tst_inactivity_timer.cpp => tests/online-accounts-service/tst_inactivity_timer.cpp
- tests/online-accounts-ui/tst_inactivity_timer.pro => tests/online-accounts-service/tst_inactivity_timer.pro
- tests/online-accounts-ui/tst_service.cpp => tests/online-accounts-service/tst_service.cpp
- tests/online-accounts-ui/tst_service.pro => tests/online-accounts-service/tst_service.pro
- files modified:
- .bzrignore
expand all
collapse all
added
removed
