summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 5.0.0 RC3v5.0.0RC3Frank Karlitschek2013-03-081-2/+2
* Merge pull request #2189 from owncloud/versioning_sync_clientBernhard Posselt2013-03-082-2/+18
|\
| * remove some debug output; move code to the right functionBjörn Schießle2013-03-083-7/+9
| * remove debug outputBjörn Schießle2013-03-081-2/+1
| * distinguish between touch and writeBjörn Schießle2013-03-073-1/+16
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0895-805/+1161
* | fixed header content paddingFlorian Hülsmann2013-03-071-1/+1
* | Merge pull request #2173 from owncloud/fix-shared-storageBernhard Posselt2013-03-076-20/+63
|\ \
| * | Change findById to findByStorageId in mount testMichael Gapczynski2013-03-071-1/+1
| * | Fix fetching source path of shared filesMichael Gapczynski2013-03-076-19/+62
* | | Merge pull request #2174 from owncloud/fix_printed_brsblizzz2013-03-071-15/+15
|\ \ \
| * | | Remove <br> from error messages, because they will be escaped and the used te...Arthur Schiwon2013-03-071-15/+15
* | | | Merge pull request #2167 from owncloud/input-type-fixFrank Karlitschek2013-03-072-6/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | add type=text to ZIP size field, fix second part of #2097Jan-Christoph Borchardt2013-03-061-1/+1
| * | | add email input type to styled inputs, fix #2097Jan-Christoph Borchardt2013-03-061-5/+14
* | | | Merge pull request #2162 from owncloud/trash_bin_homeJan-Christoph Borchardt2013-03-072-1/+23
|\ \ \ \
| * | | | add dirlisting var to file listBjörn Schießle2013-03-071-0/+1
| * | | | no dir parameter neededBjörn Schießle2013-03-071-1/+1
| * | | | let the home icon link to the files view in the trash binBjörn Schießle2013-03-072-1/+22
* | | | | Merge pull request #2163 from owncloud/fix_file_downloadBjörn Schießle2013-03-073-6/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | create a meanigful file name if files are from the root folderBjörn Schießle2013-03-071-1/+7
| * | | | remove debug outputBjörn Schießle2013-03-071-2/+1
| * | | | json encode list of filesBjörn Schießle2013-03-073-5/+14
|/ / / /
* | | / [tx-robot] updated from transifexJenkins for ownCloud2013-03-0735-383/+429
| |_|/ |/| |
* | | Merge pull request #2134 from owncloud/fix_2127blizzz2013-03-061-1/+3
|\ \ \ | |_|/ |/| |
| * | return 403 when mkdir failed on webDAV, fixes #2127Arthur Schiwon2013-03-061-1/+3
|/ /
* | Merge pull request #2130 from owncloud/fix_2128Thomas Müller2013-03-061-1/+1
|\ \
| * | fix #2128Georg Ehrke2013-03-061-1/+1
* | | Merge pull request #2129 from owncloud/don't-sanitize-error-messageBernhard Posselt2013-03-062-3/+4
|\ \ \ | |/ / |/| |
| * | Add warning about sanitizationLukas Reschke2013-03-061-2/+3
| * | Don't sanitize error message hintLukas Reschke2013-03-061-1/+1
|/ /
* | Merge pull request #2120 from owncloud/clear-cachesBernhard Posselt2013-03-062-4/+4
|\ \
| * | Clear the CSS and JS cache earlier to make sure update goes smoothlyMichael Gapczynski2013-03-052-4/+4
* | | Merge pull request #2119 from owncloud/fix_ldap_settingsBernhard Posselt2013-03-062-12/+15
|\ \ \
| * | | LDAP: move more settings stuff to template fileArthur Schiwon2013-03-062-12/+15
| * | | LDAP: fix settings output thus make settings work againArthur Schiwon2013-03-051-1/+1
* | | | Merge pull request #2118 from owncloud/fix_1689Björn Schießle2013-03-064-4/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | whitespaceArthur Schiwon2013-03-051-1/+1
| * | | LDAP: implementation of displayNamesInGroupArthur Schiwon2013-03-052-3/+30
| * | | make getDisplayNames optional feature for Group Backends, fall back to intern...Arthur Schiwon2013-03-052-1/+9
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0661-238/+306
| |/ / |/| |
* | | Merge pull request #2112 from owncloud/fix_1673Frank Karlitschek2013-03-051-0/+3
|\ \ \
| * | | LDAP: escape some more chars for proper search filter, fixes #1673Arthur Schiwon2013-03-051-0/+3
| |/ /
* | / Merge pull request #2108 from owncloud/fix_ldap_errorcheckBjörn Schießle2013-03-051-1/+1
|\| | | |/ |/|
| * LDAP: error codes can be negative, tooArthur Schiwon2013-03-051-1/+1
|/
* ownCloud 5 RC2v5.0.0RC2Frank Karlitschek2013-03-021-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-0533-100/+161
* Merge pull request #2096 from owncloud/cache-upgrade-idMichael Gapczynski2013-03-041-4/+5
|\
| * Cache: more efficient detection for existing entries during upgradeRobin Appelman2013-03-041-9/+3
| * Cache: also check if the file id is already in the cache during upgradeRobin Appelman2013-03-041-3/+10