[tomboy/autosync: 34/241] Merge branch 'master' into autosync
- From: Sanford Armstrong <sharm src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tomboy/autosync: 34/241] Merge branch 'master' into autosync
- Date: Mon, 25 Jan 2010 19:37:20 +0000 (UTC)
commit db03d9e006e06ef141f56825c6f6e7e3d5626c10
Merge: b74d9c7 f5022d2
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date: Mon Jul 6 17:22:44 2009 +0100
Merge branch 'master' into autosync
NEWS | 4 +
Setup/Setup.wxs | 2 +-
Tomboy.mdp | 17 +-
Tomboy/Addins/ExportToHtml/ExportToHtml.xsl | 2 +-
Tomboy/Addins/Makefile.am | 1 +
Tomboy/Addins/Underline/Makefile.am | 41 +
Tomboy/Addins/Underline/Underline.addin.xml | 21 +
Tomboy/Addins/Underline/UnderlineMenuItem.cs | 49 +
Tomboy/Addins/Underline/UnderlineNoteAddin.cs | 38 +
Tomboy/Addins/Underline/UnderlineTag.cs | 20 +
Tomboy/Addins/WebSyncService/Api/IWebConnection.cs | 41 +
Tomboy/Addins/WebSyncService/Api/NoteInfo.cs | 2 +-
Tomboy/Addins/WebSyncService/Api/OAuth.cs | 283 +++++
.../Addins/WebSyncService/Api/ResourceReference.cs | 2 +-
Tomboy/Addins/WebSyncService/Api/RootInfo.cs | 75 ++
.../WebSyncService/Api/Tests/NoteInfoTests.cs | 2 +-
.../Api/Tests/ResourceReferenceTests.cs | 2 +-
.../WebSyncService/Api/Tests/UserInfoTests.cs | 2 +-
Tomboy/Addins/WebSyncService/Api/UserInfo.cs | 33 +-
Tomboy/Addins/WebSyncService/Api/WebHelper.cs | 162 ---
.../Addins/WebSyncService/Hyena.Json/Serializer.cs | 4 +-
.../Hyena.Json/Tests/SerializerTests.cs | 2 +-
Tomboy/Addins/WebSyncService/Makefile.am | 11 +-
Tomboy/Addins/WebSyncService/NoteConvert.cs | 2 +-
Tomboy/Addins/WebSyncService/OAuth/Base.cs | 325 +++++
Tomboy/Addins/WebSyncService/OAuth/Enums.cs | 49 +
Tomboy/Addins/WebSyncService/OAuth/Extensions.cs | 76 ++
.../WebSyncService/OAuth/Mono.Rocks/Check.cs | 46 +
.../WebSyncService/OAuth/Mono.Rocks/IEnumerable.cs | 66 +
.../Addins/WebSyncService/OAuth/QueryParameter.cs | 204 ++++
.../WebSyncService/Tests/NoteConvertTests.cs | 2 +-
.../WebSyncService/WebSyncPreferencesWidget.cs | 169 +++
Tomboy/Addins/WebSyncService/WebSyncServer.cs | 19 +-
.../Addins/WebSyncService/WebSyncServiceAddin.cs | 193 ++--
Tomboy/Defines.WIN32.cs | 4 +-
Tomboy/Logger.cs | 10 +-
Tomboy/Makefile.am | 5 +-
Tomboy/NoteWindow.cs | 56 +
Tomboy/PreferencesDialog.cs | 24 +-
Tomboy/Synchronization/SyncManager.cs | 10 +
Tomboy/Tomboy.cs | 1 +
configure.in | 3 +-
help/C/tomboy.xml | 6 +-
help/Makefile.am | 2 +-
help/es/es.po | 165 ++--
help/vi/vi.po | 1187 +++++++++++++++++++
osx/Contents/Info.plist | 4 +-
po/POTFILES.in | 2 +
po/bn_IN.po | 1238 +++++++++++---------
po/es.po | 118 ++-
po/et.po | 40 +-
po/he.po | 359 ++++---
po/nb.po | 260 +++--
po/sv.po | 254 +++--
po/ta.po | 313 +++--
po/vi.po | 308 ++++--
56 files changed, 4719 insertions(+), 1617 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]