summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25023 from owncloud/fix-22127-trusted-serversVincent Petry2016-06-083-11/+16
|\ | | | | Fixed problem about removing trusted servers accidentally
| * Removed old htmlSergio Bertolín2016-06-081-2/+3
| |
| * Improve readabilitySergio Bertolín2016-06-081-1/+1
| |
| * Fixed problem about removing trusted servers accidentallySergio Bertolín2016-06-083-9/+13
| |
* | Merge pull request #25027 from owncloud/fix-22746-narrowtooltipVincent Petry2016-06-081-1/+1
|\ \ | | | | | | Added width of the tooltip
| * | Added width of the tooltipSergio Bertolín2016-06-081-1/+1
| | |
* | | Do not log token or challenge with exception stacktrace (#25026)Joas Schilling2016-06-082-4/+30
| | | | | | | | | | | | | | | | | | * Make the filtering better readable * Add some more methods to the sensitive list
* | | Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatchVincent Petry2016-06-081-1/+1
|\ \ \ | | | | | | | | Fix GDrive file size when mime type doesn't match contents
| * | | Fix GDrive file size when mime type doesn't match contentsVincent Petry2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uploading a txt file with XML contents makes GDrive return the XML mime type. This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size properly rely on the Google Docs mime types.
* | | | Merge pull request #24974 from owncloud/htaccess_updateVincent Petry2016-06-081-2/+2
|\ \ \ \ | | | | | | | | | | .htaccess update making two rules non-capturing
| * | | | .htaccess update making two rules non-capturingMartin2016-06-031-2/+2
| | | | |
* | | | | 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 login
| * | | | 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 hooks
| * | | | Bring back sharedstorage hooksRoeland Jago Douma2016-06-081-0/+18
| | | | |
* | | | | Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-086-3/+73
|\ \ \ \ \ | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir
| * | | | | 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 ↵Vincent Petry2016-06-085-5/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-23776-do-not-allow-boolean-user-config Do not allow to store boolean configs, they behave unexpected on postgres
| * | | | | 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 user
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Decrypt message via occ
| * | | | | | | 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 only
| * | | | | | | | 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 50
| * | | | | | | | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994 Workaround for https://github.com/owncloud/core/issues/24734
* | | | | | | | | Merge pull request #25018 from owncloud/background-contrastVincent Petry2016-06-081-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | darker background image for better font contrast
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | don't update storage mtime if we can't get the modified date
| * | | | | | | | | 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 ↵Vincent Petry2016-06-084-34/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-24939-better-ux-on-invalid-perma-link Improve the UX for "not found" perma links
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Added tests about overwriting files and folders as recipient
| * | | | | | | | 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 folder
| * | | | | | | | Fix GDrive upload file which name might match the one of a folderVincent Petry2016-06-072-1/+24
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is uploaded to GDrive, there is a check for that file with and without extension, due to Google Docs files having no extension. This logic now only kicks in whenever the detected extensionless file is really a Google Doc file, not a folder. This makes it possible again to upload a file "test.txt" in a folder that also has a folder called "test"
* / | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-088-0/+110
|/ / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 06:23:24 +0000