Merge branch 'release/1.2.5'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libs/twitter-bootstrap"]
+	path = libs/twitter-bootstrap
+	url = https://github.com/twitter/bootstrap.git

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.net
+
+[agendav.labels-and-messages]
+file_filter = web/lang/<lang>/<lang>.php
+source_file = web/lang/en/en.php
+source_lang = en
+type = PHP_ALT_ARRAY
+

CHANGELOG

@@ -1,3 +1,23 @@
+Release 1.2.5 (2012-06-07)
+	* Updated jQuery to 1.7.2
+	* Updated jQuery UI to 1.8.20
+	* Updated iCalcreator to 2.12
+	* Added PostgreSQL support
+	* CalDAV client rewritten to use cURL (HTTP Digest auth now
+	  supported)
+	* Rewritten calendar sharing interface with autocomplete (using
+	  principal-property-search)
+	* Added support for read-only calendar sharing
+	* Improved memory usage by reusing DateTimeZone objects
+	* Applied some fullcalendar patches from pull request #48:
+	  - Now a line shows current time in week/day views
+	  - New view: 'agenda'
+	* Lots of aesthetical changes
+	* New automated database upgrade process (migrations like)
+	* Users can now configure their default calendar, hide calendars
+	  from list and temporarily hide events from selected calendars
+	* Added et (Estonian) translation (thanks to Rivo Zängov)
+
 Release 1.2.4 (2012-01-16)
 	* Aesthetical changes: 
 	  - Event box padding

README.md

@@ -12,7 +12,8 @@ Requisites
 * A web server
 * PHP >= 5.3.0
 * PHP mbstring extension
-* MySQL > 5.1
+* PHP cURL extension
+* MySQL > 5.1 or PostgreSQL >= 8.1
 
 Thanks
 ------
@@ -31,6 +32,5 @@ AgenDAV is possible thanks to the following projects:
 * [qTip2](http://craigsworks.com/projects/qtip2/)
 * [timePicker](https://github.com/perifer/timePicker)
 * [LoadMask](http://code.google.com/p/jquery-loadmask/)
-* [Tag-it!](http://aehlke.github.com/tag-it/)
 * [FatCow.com free icons](http://www.fatcow.com/free-icons)
 * And other projects I may forget (please, ask for credit!)

bin/agendavcli

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+PHP=`which php`
+
+# Find path to web/public dir
+realpath() {
+	[[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
+
+PUBLIC_DIR=`realpath "$0"|sed 's_agendavcli\$__g'`../web/public
+
+$PHP "${PUBLIC_DIR}"/index.php cli ${1-}

bin/prepare-static.php

@@ -40,6 +40,7 @@
 }
 
 // Load file list
+define('BASEPATH', $app_dir);
 require_once($app_dir . 'hooks/Defs.php');
 
 $defs = new Defs();

doc/source/admin/configuration.rst

@@ -53,7 +53,7 @@ setting.
 
     $config['log_path'] = '/var/log/agendav/';
 
-   Make sure the user that runs your web server has write rights on that
+   Make sure the user that runs your web server has write permission on that
    directory.
 
 .. confval:: encryption_key
@@ -120,11 +120,10 @@ setting.
 
    Language to be used in AgenDAV interface.
 
-   Currently available options (languages):
+   Have a look at directory ``web/lang`` for a list of available languages.
 
-   * ``de_DE``: German
-   * ``en_US``: English (United States)
-   * ``es_ES``: Spanish
+   Note that the value given to this setting will be used as application
+   locale with ``setlocale()``.
 
    .. versionadded:: 1.2
 
@@ -139,14 +138,79 @@ setting.
 
 .. confval:: default_date_format
 
-   Preferred date format to be used inside date fields. Possible values are:
+   Preferred date format to be used inside date fields (only in forms).
+   Possible values are:
 
    * ``ymd``: e.g. 2011/10/22
    * ``dmy``: e.g. 22/10/2011
    * ``mdy``: e.g. 10/22/2011
 
    .. versionadded:: 1.2
 
+.. confval:: format_full_date
+
+   Human readable format for dates, using ``strftime`` syntax
+   (http://php.net/strftime). Some examples:
+
+   * ``%a %e %B %Y``: Mon 5 March 2012
+   * ``%a %e de %B de %Y``: Lun 5 de marzo de 2012 (localized using ``es_ES`` as :confval:`default_language`)
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_column_month
+
+   Sets how the UI calendar should format the column header in month view. 
+   Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_column_week
+
+   Sets how the UI calendar should format the column header in week view. 
+   Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_column_day
+
+   Sets how the UI calendar should format the column header in day view. 
+   Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_column_table
+
+   Sets how the UI calendar should format the column header in table (called *agenda*) view.  Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_title_month
+
+   Sets how the UI calendar should format the title in month view. 
+   Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_title_week
+
+   Sets how the UI calendar should format the title in week view. 
+   Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_title_day
+
+   Sets how the UI calendar should format the title in day view. 
+   Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
+.. confval:: format_title_table
+
+   Sets how the UI calendar should format the title header in table (called *agenda*) view.  Uses `FullCalendar own syntax <http://arshaw.com/fullcalendar/docs/utilities/formatDate/>`_
+
+   .. versionadded:: 1.2.5
+
 .. confval:: default_first_day
 
    Which day should be considered the first of the week. Starting with 0
@@ -235,6 +299,31 @@ Here you will configure every single aspect of your CalDAV server.
 
    .. seealso:: :confval:`caldav_principal_url` :confval:`caldav_calendar_url`
 
+.. confval:: caldav_http_auth_method
+
+   You can specify which HTTP authentication method does your CalDAV server
+   require. Use any of the cURL ``CURLOPT_HTTPAUTH`` valid values (see
+   http://www.php.net/manual/en/function.curl-setopt.php), or leave it empty
+   to make AgenDAV auto-detect which authentication method to use.
+
+   Using the auto-detect feature will slow down requests when using Basic
+   auth. If you know which authentication method does your server use you're
+   advised to set the right value on this option.
+
+   Example::
+   
+    // Automatic guess
+    $config['caldav_http_auth_method'] = null;
+
+    // SabreDAV
+    $config['caldav_http_auth_method'] = CURLAUTH_DIGEST;
+
+    // DAViCal
+    $config['caldav_http_auth_method'] = CURLAUTH_BASIC;
+
+   .. versionadded:: 1.2.5
+
+
 .. confval:: caldav_principal_url
 
    Used by AgenDAV to generate a principal URL for your CalDAV server. The
@@ -312,8 +401,9 @@ Here you will configure every single aspect of your CalDAV server.
    full ACL has to be built with the following structure:
 
    * Permissions given to the owner (this option)
-   * Permissions given to granted users (:confval:`share_permissions`)
-   * Permissions given to other users (:confval:`default_permissions`)
+   * Permissions given to users with read-only profile (:confval:`read_profile_permissions`)
+   * Permissions given to users with read and write profile (:confval:`read_write_profile_permissions`)
+   * Permissions given to the rest of users (:confval:`default_permissions`)
 
    Please, refer to your CalDAV server documentation to know which
    permissions does it support.
@@ -322,24 +412,26 @@ Here you will configure every single aspect of your CalDAV server.
    <http://wiki.davical.org/w/Permissions>`_. Default values of this option
    will work all right for DAViCal.
 
-   .. seealso:: Used in conjunction with options :confval:`share_permissions`
-      and :confval:`default_permissions`.
-
 .. confval:: share_permissions
 
-   List of DAV permissions used for granted users when another user shares a
-   calendar with them.
+   .. deprecated:: 1.2.5
 
-   Please, refer to your CalDAV server documentation to know which
-   permissions does it support.
+   .. seealso:: See :confval:`read_profile_permissions` and
+      :confval:`read_write_profile_permissions`
+
+.. confval:: read_profile_permissions
+
+   List of DAV permissions used for users given read-only permission on a
+   calendar.
 
-   Default value lets users to read and write on shared calendars. AgenDAV
-   doesn't support at this moment to select whether you want read or shared
-   rights.
+   .. versionadded:: 1.2.5
 
-   .. seealso:: Used in conjunction with options :confval:`owner_permissions`
-      and :confval:`default_permissions`.
+.. confval:: read_write_profile_permissions
 
+   List of DAV permissions used for users given read and write permission on
+   a calendar.
+
+   .. versionadded:: 1.2.5
 
 .. confval:: default_permissions
 
@@ -351,9 +443,6 @@ Here you will configure every single aspect of your CalDAV server.
 
    Default value lets users just to make free/busy queries in DAViCal.
 
-   .. seealso:: Used in conjunction with options :confval:`owner_permissions`
-      and :confval:`share_permissions`.
-
 Other configuration files
 -------------------------
 

doc/source/admin/index.rst

@@ -5,5 +5,6 @@ Installation and configuration
    :numbered:
 
    installation
+   upgrading
    configuration
    troubleshooting