summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* use pre_unshare hook, otherwise the share is already removed. Which means ↵Björn Schießle2013-03-081-0/+1
| | | | that we have no chance to determine which folder has to be updated
* Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0710-26/+70
|\ | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| * Merge pull request #2173 from owncloud/fix-shared-storageBernhard Posselt2013-03-073-4/+26
| |\ | | | | | | Fix fetching source path of shared files
| | * Fix fetching source path of shared filesMichael Gapczynski2013-03-073-4/+26
| | |
| * | 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 us...
| | * | Remove <br> from error messages, because they will be escaped and the used ↵Arthur Schiwon2013-03-071-15/+15
| | | | | | | | | | | | | | | | template has it's own <br> already
| * | | create a meanigful file name if files are from the root folderBjörn Schießle2013-03-071-1/+7
| | | |
| * | | json encode list of filesBjörn Schießle2013-03-071-2/+3
| | |/ | |/|
| * | return 403 when mkdir failed on webDAV, fixes #2127Arthur Schiwon2013-03-061-1/+3
| |/
| * Add warning about sanitizationLukas Reschke2013-03-061-2/+3
| |
| * Merge pull request #2120 from owncloud/clear-cachesBernhard Posselt2013-03-061-0/+4
| |\ | | | | | | Clear the CSS and JS cache earlier to make sure update goes smoothly
| | * Clear the CSS and JS cache earlier to make sure update goes smoothlyMichael Gapczynski2013-03-051-0/+4
| | |
| * | Merge pull request #2118 from owncloud/fix_1689Björn Schießle2013-03-062-1/+9
| |\ \ | | |/ | |/| properly implement displayNamesInGroup in Core and LDAP, fixes #1689
| | * make getDisplayNames optional feature for Group Backends, fall back to ↵Arthur Schiwon2013-03-052-1/+9
| | | | | | | | | | | | internal names
* | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0536-61/+150
|\| | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-064-1/+4
| |/
| * ownCloud 5 RC2v5.0.0RC2Frank Karlitschek2013-03-021-2/+2
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-051-0/+1
| |
| * Merge pull request #2096 from owncloud/cache-upgrade-idMichael Gapczynski2013-03-041-4/+5
| |\ | | | | | | Cache: also check if the file id is already in the cache during upgrade
| | * 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
| | | | | | | | | | | | Should solve upgrade issues if only some of the configured storages were migrated previously
| * | Merge pull request #2088 from owncloud/fixing-1844-again-masterBernhard Posselt2013-03-042-2/+10
| |\ \ | | | | | | | | adding test case for getDefaultEmailAddress() + fixing #1844 again
| | * | adding test case for getDefaultEmailAddress() + fixing #1844 againThomas Mueller2013-03-042-2/+10
| | | |
| * | | Merge pull request #2078 from owncloud/save_category_relationsThomas Müller2013-03-041-5/+4
| |\ \ \ | | | | | | | | | | VCategories: Don't forget to save category relations if category exists.
| | * | | VCategories: Don't forget to save category relations if category exists.Thomas Tanghus2013-03-041-5/+4
| | | | |
| * | | | Only send the standard headersLukas Reschke2013-03-041-1/+0
| | |/ / | |/| | | | | | Fixes https://github.com/owncloud/apps/issues/675
| * | | Fix #2074 by initializing as an arrayMichael Gapczynski2013-03-042-7/+7
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-041-0/+12
| | |
| * | Disable loading of backgroundjobs js when upgrade is neededBart Visscher2013-03-031-1/+1
| | |
| * | Check maintenance mode before loading apps in route matcherBart Visscher2013-03-031-1/+3
| | |
| * | Chunk size comment should say kB, not MBMichael Gapczynski2013-03-031-1/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-033-0/+3
| | |
| * | Merge pull request #2036 from owncloud/escape-only-in-templateFrank Karlitschek2013-03-021-2/+2
| |\ \ | | | | | | | | Escape the data only in the template
| | * | Escape the data only in the templateLukas Reschke2013-03-021-2/+2
| | | |
| * | | Avoid to display empty DisplayNames for menu and titleBrice Maron2013-03-021-0/+1
| | | |
| * | | Merge pull request #2026 from j-ed/masterLukas Reschke2013-03-021-2/+9
| |\ \ \ | | | | | | | | | | do not try to extract image infos from 0- or better less than 12-byte length files.
| | * | | Update image.phpj-ed2013-03-021-2/+9
| | | | | | | | | | | | | | | | | | | | don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at `http://php.net/manual/de/function.exif-imagetype.php`.
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-023-0/+6
| | |/ / | |/| |
| * | | Merge masterLukas Reschke2013-03-0112-14/+55
| |\ \ \
| | * | | validate the generated email address and fall back to localhost.localdomain ↵Thomas Mueller2013-03-011-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case it is not valid fixes #1844
| | * | | for this self test we don't care if the ssl certificate is self signed and ↵Thomas Mueller2013-03-011-0/+3
| | | | | | | | | | | | | | | | | | | | the peer cannot be verified.
| | * | | Merge pull request #2008 from owncloud/1999-requesttokenFrank Karlitschek2013-03-011-3/+7
| | |\ \ \ | | | | | | | | | | | | Check if requesttoken exists in session
| | | * | | Check if requesttoken exists in sessionLukas Reschke2013-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Ref #1999
| | | * | | Style fixesLukas Reschke2013-03-011-3/+3
| | | | | |
| | * | | | 5.0 RC 1v5.0.0RC1Frank Karlitschek2013-03-011-2/+2
| | | | | |
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-019-3/+12
| | | |_|/ | | |/| |
| | * | | Merge pull request #1937 from owncloud/check-resharingBart Visscher2013-02-281-2/+24
| | |\ \ \ | | | |/ / | | |/| | Check resharing setting
| | | * | Check resharing settingMichael Gapczynski2013-02-261-2/+24
| | | | |
| * | | | Merge masterLukas Reschke2013-02-287-12/+32
| |\| | |
| | * | | Merge pull request #1988 from owncloud/permissionscache_cleanicewind19912013-02-282-10/+18
| | |\ \ \ | | | | | | | | | | | | Clean permissions cache when deleting file