summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update sharing when users are removed, added to groups, and removed from groupsMichael Gapczynski2012-04-252-0/+31
* resolve merge conflictsArthur Schiwon2012-04-269-68/+1279
|\
| * Fixed cancelling of uploads and wrong merge conflict resolutionSimon Birnbach2012-04-152-12/+36
| * Fixed cancelling upload of same file to folder and subfolderSimon Birnbach2012-04-152-1/+4
| * Merge git://gitorious.org/owncloud/owncloudSimon Birnbach2012-04-15399-17994/+26501
| |\
| * | Added uploading to folder and cancellable downloadsSimon Birnbach2012-03-276-36/+173
| * | Added global progressbar for all uploadsSimon Birnbach2012-03-173-1/+15
| * | Fixed upload of undeleted file and size informationSimon Birnbach2012-03-171-7/+3
| * | Support for legacy browsersSimon Birnbach2012-03-163-95/+183
| * | coding guidelinesSimon Birnbach2012-03-161-3/+3
| * | Initial version of drag&drop file upload supportSimon Birnbach2012-03-163-0/+950
* | | 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