[commits] Horde branch imp_6_1 updated. be25f2329570e4b2cb15b4867675a078e977ff0a
Michael M Slusarz
slusarz at horde.org
Mon Feb 4 22:35:57 UTC 2013
The branch "imp_6_1" has been updated.
The following is a summary of the commits.
from: 34c51bfade557c804b362de3457171cedbcd7451
6b896d0 Fix return_target navigation.
4734538 [jan] Add reST renderers for blockquote and emphasis.
22617cf This can be used for views other than gallery.
cf5d021 Use the rightAlign class.
1aadd2c Don't select the current gallery.
7fe0847 Wrap with tbody
de293e7 Refactor tag browsing for H5.
58d54fb Remove unused Ansel_Search classes.
f8932f58 Avoid collision with global browser object.
32b5637 This is what the split() method is for.
60be2bb Actually add the link to the tag.
54e8ae8 Let the tag widget handle any incoming tag actions.
b4f196a wrap
0afa190 Refactor action handling.
c355013 Update package.xml filelist.
df78709 Use Ansel_ActionHandler::imageActions
3eca9ba Use Ansel_ActionHandler for image edit actions too.
859c021 Fix url for editing dates.
d574959 ws
771405d Catch Horde_Exception_NotFound
4ee7163 No need for these to be private, protected is fine.
6f2958e File header/phpdoc
671f960 Move gallery actions to Ansel_ActionHandler too.
e28e907 Use Ansel_ActionHandler for empty/delete gallery as well.
e18102d Don't hide the breadcrumb trail when the gallery is empty.
8cb18fd Create Horde_View from the injector.
cab7559 Tweak css of gallery properties form.
acc8841 No longer used.
f9b6fd0 Redirect back to the gallery view.
cdc1845 Bug #12009: Fix dynamic compose window when save_sent_mail is locked
c48d264 Show save mail selection on dynamic compose screen even if sent_mail_folder is locked
5483a75 [mms] Fix displaying dynamic compose screen when sent-mail preferences are locked (Bug #12009).
ab9d5ff [mms] Update CKEditor to v3.6.6.
be25f23 Merge branch 'master' into imp_6_1
-----------------------------------------------------------------------
commit 6b896d092d19635430555e823d6a471e9dadcb9b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Feb 3 16:22:50 2013 -0500
Fix return_target navigation.
horde/js/plupload/uploader.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/6b896d092d19635430555e823d6a471e9dadcb9b
-----------------------------------------------------------------------
commit 47345385c5cd49bf4951f94c833590f4cab51929
Author: Jan Schneider <jan at horde.org>
Date: Mon Feb 4 17:43:40 2013 +0100
[jan] Add reST renderers for blockquote and emphasis.
Conflicts:
wicked/package.xml
wicked/docs/CHANGES | 1 +
wicked/lib/Text_Wiki/Render/Rst/Blockquote.php | 59 ++++++++++++++++++++++++
wicked/lib/Text_Wiki/Render/Rst/Emphasis.php | 46 ++++++++++++++++++
wicked/package.xml | 12 +++--
4 files changed, 114 insertions(+), 4 deletions(-)
create mode 100644 wicked/lib/Text_Wiki/Render/Rst/Blockquote.php
create mode 100644 wicked/lib/Text_Wiki/Render/Rst/Emphasis.php
http://git.horde.org/horde-git/-/commit/47345385c5cd49bf4951f94c833590f4cab51929
-----------------------------------------------------------------------
commit 22617cf6c3f7ff49ca7dd9fdabd71b1c5570e7d7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Feb 3 16:33:19 2013 -0500
This can be used for views other than gallery.
ansel/js/views/common.js | 112 +++++++++++++++++++++++++++++++
ansel/js/views/gallery-common.js | 112 -------------------------------
ansel/lib/View/GalleryRenderer/Base.php | 2 +-
3 files changed, 113 insertions(+), 113 deletions(-)
create mode 100644 ansel/js/views/common.js
delete mode 100644 ansel/js/views/gallery-common.js
delete mode 100644 ansel/js/views/gallery-lightbox.js
http://git.horde.org/horde-git/-/commit/22617cf6c3f7ff49ca7dd9fdabd71b1c5570e7d7
-----------------------------------------------------------------------
commit cf5d021bccd032e7ac358c02d97939cd352834d3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Feb 3 23:36:48 2013 -0500
Use the rightAlign class.
ansel/templates/view/gallery.html.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/cf5d021bccd032e7ac358c02d97939cd352834d3
-----------------------------------------------------------------------
commit 1aadd2c36f60dfb4c9b6faad0ad3b9d45ac2b1e0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Feb 3 23:37:17 2013 -0500
Don't select the current gallery.
ansel/templates/view/gallery.html.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/1aadd2c36f60dfb4c9b6faad0ad3b9d45ac2b1e0
-----------------------------------------------------------------------
commit 7fe084749f8fcb758a65336db698222cf767972b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Feb 3 23:37:46 2013 -0500
Wrap with tbody
ansel/templates/view/gallery.html.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/7fe084749f8fcb758a65336db698222cf767972b
-----------------------------------------------------------------------
commit de293e7c3416262cd227f8409645b35451af434a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 10:15:29 2013 -0500
Refactor tag browsing for H5.
ansel/lib/TagBrowser.php | 128 ++++++++++++++++++++++++
ansel/lib/View/Results.php | 176 ++++++++++++++++++---------------
ansel/templates/view/results.html.php | 95 ++++++++++++++++++
ansel/templates/view/results.inc | 140 --------------------------
4 files changed, 320 insertions(+), 219 deletions(-)
create mode 100644 ansel/lib/TagBrowser.php
create mode 100644 ansel/templates/view/results.html.php
delete mode 100644 ansel/templates/view/results.inc
http://git.horde.org/horde-git/-/commit/de293e7c3416262cd227f8409645b35451af434a
-----------------------------------------------------------------------
commit 58d54fbc9b4e9232cb42f9224bd9a0ba45f1df29
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 10:19:55 2013 -0500
Remove unused Ansel_Search classes.
ansel/browse.php | 3 +-
ansel/lib/Search.php | 101 ---------------
ansel/lib/Search/Tag.php | 305 ---------------------------------------------
ansel/lib/Search/exif.php | 42 ------
ansel/lib/Widget/Tags.php | 5 +-
5 files changed, 5 insertions(+), 451 deletions(-)
delete mode 100644 ansel/lib/Search.php
delete mode 100644 ansel/lib/Search/Tag.php
delete mode 100644 ansel/lib/Search/exif.php
http://git.horde.org/horde-git/-/commit/58d54fbc9b4e9232cb42f9224bd9a0ba45f1df29
-----------------------------------------------------------------------
commit f8932f5815d9c9c7769dadbde572395aeef5979d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 10:22:12 2013 -0500
Avoid collision with global browser object.
ansel/browse.php | 4 ++--
ansel/lib/Widget/Tags.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/f8932f5815d9c9c7769dadbde572395aeef5979d
-----------------------------------------------------------------------
commit 32b563793c0fde156a0367d6b4104de49a6dbfd6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 10:25:52 2013 -0500
This is what the split() method is for.
ansel/lib/Ajax/Application/Handler.php | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/32b563793c0fde156a0367d6b4104de49a6dbfd6
-----------------------------------------------------------------------
commit 60be2bb513626fa1df9acbbfbe8f91b8480facfe
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 10:30:53 2013 -0500
Actually add the link to the tag.
ansel/templates/view/results.html.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/60be2bb513626fa1df9acbbfbe8f91b8480facfe
-----------------------------------------------------------------------
commit 54e8ae82bb16fbf35fef6c3a3b4cc932c38a80b1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 10:55:42 2013 -0500
Let the tag widget handle any incoming tag actions.
This only happens if we don't have js.
ansel/image.php | 77 ---------------------------------------------
ansel/lib/Widget/Tags.php | 10 ++++++
2 files changed, 10 insertions(+), 77 deletions(-)
http://git.horde.org/horde-git/-/commit/54e8ae82bb16fbf35fef6c3a3b4cc932c38a80b1
-----------------------------------------------------------------------
commit b4f196a15945a228d463bc98882d684e7cc2a5d3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 11:00:15 2013 -0500
wrap
ansel/lib/Widget/Tags.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/b4f196a15945a228d463bc98882d684e7cc2a5d3
-----------------------------------------------------------------------
commit 0afa1908b48098d22135b31a62dba36a49456e39
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 11:33:30 2013 -0500
Refactor action handling.
Use class to wrap common image actions to avoid duplicate code
in the various views that can trigger image actions.
ansel/image.php | 196 +++++-------------------------------------
ansel/lib/ActionHandler.php | 200 +++++++++++++++++++++++++++++++++++++++++++
ansel/lib/View/Results.php | 107 ++----------------------
3 files changed, 230 insertions(+), 273 deletions(-)
create mode 100644 ansel/lib/ActionHandler.php
http://git.horde.org/horde-git/-/commit/0afa1908b48098d22135b31a62dba36a49456e39
-----------------------------------------------------------------------
commit c3550139b4d17df2583efe95fe109728f4ea8568
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 11:35:03 2013 -0500
Update package.xml filelist.
ansel/package.xml | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
http://git.horde.org/horde-git/-/commit/c3550139b4d17df2583efe95fe109728f4ea8568
-----------------------------------------------------------------------
commit df78709ad88e2183248f79399cfeae68b55e2d58
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 11:53:38 2013 -0500
Use Ansel_ActionHandler::imageActions
ansel/lib/ActionHandler.php | 3 ++-
ansel/lib/View/GalleryRenderer/Gallery.php | 1 +
ansel/templates/view/gallery.html.php | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/df78709ad88e2183248f79399cfeae68b55e2d58
-----------------------------------------------------------------------
commit 3eca9ba4b8af86cd6aad4b04bac71f5a10d7d516
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 12:26:09 2013 -0500
Use Ansel_ActionHandler for image edit actions too.
ansel/image.php | 636 +------------------------------------------
ansel/lib/ActionHandler.php | 607 ++++++++++++++++++++++++++++++++++++++++-
2 files changed, 606 insertions(+), 637 deletions(-)
http://git.horde.org/horde-git/-/commit/3eca9ba4b8af86cd6aad4b04bac71f5a10d7d516
-----------------------------------------------------------------------
commit 859c021d7cdcb7b2e3d54c1ee1be6f9d78d2d149
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 12:33:07 2013 -0500
Fix url for editing dates.
ansel/lib/View/GalleryRenderer/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/859c021d7cdcb7b2e3d54c1ee1be6f9d78d2d149
-----------------------------------------------------------------------
commit d5749591a931760c730483d51210d1af6262422f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 12:39:23 2013 -0500
ws
ansel/lib/ActionHandler.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/d5749591a931760c730483d51210d1af6262422f
-----------------------------------------------------------------------
commit 771405dfc9354edc9e586dd3fc856c8a77797058
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 12:39:36 2013 -0500
Catch Horde_Exception_NotFound
ansel/lib/Storage.php | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/771405dfc9354edc9e586dd3fc856c8a77797058
-----------------------------------------------------------------------
commit 4ee716324021b0dda2cf8e17810134bf6bb0d569
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 12:40:11 2013 -0500
No need for these to be private, protected is fine.
ansel/lib/Storage.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/4ee716324021b0dda2cf8e17810134bf6bb0d569
-----------------------------------------------------------------------
commit 6f2958e097deadf5eca5513097a4cbd701006d58
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 12:41:28 2013 -0500
File header/phpdoc
ansel/lib/Storage.php | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/6f2958e097deadf5eca5513097a4cbd701006d58
-----------------------------------------------------------------------
commit 671f96015324a8b38d2b796f324f39072cb174ad
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 13:08:31 2013 -0500
Move gallery actions to Ansel_ActionHandler too.
ansel/gallery.php | 100 +------------------------
ansel/lib/ActionHandler.php | 179 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 178 insertions(+), 101 deletions(-)
http://git.horde.org/horde-git/-/commit/671f96015324a8b38d2b796f324f39072cb174ad
-----------------------------------------------------------------------
commit e28e90782de960d14f24a22a79b16e4a9a29c06b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 13:20:07 2013 -0500
Use Ansel_ActionHandler for empty/delete gallery as well.
ansel/gallery/delete.php | 84 -----------------------
ansel/lib/ActionHandler.php | 67 ++++++++++++++++++
ansel/templates/gallery/delete_confirmation.inc | 4 +-
3 files changed, 69 insertions(+), 86 deletions(-)
delete mode 100644 ansel/gallery/delete.php
http://git.horde.org/horde-git/-/commit/e28e90782de960d14f24a22a79b16e4a9a29c06b
-----------------------------------------------------------------------
commit e18102d503008ee9fab1e4e2af711e0237f9d947
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 13:21:31 2013 -0500
Don't hide the breadcrumb trail when the gallery is empty.
ansel/templates/view/gallery.html.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/e18102d503008ee9fab1e4e2af711e0237f9d947
-----------------------------------------------------------------------
commit 8cb18fd2c352fb573d2fdfbe68a115b5401a915c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 13:50:25 2013 -0500
Create Horde_View from the injector.
ansel/lib/View/GalleryProperties.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/8cb18fd2c352fb573d2fdfbe68a115b5401a915c
-----------------------------------------------------------------------
commit cab7559bdae44f82c42a3e654a9afa9c8015cf3d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 13:50:49 2013 -0500
Tweak css of gallery properties form.
ansel/templates/gallery/properties.html.php | 29 ++++++++++++++-------------
1 files changed, 15 insertions(+), 14 deletions(-)
http://git.horde.org/horde-git/-/commit/cab7559bdae44f82c42a3e654a9afa9c8015cf3d
-----------------------------------------------------------------------
commit acc88411e6f9cd067bd17d8c87e7e135709f0963
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 14:01:51 2013 -0500
No longer used.
ansel/lib/View/GalleryProperties.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/acc88411e6f9cd067bd17d8c87e7e135709f0963
-----------------------------------------------------------------------
commit f9b6fd02004529ed2c8185889663e2a806efc59f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Feb 4 14:02:05 2013 -0500
Redirect back to the gallery view.
ansel/lib/View/GalleryProperties.php | 2 +-
ansel/lib/Widget/Actions.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/f9b6fd02004529ed2c8185889663e2a806efc59f
-----------------------------------------------------------------------
commit cdc184532496b8b847c55ee86f2056ce92c03060
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 4 12:37:36 2013 -0700
Bug #12009: Fix dynamic compose window when save_sent_mail is locked
imp/lib/Dynamic/Compose/Common.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/cdc184532496b8b847c55ee86f2056ce92c03060
-----------------------------------------------------------------------
commit c48d264e4c6de6aacd3f9dc093d648395fe67f80
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 4 12:46:33 2013 -0700
Show save mail selection on dynamic compose screen even if sent_mail_folder is locked
imp/lib/Dynamic/Compose/Common.php | 2 ++
imp/templates/dynamic/compose.html.php | 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/c48d264e4c6de6aacd3f9dc093d648395fe67f80
-----------------------------------------------------------------------
commit 5483a7582b41ca5889cb786aed060eedf5d6efef
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 4 12:47:11 2013 -0700
[mms] Fix displaying dynamic compose screen when sent-mail preferences are locked (Bug #12009).
Lump last 2 commits into a more general changelog entry.
imp/docs/CHANGES | 2 ++
imp/package.xml | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/5483a7582b41ca5889cb786aed060eedf5d6efef
-----------------------------------------------------------------------
commit ab9d5ff0462d84c8037cb81ce27cf76af745dd66
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 4 15:31:17 2013 -0700
[mms] Update CKEditor to v3.6.6.
framework/Editor/js/ckeditor/LICENSE.html | 4 +-
framework/Editor/js/ckeditor/ckeditor.js | 2 +-
framework/Editor/js/ckeditor/ckeditor_basic.js | 2 +-
framework/Editor/js/ckeditor/contents.css | 2 +-
framework/Editor/js/ckeditor/lang/af.js | 2 +-
framework/Editor/js/ckeditor/lang/ar.js | 2 +-
framework/Editor/js/ckeditor/lang/bg.js | 2 +-
framework/Editor/js/ckeditor/lang/bn.js | 2 +-
framework/Editor/js/ckeditor/lang/bs.js | 2 +-
framework/Editor/js/ckeditor/lang/ca.js | 2 +-
framework/Editor/js/ckeditor/lang/cs.js | 2 +-
framework/Editor/js/ckeditor/lang/cy.js | 2 +-
framework/Editor/js/ckeditor/lang/da.js | 2 +-
framework/Editor/js/ckeditor/lang/de.js | 2 +-
framework/Editor/js/ckeditor/lang/el.js | 2 +-
framework/Editor/js/ckeditor/lang/en-au.js | 2 +-
framework/Editor/js/ckeditor/lang/en-ca.js | 2 +-
framework/Editor/js/ckeditor/lang/en-gb.js | 2 +-
framework/Editor/js/ckeditor/lang/en.js | 2 +-
framework/Editor/js/ckeditor/lang/eo.js | 2 +-
framework/Editor/js/ckeditor/lang/es.js | 2 +-
framework/Editor/js/ckeditor/lang/et.js | 2 +-
framework/Editor/js/ckeditor/lang/eu.js | 2 +-
framework/Editor/js/ckeditor/lang/fa.js | 2 +-
framework/Editor/js/ckeditor/lang/fi.js | 2 +-
framework/Editor/js/ckeditor/lang/fo.js | 2 +-
framework/Editor/js/ckeditor/lang/fr-ca.js | 2 +-
framework/Editor/js/ckeditor/lang/fr.js | 2 +-
framework/Editor/js/ckeditor/lang/gl.js | 2 +-
framework/Editor/js/ckeditor/lang/gu.js | 2 +-
framework/Editor/js/ckeditor/lang/he.js | 2 +-
framework/Editor/js/ckeditor/lang/hi.js | 2 +-
framework/Editor/js/ckeditor/lang/hr.js | 2 +-
framework/Editor/js/ckeditor/lang/hu.js | 2 +-
framework/Editor/js/ckeditor/lang/id.js | 2 +-
framework/Editor/js/ckeditor/lang/is.js | 2 +-
framework/Editor/js/ckeditor/lang/it.js | 2 +-
framework/Editor/js/ckeditor/lang/ja.js | 2 +-
framework/Editor/js/ckeditor/lang/ka.js | 2 +-
framework/Editor/js/ckeditor/lang/km.js | 2 +-
framework/Editor/js/ckeditor/lang/ko.js | 2 +-
framework/Editor/js/ckeditor/lang/ku.js | 2 +-
framework/Editor/js/ckeditor/lang/lt.js | 2 +-
framework/Editor/js/ckeditor/lang/lv.js | 2 +-
framework/Editor/js/ckeditor/lang/mk.js | 2 +-
framework/Editor/js/ckeditor/lang/mn.js | 2 +-
framework/Editor/js/ckeditor/lang/ms.js | 2 +-
framework/Editor/js/ckeditor/lang/nb.js | 2 +-
framework/Editor/js/ckeditor/lang/nl.js | 2 +-
framework/Editor/js/ckeditor/lang/no.js | 2 +-
framework/Editor/js/ckeditor/lang/pl.js | 2 +-
framework/Editor/js/ckeditor/lang/pt-br.js | 2 +-
framework/Editor/js/ckeditor/lang/pt.js | 2 +-
framework/Editor/js/ckeditor/lang/ro.js | 2 +-
framework/Editor/js/ckeditor/lang/ru.js | 2 +-
framework/Editor/js/ckeditor/lang/sk.js | 2 +-
framework/Editor/js/ckeditor/lang/sl.js | 2 +-
framework/Editor/js/ckeditor/lang/sr-latn.js | 2 +-
framework/Editor/js/ckeditor/lang/sr.js | 2 +-
framework/Editor/js/ckeditor/lang/sv.js | 2 +-
framework/Editor/js/ckeditor/lang/th.js | 2 +-
framework/Editor/js/ckeditor/lang/tr.js | 2 +-
framework/Editor/js/ckeditor/lang/ug.js | 2 +-
framework/Editor/js/ckeditor/lang/uk.js | 2 +-
framework/Editor/js/ckeditor/lang/vi.js | 2 +-
framework/Editor/js/ckeditor/lang/zh-cn.js | 2 +-
framework/Editor/js/ckeditor/lang/zh.js | 2 +-
framework/Editor/js/ckeditor/plugins/a11yhelp/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/devtools/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/placeholder/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/scayt/dialogs/toolbar.css | 2 +-
framework/Editor/js/ckeditor/plugins/specialchar/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/specialchar/lang/sk.js | 1 +
framework/Editor/js/ckeditor/plugins/uicolor/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/uicolor/yui/assets/yui.css | 2 +-
framework/Editor/js/ckeditor/plugins/wsc/dialogs/ciframe.html | 2 +-
framework/Editor/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html | 2 +-
framework/Editor/js/ckeditor/plugins/wsc/dialogs/wsc.css | 2 +-
framework/Editor/js/ckeditor/skins/kama/dialog.css | 2 +-
framework/Editor/js/ckeditor/skins/kama/editor.css | 4 +-
framework/Editor/js/ckeditor/skins/kama/templates.css | 2 +-
framework/Editor/js/ckeditor/skins/office2003/dialog.css | 2 +-
framework/Editor/js/ckeditor/skins/office2003/editor.css | 16 ++--
framework/Editor/js/ckeditor/skins/office2003/templates.css | 2 +-
framework/Editor/js/ckeditor/skins/v2/dialog.css | 2 +-
framework/Editor/js/ckeditor/skins/v2/editor.css | 6 +-
framework/Editor/js/ckeditor/skins/v2/templates.css | 2 +-
framework/Editor/package.xml | 22 ++++-
88 files changed, 115 insertions(+), 97 deletions(-)
create mode 100644 framework/Editor/js/ckeditor/plugins/a11yhelp/lang/lv.js
create mode 100644 framework/Editor/js/ckeditor/plugins/devtools/lang/lv.js
create mode 100644 framework/Editor/js/ckeditor/plugins/placeholder/lang/lv.js
create mode 100644 framework/Editor/js/ckeditor/plugins/specialchar/lang/lv.js
create mode 100644 framework/Editor/js/ckeditor/plugins/specialchar/lang/sk.js
create mode 100644 framework/Editor/js/ckeditor/plugins/uicolor/lang/lv.js
http://git.horde.org/horde-git/-/commit/ab9d5ff0462d84c8037cb81ce27cf76af745dd66
-----------------------------------------------------------------------
commit be25f2329570e4b2cb15b4867675a078e977ff0a
Merge: 34c51bf ab9d5ff
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Feb 4 15:33:50 2013 -0700
Merge branch 'master' into imp_6_1
Conflicts:
imp/docs/CHANGES
imp/package.xml
ansel/browse.php | 3 +-
ansel/gallery.php | 100 +-
ansel/gallery/delete.php | 84 -
ansel/image.php | 875 +----
ansel/js/views/common.js | 112 +
ansel/js/views/gallery-common.js | 112 -
ansel/lib/ActionHandler.php | 1046 +++++
ansel/lib/Ajax/Application/Handler.php | 5 +-
ansel/lib/Search.php | 101 -
ansel/lib/Search/Tag.php | 305 --
ansel/lib/Search/exif.php | 42 -
ansel/lib/Storage.php | 37 +-
ansel/lib/TagBrowser.php | 128 +
ansel/lib/View/GalleryProperties.php | 13 +-
ansel/lib/View/GalleryRenderer/Base.php | 4 +-
ansel/lib/View/GalleryRenderer/Gallery.php | 1 +
ansel/lib/View/Results.php | 239 +-
ansel/lib/Widget/Actions.php | 2 +-
ansel/lib/Widget/Tags.php | 29 +-
ansel/package.xml | 26 +-
ansel/templates/gallery/delete_confirmation.inc | 4 +-
ansel/templates/gallery/properties.html.php | 29 +-
ansel/templates/view/gallery.html.php | 13 +-
ansel/templates/view/results.html.php | 95 +
ansel/templates/view/results.inc | 140 -
framework/Editor/js/ckeditor/LICENSE.html | 4 +-
framework/Editor/js/ckeditor/ckeditor.js | 2 +-
framework/Editor/js/ckeditor/ckeditor_basic.js | 2 +-
framework/Editor/js/ckeditor/contents.css | 2 +-
framework/Editor/js/ckeditor/lang/af.js | 2 +-
framework/Editor/js/ckeditor/lang/ar.js | 2 +-
framework/Editor/js/ckeditor/lang/bg.js | 2 +-
framework/Editor/js/ckeditor/lang/bn.js | 2 +-
framework/Editor/js/ckeditor/lang/bs.js | 2 +-
framework/Editor/js/ckeditor/lang/ca.js | 2 +-
framework/Editor/js/ckeditor/lang/cs.js | 2 +-
framework/Editor/js/ckeditor/lang/cy.js | 2 +-
framework/Editor/js/ckeditor/lang/da.js | 2 +-
framework/Editor/js/ckeditor/lang/de.js | 2 +-
framework/Editor/js/ckeditor/lang/el.js | 2 +-
framework/Editor/js/ckeditor/lang/en-au.js | 2 +-
framework/Editor/js/ckeditor/lang/en-ca.js | 2 +-
framework/Editor/js/ckeditor/lang/en-gb.js | 2 +-
framework/Editor/js/ckeditor/lang/en.js | 2 +-
framework/Editor/js/ckeditor/lang/eo.js | 2 +-
framework/Editor/js/ckeditor/lang/es.js | 2 +-
framework/Editor/js/ckeditor/lang/et.js | 2 +-
framework/Editor/js/ckeditor/lang/eu.js | 2 +-
framework/Editor/js/ckeditor/lang/fa.js | 2 +-
framework/Editor/js/ckeditor/lang/fi.js | 2 +-
framework/Editor/js/ckeditor/lang/fo.js | 2 +-
framework/Editor/js/ckeditor/lang/fr-ca.js | 2 +-
framework/Editor/js/ckeditor/lang/fr.js | 2 +-
framework/Editor/js/ckeditor/lang/gl.js | 2 +-
framework/Editor/js/ckeditor/lang/gu.js | 2 +-
framework/Editor/js/ckeditor/lang/he.js | 2 +-
framework/Editor/js/ckeditor/lang/hi.js | 2 +-
framework/Editor/js/ckeditor/lang/hr.js | 2 +-
framework/Editor/js/ckeditor/lang/hu.js | 2 +-
framework/Editor/js/ckeditor/lang/id.js | 2 +-
framework/Editor/js/ckeditor/lang/is.js | 2 +-
framework/Editor/js/ckeditor/lang/it.js | 2 +-
framework/Editor/js/ckeditor/lang/ja.js | 2 +-
framework/Editor/js/ckeditor/lang/ka.js | 2 +-
framework/Editor/js/ckeditor/lang/km.js | 2 +-
framework/Editor/js/ckeditor/lang/ko.js | 2 +-
framework/Editor/js/ckeditor/lang/ku.js | 2 +-
framework/Editor/js/ckeditor/lang/lt.js | 2 +-
framework/Editor/js/ckeditor/lang/lv.js | 2 +-
framework/Editor/js/ckeditor/lang/mk.js | 2 +-
framework/Editor/js/ckeditor/lang/mn.js | 2 +-
framework/Editor/js/ckeditor/lang/ms.js | 2 +-
framework/Editor/js/ckeditor/lang/nb.js | 2 +-
framework/Editor/js/ckeditor/lang/nl.js | 2 +-
framework/Editor/js/ckeditor/lang/no.js | 2 +-
framework/Editor/js/ckeditor/lang/pl.js | 2 +-
framework/Editor/js/ckeditor/lang/pt-br.js | 2 +-
framework/Editor/js/ckeditor/lang/pt.js | 2 +-
framework/Editor/js/ckeditor/lang/ro.js | 2 +-
framework/Editor/js/ckeditor/lang/ru.js | 2 +-
framework/Editor/js/ckeditor/lang/sk.js | 2 +-
framework/Editor/js/ckeditor/lang/sl.js | 2 +-
framework/Editor/js/ckeditor/lang/sr-latn.js | 2 +-
framework/Editor/js/ckeditor/lang/sr.js | 2 +-
framework/Editor/js/ckeditor/lang/sv.js | 2 +-
framework/Editor/js/ckeditor/lang/th.js | 2 +-
framework/Editor/js/ckeditor/lang/tr.js | 2 +-
framework/Editor/js/ckeditor/lang/ug.js | 2 +-
framework/Editor/js/ckeditor/lang/uk.js | 2 +-
framework/Editor/js/ckeditor/lang/vi.js | 2 +-
framework/Editor/js/ckeditor/lang/zh-cn.js | 2 +-
framework/Editor/js/ckeditor/lang/zh.js | 2 +-
framework/Editor/js/ckeditor/plugins/a11yhelp/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/devtools/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/placeholder/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/scayt/dialogs/toolbar.css | 2 +-
framework/Editor/js/ckeditor/plugins/specialchar/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/specialchar/lang/sk.js | 1 +
framework/Editor/js/ckeditor/plugins/uicolor/lang/lv.js | 1 +
framework/Editor/js/ckeditor/plugins/uicolor/yui/assets/yui.css | 2 +-
framework/Editor/js/ckeditor/plugins/wsc/dialogs/ciframe.html | 2 +-
framework/Editor/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html | 2 +-
framework/Editor/js/ckeditor/plugins/wsc/dialogs/wsc.css | 2 +-
framework/Editor/js/ckeditor/skins/kama/dialog.css | 2 +-
framework/Editor/js/ckeditor/skins/kama/editor.css | 4 +-
framework/Editor/js/ckeditor/skins/kama/templates.css | 2 +-
framework/Editor/js/ckeditor/skins/office2003/dialog.css | 2 +-
framework/Editor/js/ckeditor/skins/office2003/editor.css | 16 +-
framework/Editor/js/ckeditor/skins/office2003/templates.css | 2 +-
framework/Editor/js/ckeditor/skins/v2/dialog.css | 2 +-
framework/Editor/js/ckeditor/skins/v2/editor.css | 6 +-
framework/Editor/js/ckeditor/skins/v2/templates.css | 2 +-
framework/Editor/package.xml | 22 +-
horde/js/plupload/uploader.js | 2 +-
imp/docs/CHANGES | 2 +
imp/lib/Dynamic/Compose/Common.php | 7 +-
imp/package.xml | 1 +
imp/templates/dynamic/compose.html.php | 6 +
wicked/docs/CHANGES | 1 +
wicked/lib/Text_Wiki/Render/Rst/Blockquote.php | 59 +
wicked/lib/Text_Wiki/Render/Rst/Emphasis.php | 46 +
wicked/package.xml | 12 +-
122 files changed, 1817 insertions(+), 2076 deletions(-)
http://git.horde.org/horde-git/-/commit/be25f2329570e4b2cb15b4867675a078e977ff0a
More information about the commits
mailing list