summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix problem with filescanningRobin Appelman2012-04-251-0/+3
* Fix javascript checkbox toggle for resharingMichael Gapczynski2012-04-251-1/+1
* LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well...Arthur Schiwon2012-04-254-53/+509
* use uniquemember instead of deprecated memberuid to identify LDAP group membe...Arthur Schiwon2012-04-252-4/+33
* don't forget new JS fileArthur Schiwon2012-04-251-0/+3
* LDPA: group settings into basic and advanced to look less crowded. Still need...Arthur Schiwon2012-04-252-15/+25
* added dropdown js menu for file versions, improved readability of history.phpSam Tuke2012-04-252-2/+60
* Forgot to remove error log messages...Michael Gapczynski2012-04-251-3/+0
* Allow admin to disable resharing of filesMichael Gapczynski2012-04-255-1/+45
* fixed path to history scriptSam Tuke2012-04-251-1/+1
* added history buttonsSam Tuke2012-04-252-0/+240
* added script and loaded it for adding history buttonSam Tuke2012-04-252-1/+9
* made code a little more readableSam Tuke2012-04-251-19/+19
* Contacts: Fixed some file paths.Thomas Tanghus2012-04-251-14/+14
* Merge branch 'sabredav_1.6'Georg Ehrke2012-04-25194-5201/+9439
|\
| * Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-2220-46/+578
| |\
| * | update to SabreDav 1.6.2Georg Ehrke2012-04-21180-0/+24863
| * | remove old sabredav filesGeorg Ehrke2012-04-21153-20626/+0
| * | fix merge conflictsGeorg Ehrke2012-04-21113-1129/+15144
| |\ \
| * \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-15269-14542/+37152
| |\ \ \
| * \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-13160-16492/+15851
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-10104-614/+5525
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-3027-67/+177
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2927-200/+2503
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2716-55/+143
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2532-72/+1005
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2211-17/+233
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2112-187/+248
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-191-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-19207-3214/+6299
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-2512-54/+182
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add empty methods updatePrincipal and searchPrincipals and change method getP...Georg Ehrke2012-02-251-1/+3
| * | | | | | | | | | | | | | | replace Sabre_DAV_Exception_FileNotFound with Sabre_DAV_Exception_NotFoundGeorg Ehrke2012-02-251-1/+1
| * | | | | | | | | | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTimeGeorg Ehrke2012-02-247-25/+25
| * | | | | | | | | | | | | | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-245-9/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-2372-447/+735
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | make lib/vobject.php work with sabredav 1.6Georg Ehrke2012-02-231-1/+1
* | | | | | | | | | | | | | | | | | fix js fail in media playerGeorg Ehrke2012-04-251-0/+1
* | | | | | | | | | | | | | | | | | some performance improvements to the openstack swift backendRobin Appelman2012-04-251-1/+16
* | | | | | | | | | | | | | | | | | fix mimetypes of encrypted filesRobin Appelman2012-04-252-25/+7
* | | | | | | | | | | | | | | | | | minor filecache improvementsRobin Appelman2012-04-251-5/+10
* | | | | | | | | | | | | | | | | | emit the correct hooks for file_put_contents and some readfile improvementsRobin Appelman2012-04-251-3/+16
* | | | | | | | | | | | | | | | | | initial mount configuration workRobin Appelman2012-04-251-0/+48
* | | | | | | | | | | | | | | | | | allow manually scanning of specific directoriesRobin Appelman2012-04-252-3/+4
* | | | | | | | | | | | | | | | | | move granite also to apps-playground because it´s not stable yet and is no l...Frank Karlitschek2012-04-2410-1797/+0
* | | | | | | | | | | | | | | | | | Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-04-2411-23/+241
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Added loading indicator.Thomas Tanghus2012-04-241-0/+1
| * | | | | | | | | | | | | | | | | | Contacts: Check that UIDs really are unique on import. Better solution would ...Thomas Tanghus2012-04-241-3/+35
| * | | | | | | | | | | | | | | | | | Contacts: In app import (for Chrome and Firefox only)Thomas Tanghus2012-04-243-22/+14
| * | | | | | | | | | | | | | | | | | Contacts: Tried to format NOTE field a bit. Needs to be improved more though.Thomas Tanghus2012-04-242-1/+2