summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into routingBart Visscher2012-09-2814-34/+160
|\
| * Fix syntax error in removeETagHookBart Visscher2012-09-281-5/+5
| * After selecting a search result, hide the resultsBart Visscher2012-09-281-0/+1
| * urlencode filename in search result, fixes problems with & in nameBart Visscher2012-09-281-0/+1
| * Simplify generating file search resultsBart Visscher2012-09-281-8/+14
| * Correctly fix oc-1016 and fix downloading of filesBart Visscher2012-09-281-1/+1
| * Merge pull request #19 from arkascha/masterLukas Reschke2012-09-288-18/+130
| |\
| | * Fix to preserve backward compatibility for apps creating static links contain...Christian Reiner2012-09-282-2/+10
| | * Added name to AUTHORS file, since mentioned in file headers.Christian Reiner2012-09-281-0/+1
| | * Merge branch 'master' of git://github.com/owncloud/coreChristian Reiner2012-09-2880-682/+938
| | |\
| | * | Reimplementation of CSRF protection including autorefreshChristian Reiner2012-09-287-24/+127
| * | | etag has to be removed after version rollback to enable the sync client to de...Björn Schießle2012-09-282-2/+10
| * | | move back to "lastmodified" property since "getlastmodified" is protected by ...Björn Schießle2012-09-281-5/+3
| | |/ | |/|
* | | Merge branch 'master' into routingBart Visscher2012-09-28739-10430/+27881
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-2829-230/+298
| * | some more sane column sizes for appconfig and preferencesRobin Appelman2012-09-272-8/+8
| * | This .gitkeep is unneededLukas Reschke2012-09-271-1/+0
| * | LDAP: comparison, not assignment. Thanks to Manuel DelgadoArthur Schiwon2012-09-272-3/+3
| * | check if file really exist before add/remove itBjörn Schießle2012-09-272-4/+12
| * | only upload valid ssl root certificatesBjörn Schießle2012-09-271-6/+14
| * | RC 1v4.5.0RC1Frank Karlitschek2012-09-271-2/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-2757-443/+616
| * | take '\' on windows systems into account to prevent file deletion above uploa...Björn Schießle2012-09-261-1/+1
| * | fix security issue, don't allow to go back in the pathBjörn Schießle2012-09-261-1/+1
| |/
| * The mtime in the file cache has to be updated after version rollback (copy fr...Björn Schießle2012-09-261-0/+2
| * fix sharing for newly uploaded or created filesRobin Appelman2012-09-263-9/+17
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-26189-2863/+6145
| * Python language setting on gettextThomas Müller2012-09-261-1/+1
| * prepare server for move of property name "lastmodified" to "getlastmodified" ...Björn Schießle2012-09-261-4/+6
| * Sharing: write update errors to logfile; do not die on errorsArthur Schiwon2012-09-261-2/+2
| * Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2012-09-2637-183/+281
| |\
| | * Fix unsetting share expiration dateMichael Gapczynski2012-09-262-3/+14
| | * Show share expiration date set for shared itemMichael Gapczynski2012-09-261-5/+13
| | * Properly format the share expiration time for the database, fixes bug oc-1779Michael Gapczynski2012-09-251-5/+10
| | * Stop autocomplete selection event propogration so share dropdown doesn't disa...Michael Gapczynski2012-09-251-0/+1
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-2632-167/+223
| | * Add OC_Files::searchByMime functionBart Visscher2012-09-251-1/+18
| | * Passwords containing a ":" don't work with this explodeLukas Reschke2012-09-251-2/+2
| | * Add missing Sharing permissionArthur Schiwon2012-09-251-1/+1
| | * Sharing update: take over reshares and thus don't failArthur Schiwon2012-09-251-1/+1
| * | - take webdav namespace for properties into accountBjörn Schießle2012-09-263-12/+14
| |/
| * Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2012-09-2548-370/+630
| |\
| | * Fix files_sharing update script, by making filesystem and users availableArthur Schiwon2012-09-251-0/+7
| | * backwards compat to older xcache versions, don't fail when trying to clear ca...Arthur Schiwon2012-09-251-0/+6
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-2543-364/+610
| | * Fix getting individual shared file informationBart Visscher2012-09-241-1/+2
| | * Small css fix for button new in files. fix oc-1638Brice Maron2012-09-241-1/+1
| | * use file instead of dir in search provider file fix result urlsJörn Friedrich Dreyer2012-09-241-4/+4
| * | seperate the form to set up the mount points and the form to upload ssl certi...Björn Schießle2012-09-251-11/+15
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-2475-745/+1204