aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* ampache should work nowGeorg Ehrke2012-04-262-5/+5
* make *DAV work with movable appsGeorg Ehrke2012-04-264-3/+5
* Merge branch 'master' into movable_apps_2Georg Ehrke2012-04-265-36/+171
|\
| * Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-04-262-2/+34
| |\
| * | started implementing ajax file rollbackSam Tuke2012-04-264-17/+61
| * | added available version names to files dropdown menu via new ajax scriptSam Tuke2012-04-264-31/+122
* | | move files to the correct placeGeorg Ehrke2012-04-262-0/+1031
* | | fix merge conflictsGeorg Ehrke2012-04-2643-213/+1141
|\ \ \ | | |/ | |/|
| * | Add ability to send private links from sharing via emailMichael Gapczynski2012-04-262-2/+34
| |/
| * improved styling, called css file in history.phpSam Tuke2012-04-264-4/+8
| * linked more button to history pageSam Tuke2012-04-261-3/+3
| * changed function name to avoid clash with sharing dropdownSam Tuke2012-04-261-2/+2
| * Contacts: Some js cleanup.Thomas Tanghus2012-04-261-5/+13
| * Contacts: Added import with with file picker.Thomas Tanghus2012-04-265-8/+76
| * Fix a counting mistakeMichael Gapczynski2012-04-251-1/+1
| * Update sharing when users are removed, added to groups, and removed from groupsMichael Gapczynski2012-04-252-0/+31
| * 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 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-256-22/+21
| |\
| | * Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-2215-39/+508
| | |\
| | * \ fix merge conflictsGeorg Ehrke2012-04-2154-453/+2183
| | |\ \
| | * \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-15212-13891/+36258
| | |\ \ \
| | * \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-13103-37016/+312
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-1056-465/+2256
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-3017-30/+42
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2918-182/+494
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-278-35/+74
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-2526-28/+1237
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-226-1/+214
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-212-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-03-19134-2405/+3177
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sabredav_1.6Georg Ehrke2012-02-252-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTimeGeorg Ehrke2012-02-246-22/+22
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | fix security check for the path of the requested fileGeorg Ehrke2012-04-262-2/+2
* | | | | | | | | | | | | | | | fix downloading of files in files appGeorg Ehrke2012-04-262-4/+4
* | | | | | | | | | | | | | | | fixes for media appGeorg Ehrke2012-04-261-2/+2
* | | | | | | | | | | | | | | | fixes for contacts appGeorg Ehrke2012-04-262-23/+16