Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

@@ -36,14 +36,14 @@
 %global tmpdir %{_var}/lib/roundcubemail
 
 %global rc_version 3.4
-%global rc_rel_suffix alpha7
+%global rc_rel_suffix alpha8
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
 
 Name: roundcubemail-plugins-kolab
 Version: 3.4
 
-Release: 38%{?dot_rel_suffix}%{?dist}
+Release: 39%{?dot_rel_suffix}%{?dist}
 
 Summary: Kolab Groupware plugins for Roundcube Webmail
 
@@ -1528,11 +1528,15 @@
 
 %build
 
+ls -l
+
 pushd %{name}-%{version}%{?dash_rel_suffix}
 
 # Compile and compress the CSS
-for file in `find . -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do
+for file in `find plugins/ -type f -name "styles.less" -o -name "print.less" -o -name "embed.less" -o -name "libkolab.less"`; do
 %{_bindir}/lessc --relative-urls ${file} > $(dirname ${file})/$(basename ${file} .less).css
+
+ cp $(dirname ${file})/$(basename ${file} .less).css ../$(echo $(dirname ${file})/$(basename ${file} .less).css | sed -r -e 's|plugins/([a-z0-9_]+)/|roundcubemail-plugins-kolab-plugin-\1-skin-elastic-%{version}%{?dash_rel_suffix}/plugins/\1/|g')
 done
 
 %install
@@ -2571,6 +2575,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Aug 18 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-39.alpha8
+- New snapshot
+- Fix per_user_logging
+
 * Tue May 29 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.4-34.alpha6
 - Ship a pre-release version of the Elastic skin

debian.changelog Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/calendar/calendar.php -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/calendar/calendar.php Changed

@@ -530,9 +530,10 @@
         return $p;
       }
       // default calendar selection
-      $field_id = 'rcmfd_default_calendar';
+      $field_id   = 'rcmfd_default_calendar';
+      $filter     = calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE | calendar_driver::FILTER_INSERTABLE;
       $select_cal = new html_select(array('name' => '_default_calendar', 'id' => $field_id, 'is_escaped' => true));
-      foreach ((array)$this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_ACTIVE) as $id => $prop) {
+      foreach ((array)$this->driver->list_calendars($filter) as $id => $prop) {
         $select_cal->add($prop['name'], strval($id));
         if ($prop['default'])
           $default_calendar = $id;
@@ -579,7 +580,7 @@
 
       $p['blocks']['itip']['options']['after_action'] = array(
         'title'   => html::label($field_id, rcube::Q($this->gettext('afteraction'))),
-        'content' => html::div('input-group', $select->show($val) . $folders->show($folder)),
+        'content' => html::div('input-group input-group-combo', $select->show($val) . $folders->show($folder)),
       );
     }

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -221,7 +221,7 @@
     }
 
     // list virtual calendars showing invitations
-    if ($this->rc->config->get('kolab_invitation_calendars')) {
+    if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
       foreach (array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED) as $id) {
         $cal = new kolab_invitation_calendar($id, $this->cal);
         $this->calendars[$cal->id] = $cal;
@@ -256,7 +256,7 @@
     }
 
     // append the virtual birthdays calendar
-    if ($this->rc->config->get('calendar_contact_birthdays', false)) {
+    if ($this->rc->config->get('calendar_contact_birthdays', false) && !($filter & self::FILTER_INSERTABLE)) {
       $id = self::BIRTHDAY_CALENDAR_ID;
       $prefs = $this->rc->config->get('kolab_calendars', array());  // read local prefs
       if (!($filter & self::FILTER_ACTIVE) || $prefs[$id]['active']) {
@@ -312,7 +312,7 @@
       if (($filter & self::FILTER_WRITEABLE) && !$cal->editable) {
         continue;
       }
-      if (($filter & self::FILTER_INSERTABLE) && !$cal->insert) {
+      if (($filter & self::FILTER_INSERTABLE) && !$cal->editable) {
         continue;
       }
       if (($filter & self::FILTER_ACTIVE) && !$cal->is_active()) {

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/calendar/lib/calendar_ui.php -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/calendar/lib/calendar_ui.php Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_auth/kolab_auth.php -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_files/kolab_files.js -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_files/kolab_files.js Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_files/localization/en_US.inc -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_files/localization/en_US.inc Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_notes/notes.js -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_notes/notes.js Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/kolab_notes/skins/elastic/templates/notes.html -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/kolab_notes/skins/elastic/templates/notes.html Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/libkolab/skins/elastic/libkolab.less -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/libkolab/skins/elastic/libkolab.less Changed

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/tasklist/skins/elastic/templates/mainview.html -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/tasklist/skins/elastic/templates/mainview.html Changed

@@ -26,8 +26,8 @@
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><roundcube:label name="tasklist.lists" /></a>
 		<roundcube:label name="tasklist.navtitle" />
 		<div id="listcontrols" class="toolbar" role="toolbar">
-			<a href="#threads" class="button threads" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><roundcube:label name="threads" /></a>
-			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings"
+			<a href="#threads" class="button threads active" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><roundcube:label name="threads" /></a>
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
 				label="options" innerClass="inner" onclick="tasklist_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><roundcube:label name="menu" /></a>

roundcubemail-plugins-kolab-3.4-alpha7.tar.gz/plugins/tasklist/tasklist.js -> roundcubemail-plugins-kolab-3.4-alpha8.tar.gz/plugins/tasklist/tasklist.js Changed

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 84