3 commits - plugins/calendar plugins/kolab_addressbook plugins/kolab_delegation plugins/kolab_files plugins/kolab_folders plugins/kolab_notes plugins/libcalendaring plugins/odfviewer plugins/tasklist
Thomas Brüderli
bruederli at kolabsys.com
Mon Apr 28 09:12:52 CEST 2014
plugins/calendar/calendar_base.js | 7 +++
plugins/calendar/calendar_ui.js | 7 +++
plugins/calendar/drivers/database/database_driver.php | 3 -
plugins/calendar/lib/js/fullcalendar.js | 32 ++++++++++++++++--
plugins/calendar/print.js | 7 +++
plugins/kolab_addressbook/kolab_addressbook.js | 27 +++++++++++++++
plugins/kolab_delegation/kolab_delegation.js | 7 +++
plugins/kolab_files/kolab_files.js | 24 ++++++++++++-
plugins/kolab_folders/kolab_folders.js | 7 +++
plugins/kolab_notes/notes.js | 6 +++
plugins/kolab_notes/notes_mail.js | 6 +++
plugins/libcalendaring/libcalendaring.js | 6 +++
plugins/odfviewer/odf.html | 25 +++++++++++++-
plugins/tasklist/jquery.tagedit.js | 32 ++++++++++++++++--
plugins/tasklist/tasklist.js | 7 +++
plugins/tasklist/tasklist_base.js | 7 +++
16 files changed, 192 insertions(+), 18 deletions(-)
New commits:
commit 5c206f76e8176762d317ab9213c55c07ab1786c4
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Mon Apr 28 09:12:29 2014 +0200
Amend js files headers to satisfy LibreJS license detection
diff --git a/plugins/calendar/calendar_base.js b/plugins/calendar/calendar_base.js
index cc7c65a..abcd519 100644
--- a/plugins/calendar/calendar_base.js
+++ b/plugins/calendar/calendar_base.js
@@ -1,10 +1,12 @@
/**
* Base Javascript class for the Calendar plugin
*
- * @version @package_version@
* @author Lazlo Westerhof <hello at lazlo.me>
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this page.
+ *
* Copyright (C) 2010, Lazlo Westerhof <hello at lazlo.me>
* Copyright (C) 2013, Kolab Systems AG <contact at kolabsys.com>
*
@@ -20,6 +22,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this page.
*/
// Basic setup for Roundcube calendar client class
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index fe2b89e..116b490 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1,10 +1,12 @@
/**
* Client UI Javascript for the Calendar plugin
*
- * @version @package_version@
* @author Lazlo Westerhof <hello at lazlo.me>
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2010, Lazlo Westerhof <hello at lazlo.me>
* Copyright (C) 2012, Kolab Systems AG <contact at kolabsys.com>
*
@@ -20,6 +22,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
// Roundcube calendar UI client class
diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js
index 4f0862a..79a2b7f 100644
--- a/plugins/calendar/lib/js/fullcalendar.js
+++ b/plugins/calendar/lib/js/fullcalendar.js
@@ -9,8 +9,36 @@
*
* Copyright (c) 2011 Adam Shaw
* Copyright (c) 2011, Kolab Systems AG
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
+ * Dual licensed under the MIT and GPL licenses
+ *
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (c) Copyright (c) Jon Nylander
+ *
+ * Licensed under the MIT licenses
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*
* Date: Wed Nov 7 16:28:11 2012 +0100
*
diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js
index 67b6a93..89f7cb8 100644
--- a/plugins/calendar/print.js
+++ b/plugins/calendar/print.js
@@ -1,9 +1,11 @@
/**
* Print view for the Calendar plugin
*
- * @version @package_version@
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2011, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
diff --git a/plugins/kolab_addressbook/kolab_addressbook.js b/plugins/kolab_addressbook/kolab_addressbook.js
index 8aa831a..79628e8 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.js
+++ b/plugins/kolab_addressbook/kolab_addressbook.js
@@ -1,3 +1,30 @@
+/**
+ * Client script for the Kolab address book plugin
+ *
+ * @author Aleksander Machniak <machniak at kolabsys.com>
+ *
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2011, Kolab Systems AG <contact at kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
if (window.rcmail) {
rcmail.addEventListener('init', function() {
rcmail.set_book_actions();
diff --git a/plugins/kolab_delegation/kolab_delegation.js b/plugins/kolab_delegation/kolab_delegation.js
index d113c71..c28d7d4 100644
--- a/plugins/kolab_delegation/kolab_delegation.js
+++ b/plugins/kolab_delegation/kolab_delegation.js
@@ -1,10 +1,12 @@
/**
* Client scripts for the Kolab Delegation configuration utitlity
*
- * @version @package_version@
* @author Aleksander Machniak <machniak at kolabsys.com>
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2011-2012, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -19,6 +21,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
window.rcmail && rcmail.addEventListener('init', function(evt) {
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 1abf913..ea80a55 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1,8 +1,28 @@
/**
* Kolab files plugin
*
- * @version @package_version@
- * @author Aleksander Machniak <alec at alec.pl>
+ * @author Aleksander Machniak <machniak at kolabsys.com>
+ *
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2011, Kolab Systems AG <contact at kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
window.rcmail && rcmail.addEventListener('init', function() {
diff --git a/plugins/kolab_folders/kolab_folders.js b/plugins/kolab_folders/kolab_folders.js
index 7cabfdd..30d8170 100644
--- a/plugins/kolab_folders/kolab_folders.js
+++ b/plugins/kolab_folders/kolab_folders.js
@@ -1,9 +1,11 @@
/**
* Client script for the Kolab folder management/listing extension
*
- * @version @package_version@
* @author Aleksander Machniak <machniak at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2011, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
$(document).ready(function() {
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 4818dfd..e38acde 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -3,6 +3,9 @@
*
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2014, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
function rcube_kolab_notes_ui(settings)
diff --git a/plugins/kolab_notes/notes_mail.js b/plugins/kolab_notes/notes_mail.js
index 6d575f7..3f1103f 100644
--- a/plugins/kolab_notes/notes_mail.js
+++ b/plugins/kolab_notes/notes_mail.js
@@ -3,6 +3,9 @@
*
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2014, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index 1d93c13..f5c20c4 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -3,6 +3,9 @@
*
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this page.
+ *
* Copyright (C) 2012-2014, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this page.
*/
function rcube_libcalendaring(settings)
diff --git a/plugins/odfviewer/odf.html b/plugins/odfviewer/odf.html
index bf09193..a84e630 100644
--- a/plugins/odfviewer/odf.html
+++ b/plugins/odfviewer/odf.html
@@ -8,7 +8,30 @@
<script type="text/javascript" src="%%DOCROOT%%webodf.js" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
-// WebODF viewer code from https://gitorious.org/webodf/webodf/source/HEADe:programs/viewer
+/**
+
+ WebODF viewer code from https://gitorious.org/webodf/webodf/source/HEADe:programs/viewer
+
+ @licstart The following is the entire license notice for the
+ JavaScript code in this page.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ @licend The above is the entire license notice
+ for the JavaScript code in this page.
+
+*/
function init() {
viewer = new Viewer(new ODFViewerPlugin(), '%%DOCURL%%');
diff --git a/plugins/tasklist/jquery.tagedit.js b/plugins/tasklist/jquery.tagedit.js
index 0b3ab76..efb4b74 100644
--- a/plugins/tasklist/jquery.tagedit.js
+++ b/plugins/tasklist/jquery.tagedit.js
@@ -4,12 +4,38 @@
*
* Examples and documentation at: tagedit.webwork-albrecht.de
*
+* License:
+* This work is licensed under a MIT License
+*
+* @licstart The following is the entire license notice for the
+* JavaScript code in this file.
+*
* Copyright (c) 2010 Oliver Albrecht <info at webwork-albrecht.de>
* Copyright (c) 2012 Thomas Brüderli <thomas at roundcube.net>
*
-* License:
-* This work is licensed under a MIT License
-* http://www.opensource.org/licenses/mit-license.php
+* Licensed under the MIT licenses
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*
+* @licend The above is the entire license notice
+* for the JavaScript code in this file.
*
* @author Oliver Albrecht Mial: info at webwork-albrecht.de Twitter: @webworka
* @version 1.5.1 (10/2013)
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 6f11ed5..4e8cacf 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1,9 +1,11 @@
/**
* Client scripts for the Tasklist plugin
*
- * @version @package_version@
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2012, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
function rcube_tasklist_ui(settings)
diff --git a/plugins/tasklist/tasklist_base.js b/plugins/tasklist/tasklist_base.js
index f804c34..6e93b15 100644
--- a/plugins/tasklist/tasklist_base.js
+++ b/plugins/tasklist/tasklist_base.js
@@ -1,9 +1,11 @@
/**
* Client scripts for the Tasklist plugin
*
- * @version @package_version@
* @author Thomas Bruederli <bruederli at kolabsys.com>
*
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
* Copyright (C) 2013, Kolab Systems AG <contact at kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
*/
function rcube_tasklist(settings)
commit 7d3b2b6675b98ccb8b7873575309129ce539a934
Merge: 4bbe1d4 fb687bd
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Mon Apr 28 08:49:42 2014 +0200
Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab
commit 4bbe1d4b4a7e6ec10ca6664079e9ed48924954c9
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Sun Apr 27 15:33:12 2014 +0200
Remove unused include
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 9b04bf1..059cd1d 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -59,9 +59,6 @@ class database_driver extends calendar_driver
$this->rc = $cal->rc;
$this->server_timezone = new DateTimeZone(date_default_timezone_get());
- // load library classes
- require_once($this->cal->home . '/lib/Horde_Date_Recurrence.php');
-
// read database config
$db = $this->rc->get_dbh();
$this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
More information about the commits
mailing list