summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3951 from owncloud/fixing-3936-masterThomas Müller2013-07-052-5/+23
|\
| * proper fix for getting the shared item if no user is logged inThomas Müller2013-07-052-5/+17
| * php 5.3 compliant nowThomas Müller2013-07-051-1/+2
| * get the real physical folder name for anonymous uploadThomas Müller2013-07-051-2/+7
* | Merge pull request #3955 from owncloud/cache-scanner-testThomas Müller2013-07-051-0/+1
|\ \
| * | Scanner test: ensure mtime in the cache is the same as on the storage to prev...Robin Appelman2013-07-051-0/+1
* | | Merge pull request #3958 from owncloud/fixing-3933-masterThomas Müller2013-07-052-76/+82
|\ \ \
| * | | adding tipsy to the upload button showing the max upload and restoring client...Thomas Müller2013-07-052-76/+82
* | | | Merge pull request #3948 from owncloud/fixing-3934-masterBart Visscher2013-07-052-2/+5
|\ \ \ \
| * | | | fixing === and identThomas Müller2013-07-051-6/+6
| * | | | Merge branch 'master' into fixing-3934-masterThomas Müller2013-07-053-13/+13
| |\| | |
| * | | | no anonymous upload on files only foldersThomas Müller2013-07-052-5/+10
* | | | | Merge pull request #3957 from owncloud/config-glob-failThomas Müller2013-07-051-0/+3
|\ \ \ \ \
| * | | | | OC_Config: handle failure of glob('*.config.php')Robin Appelman2013-07-051-0/+3
| | |_|/ / | |/| | |
* | | | | remove wrong closing bracketBjörn Schießle2013-07-051-1/+0
* | | | | added helper function to escape glob patternBjörn Schießle2013-07-053-5/+15
* | | | | fix getUidAndFilename() testBjörn Schießle2013-07-051-1/+1
* | | | | only check for external mount points if the external storage app is enabledBjörn Schießle2013-07-051-9/+12
* | | | | make trash bin aware of system wide mounts with respect to encryption keysBjörn Schießle2013-07-051-7/+21
* | | | | only escape glob patternBjörn Schießle2013-07-052-4/+9
* | | | | del share keys from correct locationBjörn Schießle2013-07-051-3/+16
* | | | | always return normalized pathBjörn Schießle2013-07-051-1/+1
* | | | | delete file keys from the correct locationBjörn Schießle2013-07-051-1/+8
* | | | | handle rename correctly for system wide mountsBjörn Schießle2013-07-051-9/+16
* | | | | move isSystemWideMountPoint() to util.phpBjörn Schießle2013-07-052-19/+19
* | | | | some performance improvements, check for system wide mounts only once while w...Björn Schießle2013-07-051-40/+25
* | | | | fix path to OC_Mount_ConfigBjörn Schießle2013-07-052-2/+2
* | | | | handle system wide mount pointsBjörn Schießle2013-07-052-17/+62
| |_|/ / |/| | |
* | | | Merge pull request #3950 from owncloud/fixing-3941-masterJörn Friedrich Dreyer2013-07-051-9/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | no anonymous upload on read-only foldersThomas Müller2013-07-051-9/+11
|/ / /
* | / Merge https://github.com/owncloud/core/pull/3900Björn Schießle2013-07-052-8/+8
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-05692-5906/+6736
* | Merge pull request #3927 from owncloud/Fix_new_user_empty_groupRaghu Nayyar2013-07-041-2/+4
|\ \
| * | Do not add groups if user has no groupsVictor Dubiniuk2013-07-031-2/+4
* | | Merge pull request #3932 from owncloud/fix_label_positionMorris Jobke2013-07-041-1/+5
|\ \ \
| * | | fix position of 'user shared the folder foldername with you' labelGeorg Ehrke2013-07-041-1/+5
* | | | Merge pull request #3899 from owncloud/encryption_check_php_versionVicDeo2013-07-044-10/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | more verbose error messageBjörn Schießle2013-07-041-1/+1
| * | | Merge branch 'master' into encryption_check_php_versionBjörn Schießle2013-07-029-193/+189
| |\ \ \
| * \ \ \ Merge branch 'encryption_check_php_version' of github.com:owncloud/core into ...Björn Schießle2013-07-022-5/+4
| |\ \ \ \
| | * | | | no ?> at the end of a fileThomas Müller2013-07-011-2/+1
| | * | | | typoThomas Müller2013-07-011-3/+3
| * | | | | improved error messageBjörn Schießle2013-07-021-1/+1
| |/ / / /
| * | | | cast result to boolBjörn Schießle2013-07-011-1/+1
| * | | | fix error stringBjörn Schießle2013-07-011-1/+1
| * | | | add correct php versionBjörn Schießle2013-07-011-1/+1
| * | | | check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-013-7/+22
* | | | | Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pwKondou2013-07-042-1/+4
|\ \ \ \ \
| * | | | | Use better wording.kondou2013-07-031-1/+1
| * | | | | Add a "Wrong password." message, if the passwordkondou2013-07-022-1/+4