[Pkg-owncloud-commits] [owncloud-client] 04/15: Merge tag 'upstream/1.4.0+dfsg'
Sandro Knauß
hefee-guest at alioth.debian.org
Wed Sep 11 22:16:12 UTC 2013
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit cd989b143f9dee1e7a0db5429f69e70a5c38b0b1
Merge: 959bb33 276b058
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Wed Sep 11 19:33:13 2013 +0200
Merge tag 'upstream/1.4.0+dfsg'
Upstream version 1.4.0+dfsg
# gpg: Unterschrift vom Mi 11 Sep 2013 19:33:12 CEST mittels RSA-Schlüssel ID 50605636
# gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
.gitmodules | 3 +
.tag | 2 +-
CMakeLists.txt | 39 +-
ChangeLog | 31 +
OWNCLOUD.cmake | 10 +-
VERSION.cmake | 4 +-
cmake/modules/DefineInstallationPaths.cmake | 108 +
cmake/modules/NSIS.template.in | 109 +-
cmake/modules/Warnings.cmake | 20 +
config.h.in | 7 +-
doc/CMakeLists.txt | 29 +-
doc/accountsetup.rst | 37 +
doc/advancedusage.rst | 14 +
doc/architecture.rst | 111 +-
doc/building.rst | 8 +-
doc/conf.py.in | 6 +-
doc/glossary.rst | 3 +-
doc/images/branding_setup.png | Bin 45938 -> 0 bytes
doc/images/icon.png | Bin 0 -> 1290 bytes
doc/images/ignored_files_editor.png | Bin 0 -> 49080 bytes
doc/images/menu.png | Bin 0 -> 18110 bytes
doc/images/settings_account.png | Bin 0 -> 73614 bytes
doc/images/settings_general.png | Bin 0 -> 50908 bytes
doc/images/settings_network.png | Bin 0 -> 60526 bytes
doc/images/sync_protocol.png | Bin 0 -> 171942 bytes
doc/images/wizard_overview.png | Bin 0 -> 41211 bytes
doc/images/wizard_targetfolder.png | Bin 0 -> 39694 bytes
doc/images/wizard_url.png | Bin 0 -> 40236 bytes
doc/images/wizard_user.png | Bin 0 -> 38342 bytes
doc/index.rst | 7 +-
doc/install.rst | 36 -
doc/introduction.rst | 37 +
doc/options.rst | 19 +-
doc/troubleshooting.rst | 36 +-
doc/usage.rst | 55 -
doc/visualtour.rst | 178 ++
mirall.desktop.in | 3 +-
mirall.qrc | 2 +
resources/network.png | Bin 0 -> 1083 bytes
resources/settings.png | Bin 0 -> 2754 bytes
src/CMakeLists.txt | 123 +-
src/creds/abstractcredentials.h | 47 +
src/creds/credentialscommon.cpp | 77 +
.../credentialscommon.h} | 39 +-
src/creds/credentialsfactory.cpp | 43 +
.../utility.h => creds/credentialsfactory.h} | 33 +-
src/creds/dummycredentials.cpp | 56 +
src/creds/dummycredentials.h | 39 +
src/{mirall => creds/http}/credentialstore.cpp | 105 +-
src/{mirall => creds/http}/credentialstore.h | 23 +-
src/creds/http/httpconfigfile.cpp | 81 +
src/creds/http/httpconfigfile.h | 40 +
src/creds/httpcredentials.cpp | 218 ++
src/creds/httpcredentials.h | 64 +
src/creds/shibboleth/shibbolethaccessmanager.cpp | 55 +
src/creds/shibboleth/shibbolethaccessmanager.h | 43 +
src/creds/shibboleth/shibbolethconfigfile.cpp | 104 +
src/creds/shibboleth/shibbolethconfigfile.h | 38 +
src/creds/shibboleth/shibbolethcookiejar.cpp | 34 +
src/creds/shibboleth/shibbolethcookiejar.h | 41 +
src/creds/shibboleth/shibbolethrefresher.cpp | 52 +
src/creds/shibboleth/shibbolethrefresher.h | 47 +
src/creds/shibboleth/shibbolethwebview.cpp | 104 +
src/creds/shibboleth/shibbolethwebview.h | 56 +
src/creds/shibbolethcredentials.cpp | 231 ++
src/creds/shibbolethcredentials.h | 72 +
src/main.cpp | 24 +-
src/mirall/accountsettings.cpp | 714 ++++++
src/mirall/accountsettings.h | 107 +
src/mirall/accountsettings.ui | 150 ++
src/mirall/application.cpp | 843 +++----
src/mirall/application.h | 95 +-
src/mirall/connectionvalidator.cpp | 107 +-
src/mirall/connectionvalidator.h | 8 +-
src/mirall/csyncthread.cpp | 155 +-
src/mirall/csyncthread.h | 12 +-
src/mirall/fileitemdialog.cpp | 304 ---
src/mirall/fileutils.h | 2 +-
src/mirall/folder.cpp | 621 ++++-
src/mirall/folder.h | 195 +-
src/mirall/folderman.cpp | 222 +-
src/mirall/folderman.h | 60 +-
src/mirall/folderstatusmodel.cpp | 306 +++
src/mirall/folderstatusmodel.h | 66 +
src/mirall/folderwatcher.cpp | 23 +-
src/mirall/folderwatcher.h | 30 +-
src/mirall/folderwatcher_inotify.cpp | 24 +-
src/mirall/folderwatcher_inotify.h | 4 +
src/mirall/folderwatcher_mac.h | 3 +
src/mirall/folderwatcher_win.h | 4 +
src/mirall/folderwizard.cpp | 250 +-
src/mirall/folderwizard.h | 23 +-
src/mirall/folderwizardsourcepage.ui | 40 +-
src/mirall/folderwizardtargetpage.ui | 160 +-
src/mirall/generalsettings.cpp | 94 +
src/mirall/generalsettings.h | 50 +
src/mirall/generalsettings.ui | 83 +
src/mirall/ignorelisteditor.cpp | 167 ++
src/mirall/ignorelisteditor.h | 49 +
src/mirall/ignorelisteditor.ui | 117 +
src/mirall/inotify.cpp | 13 +-
src/mirall/inotify.h | 5 +-
src/mirall/itemprogressdialog.cpp | 333 +++
.../{fileitemdialog.h => itemprogressdialog.h} | 43 +-
.../{fileitemdialog.ui => itemprogressdialog.ui} | 26 +-
src/mirall/logbrowser.cpp | 34 +-
src/mirall/logbrowser.h | 4 -
src/mirall/logger.cpp | 16 +-
src/mirall/logger.h | 6 +
src/mirall/mirallaccessmanager.cpp | 34 +
src/mirall/{utility.h => mirallaccessmanager.h} | 30 +-
src/mirall/mirallconfigfile.cpp | 539 ++--
src/mirall/mirallconfigfile.h | 72 +-
src/mirall/networksettings.cpp | 161 ++
src/mirall/networksettings.h | 50 +
src/mirall/networksettings.ui | 377 +++
src/mirall/owncloudcredentialspage.ui | 138 --
src/mirall/owncloudfolder.cpp | 532 ----
src/mirall/owncloudfolder.h | 116 -
src/mirall/owncloudinfo.cpp | 489 ++--
src/mirall/owncloudinfo.h | 94 +-
src/mirall/owncloudsetupwizard.cpp | 477 ++--
src/mirall/owncloudsetupwizard.h | 75 +-
src/mirall/owncloudtheme.cpp | 39 +-
src/mirall/owncloudtheme.h | 5 +-
src/mirall/owncloudwizard.cpp | 626 -----
src/mirall/owncloudwizard.h | 191 --
src/mirall/progressdispatcher.cpp | 206 ++
src/mirall/progressdispatcher.h | 123 +
src/mirall/proxydialog.cpp | 112 -
src/mirall/proxydialog.h | 43 -
src/mirall/proxydialog.ui | 252 --
src/mirall/settingsdialog.cpp | 126 +
src/mirall/settingsdialog.h | 56 +
src/mirall/settingsdialog.ui | 77 +
src/mirall/sslerrordialog.cpp | 29 +-
src/mirall/sslerrordialog.h | 9 +-
src/mirall/sslerrordialog.ui | 4 +-
src/mirall/statusdialog.cpp | 536 ----
src/mirall/statusdialog.h | 112 -
src/mirall/statusdialog.ui | 143 --
src/mirall/syncfileitem.h | 15 +-
src/mirall/syncresult.cpp | 78 +-
src/mirall/syncresult.h | 7 +
src/mirall/systray.h | 2 +-
src/mirall/theme.cpp | 75 +-
src/mirall/theme.h | 26 +-
src/mirall/updatedetector.cpp | 4 +-
src/mirall/utility.cpp | 251 +-
src/mirall/utility.h | 33 +-
.../utility.h => wizard/abstractcredswizardpage.h} | 25 +-
src/wizard/owncloudadvancedsetuppage.cpp | 250 ++
src/wizard/owncloudadvancedsetuppage.h | 73 +
src/wizard/owncloudadvancedsetuppage.ui | 270 ++
src/wizard/owncloudhttpcredspage.cpp | 162 ++
src/wizard/owncloudhttpcredspage.h | 61 +
src/wizard/owncloudhttpcredspage.ui | 135 +
src/wizard/owncloudsetupnocredspage.ui | 155 ++
src/wizard/owncloudsetuppage.cpp | 234 ++
src/wizard/owncloudsetuppage.h | 82 +
src/wizard/owncloudshibbolethcredspage.cpp | 141 ++
src/wizard/owncloudshibbolethcredspage.h | 63 +
src/wizard/owncloudwizard.cpp | 212 ++
src/wizard/owncloudwizard.h | 91 +
src/wizard/owncloudwizardcommon.cpp | 72 +
src/wizard/owncloudwizardcommon.h | 56 +
src/wizard/owncloudwizardresultpage.cpp | 116 +
src/wizard/owncloudwizardresultpage.h | 57 +
src/{mirall => wizard}/owncloudwizardresultpage.ui | 3 +
sync-exclude.lst | 22 +-
test/CMakeLists.txt | 2 +-
test/owncloud_add_test.cmake | 4 +-
test/testdanimostinkt.h | 24 -
test/testutility.h | 76 +
theme.qrc | 6 +
theme/black/state-information-16.png | Bin 0 -> 1396 bytes
theme/black/state-information-32.png | Bin 0 -> 1757 bytes
theme/black/state-information-64.png | Bin 0 -> 1925 bytes
theme/colored/state-information-16.png | Bin 0 -> 1761 bytes
theme/colored/state-information-32.png | Bin 0 -> 2963 bytes
theme/colored/state-information-64.png | Bin 0 -> 4896 bytes
theme/white/state-information-16.png | Bin 0 -> 1273 bytes
theme/white/state-information-32.png | Bin 0 -> 1575 bytes
theme/white/state-information-64.png | Bin 0 -> 1817 bytes
translations/.tx/config | 42 +-
translations/{mirall_zh_TW.ts => mirall_TW.ts} | 1826 +++++---------
translations/mirall_ca.ts | 2332 ++++++++----------
translations/mirall_cs.ts | 2133 ++++++++++++++++
translations/mirall_cs_CZ.ts | 2393 ------------------
translations/mirall_da.ts | 1775 --------------
translations/mirall_de.ts | 2549 +++++++++----------
translations/mirall_el.ts | 2448 +++++++++----------
translations/mirall_en.ts | 2335 ++++++++----------
translations/mirall_eo.ts | 2124 ----------------
translations/mirall_es.ts | 2497 +++++++++----------
translations/mirall_es_AR.ts | 2442 +++++++++---------
translations/{mirall_et_EE.ts => mirall_et.ts} | 2547 +++++++++----------
translations/mirall_eu.ts | 2348 ++++++++----------
translations/mirall_fa.ts | 2125 +++++++++-------
translations/{mirall_fi_FI.ts => mirall_fi.ts} | 2406 ++++++++----------
translations/mirall_fr.ts | 2437 ++++++++----------
translations/mirall_gl.ts | 2552 +++++++++----------
translations/mirall_he.ts | 1768 --------------
translations/mirall_hr.ts | 1778 --------------
translations/{mirall_hu_HU.ts => mirall_hu.ts} | 2404 ++++++++----------
translations/mirall_it.ts | 2545 +++++++++----------
translations/{mirall_ja_JP.ts => mirall_ja.ts} | 2533 +++++++++----------
translations/mirall_ka_GE.ts | 2393 ------------------
translations/mirall_ko.ts | 2151 ----------------
translations/mirall_lb.ts | 1768 --------------
translations/mirall_lt_LT.ts | 1770 --------------
translations/mirall_lv.ts | 2393 ------------------
translations/mirall_mk.ts | 1777 --------------
translations/mirall_ms_MY.ts | 1778 --------------
translations/mirall_nb_NO.ts | 1768 --------------
translations/mirall_nl.ts | 2570 +++++++++----------
translations/mirall_oc.ts | 1768 --------------
translations/mirall_pl.ts | 2444 +++++++++----------
translations/{mirall_pt_PT.ts => mirall_pt.ts} | 2350 ++++++++----------
translations/mirall_pt_BR.ts | 2558 +++++++++----------
translations/mirall_ro.ts | 1781 --------------
translations/mirall_ru.ts | 2539 +++++++++----------
translations/mirall_ru_RU.ts | 2139 ----------------
translations/mirall_si_LK.ts | 1768 --------------
translations/{mirall_sk_SK.ts => mirall_sk.ts} | 2579 +++++++++-----------
translations/mirall_sl.ts | 2438 ++++++++----------
translations/mirall_sr at latin.ts | 1768 --------------
translations/mirall_sv.ts | 2570 +++++++++----------
translations/mirall_ta_LK.ts | 2121 ----------------
translations/{mirall_th_TH.ts => mirall_th.ts} | 2328 ++++++++----------
translations/mirall_tr.ts | 1775 --------------
translations/mirall_uk.ts | 2348 ++++++++----------
translations/mirall_vi.ts | 2142 ----------------
translations/mirall_zh_CN.ts | 2423 ++++++++----------
translations/mirall_zh_TW.ts | 2412 ++++++++----------
235 files changed, 43811 insertions(+), 84274 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list