summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ownCloud 9.1.0 beta 2v9.1.0beta2v9.0.1beta2Daniel Molkentin2016-06-081-2/+2
* Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-086-5/+38
|\
| * Allow to cancel 2FA after loginJoas Schilling2016-06-076-5/+38
* | Merge pull request #25019 from owncloud/fix_24937Vincent Petry2016-06-081-0/+18
|\ \
| * | Bring back sharedstorage hooksRoeland Jago Douma2016-06-081-0/+18
* | | Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-086-3/+73
|\ \ \
| * | | Better handling of forbidden files in davRobin Appelman2016-06-072-0/+4
| * | | Ignore forbidden files while scanningRobin Appelman2016-06-071-1/+6
| * | | dissalow symlinks in local storages that point outside the datadirRobin Appelman2016-06-073-2/+63
| | |/ | |/|
* | | Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user...Vincent Petry2016-06-085-5/+30
|\ \ \
| * | | Do not allow to store boolean configs, they behave unexpected on postgresJoas Schilling2016-06-065-5/+30
* | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-084-19/+61
|\ \ \ \
| * | | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-074-19/+61
* | | | | Merge pull request #24992 from owncloud/fix_decrypt_messageVincent Petry2016-06-081-1/+10
|\ \ \ \ \
| * | | | | Fixed reviewsSergio Bertolín2016-06-071-2/+2
| * | | | | Comments fixeddavitol2016-06-061-3/+2
| * | | | | Fix Decrypt message via occdavitol2016-06-061-1/+11
* | | | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-onlyVincent Petry2016-06-083-15/+27
|\ \ \ \ \ \
| * | | | | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-073-15/+27
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #24999 from owncloud/initial-userloading-workaroundVincent Petry2016-06-081-1/+1
|\ \ \ \ \ \
| * | | | | | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-071-1/+1
* | | | | | | Merge pull request #25018 from owncloud/background-contrastVincent Petry2016-06-081-0/+0
|\ \ \ \ \ \ \
| * | | | | | | darker background image for better font contrastChristoph Wurst2016-06-081-0/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #25005 from owncloud/parent-storage-time-castVincent Petry2016-06-082-1/+7
|\ \ \ \ \ \ \
| * | | | | | | make sure $data['mtime'] is always a timestampRobin Appelman2016-06-071-0/+3
| * | | | | | | don't update storage mtime if we can't get the modified dateRobin Appelman2016-06-071-1/+4
| |/ / / / / /
* | | | | | | Merge pull request #25001 from owncloud/issue-24939-better-ux-on-invalid-perm...Vincent Petry2016-06-084-34/+44
|\ \ \ \ \ \ \
| * | | | | | | Adjust test to work with phpunit < 5.2Joas Schilling2016-06-081-1/+1
| * | | | | | | Improve the UX for "not found" perma linksJoas Schilling2016-06-074-34/+44
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23996 from owncloud/integrations-tests-qa-145Vincent Petry2016-06-083-1/+73
|\ \ \ \ \ \ \
| * | | | | | | Get a range from several chunksSergio Bertolin2016-05-311-2/+2
| * | | | | | | Added another case about overwriting folder using old chunkingSergio Bertolin2016-05-311-16/+12
| * | | | | | | Added same test using old chunkingSergio Bertolin2016-05-311-1/+17
| * | | | | | | userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcodedSergio Bertolin2016-05-311-5/+5
| * | | | | | | add overwriting using chunking but failingSergio Bertolin2016-05-311-0/+19
| * | | | | | | Added tests about overwriting files and folders as recipientSergio Bertolin2016-05-313-1/+42
* | | | | | | | Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolderVincent Petry2016-06-082-1/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix GDrive upload file which name might match the one of a folderVincent Petry2016-06-072-1/+24
| | |_|/ / / / | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-088-0/+110
|/ / / / / /
* | | | | | Merge pull request #23845 from owncloud/smb-renameVincent Petry2016-06-071-0/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | implement specific rename handling for SMBArthur Schiwon2016-05-311-0/+20
* | | | | | Merge pull request #24813 from owncloud/delete-ghost-filesVincent Petry2016-06-074-19/+142
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | add test for deleting ghost files over davRobin Appelman2016-06-031-0/+59
| * | | | | Fix warnings when trying to get mtime of non existing filesRobin Appelman2016-06-031-3/+3
| * | | | | return success when deleting ghost filesRobin Appelman2016-06-031-1/+3
| * | | | | allow deleting "ghost files" trough the View and Node apiRobin Appelman2016-06-032-16/+78
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-074-36/+36
* | | | | | Remove background from curved logo (#24980)William Bargent2016-06-061-0/+0
* | | | | | handle path not being set in shared cache (#24993)Robin Appelman2016-06-061-1/+1
* | | | | | Fix checkMove() implementation for dav v2 - fixes #24776 (#24971)Thomas Müller2016-06-063-27/+46
| |_|_|/ / |/| | | |