Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Yo-ho-oh - Murder all band 'o pirates - backport of #24550 | Thomas Müller | 2016-05-11 | 8 | -42/+0 | |
|/ | ||||||
* | Disable pastezone for jquery.fileupload | Lukas Reschke | 2016-04-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS. This implementation triggers some problems: 1. The pastezone is defined globally by default (:see_no_evil:). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads. 2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>. 3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created. Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled. Lesson learned: Third-party JS libraries can have some weird details. | |||||
* | Merge pull request #24259 from owncloud/stable9-mount-unique | Thomas Müller | 2016-04-26 | 2 | -2/+22 | |
|\ | | | | | [stable9] don't get the config for the same mount multiple times | |||||
| * | add test | Robin Appelman | 2016-04-25 | 1 | -0/+11 | |
| | | ||||||
| * | don't get the config for the same mount multiple times | Robin Appelman | 2016-04-25 | 1 | -2/+11 | |
| | | ||||||
* | | Merge pull request #24242 from owncloud/stable9-backport-24052 | Thomas Müller | 2016-04-26 | 6 | -48/+32 | |
|\ \ | | | | | | | [stable9] Fix LDAP race conditions | |||||
| * | | Fix LDAP race conditions | Morris Jobke | 2016-04-25 | 6 | -48/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values | |||||
* | | | Merge pull request #24236 from owncloud/backport-24214-stable9 | Thomas Müller | 2016-04-25 | 2 | -11/+3 | |
|\ \ \ | |_|/ |/| | | [stable9] on clone Connection, do not take over the existing LDAP resource | |||||
| * | | on clone Connection, do not take over the existing LDAP resource | Arthur Schiwon | 2016-04-25 | 2 | -11/+3 | |
| |/ | | | | | | | | | | | | | For one, it solves potential conflicts when using the resource. For the other, one on the login check (the only place where a clone happens currently) we do not need to rebind after confirming the user's login was successful. | |||||
* / | Add missing use statement | Joas Schilling | 2016-04-25 | 1 | -0/+1 | |
|/ | ||||||
* | Merge pull request #24158 from owncloud/encryped-size-progation-9 | Thomas Müller | 2016-04-22 | 2 | -14/+68 | |
|\ | | | | | [9.0] dont do optimized size propagation for encrypted files | |||||
| * | Add unit tests for shared size propagation with encryption | Robin Appelman | 2016-04-21 | 2 | -14/+68 | |
| | | ||||||
* | | Personal calendar should be generated even if the birthday calendar already ↵ | Thomas Müller | 2016-04-22 | 2 | -16/+169 | |
| | | | | | | | | exists - fixes #24082 | |||||
* | | Merge pull request #24131 from ↵ | Thomas Müller | 2016-04-22 | 3 | -0/+20 | |
|\ \ | | | | | | | | | | | | | owncloud/dont-transfer-files-to-not-ready-user-stable9 [9.0] Introduce isReadyForUser and verify in file transfer ownership | |||||
| * | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 | Thomas Müller | 2016-04-20 | 3 | -0/+20 | |
| | | | ||||||
* | | | Merge pull request #24163 from owncloud/fix-birthday_calendar-acl-stable9 | Thomas Müller | 2016-04-21 | 3 | -15/+19 | |
|\ \ \ | | | | | | | | | [stable9] Birthday calendar should never have write acl | |||||
| * | | | Birthday calendar should never have write acl - fixes #24154 | Thomas Müller | 2016-04-21 | 3 | -15/+19 | |
| |/ / | ||||||
* | | | Merge pull request #24112 from ↵ | Thomas Müller | 2016-04-21 | 3 | -56/+24 | |
|\ \ \ | |_|/ |/| | | | | | | | | owncloud/backport-24111-chunking-users-in-background-jobs [9.0] Chunk the users correctly in the trashbin and versions background job | |||||
| * | | Chunk the users correctly in the trashbin and versions background job | Joas Schilling | 2016-04-20 | 3 | -56/+24 | |
| |/ | ||||||
* | | Merge pull request #24099 from owncloud/fix_23632_9.0 | Thomas Müller | 2016-04-20 | 2 | -10/+48 | |
|\ \ | | | | | | | [stable9] init users mount point before recovery | |||||
| * | | we need to initialize the mount points of the given user before we recover | Björn Schießle | 2016-04-19 | 2 | -10/+48 | |
| |/ | | | | | | | access to his files | |||||
* | | Merge pull request #23831 from owncloud/backport-23511 | Thomas Müller | 2016-04-20 | 2 | -4/+19 | |
|\ \ | |/ |/| | [9.0] sidebar click modification | |||||
| * | sidebar click modification | Erik Pellikka | 2016-04-07 | 2 | -4/+19 | |
| | | ||||||
* | | Adding VCFExportPlugin | Thomas Müller | 2016-04-10 | 1 | -0/+2 | |
| | | ||||||
* | | Merge pull request #23801 from owncloud/fix-23496-master-stable9 | Thomas Müller | 2016-04-08 | 1 | -2/+4 | |
|\ \ | |/ |/| | [stable9] Avoid fatal php error dring cron execution | |||||
| * | fixes #23496 | Thomas Müller | 2016-04-05 | 1 | -2/+4 | |
| | | ||||||
* | | Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9 | Thomas Müller | 2016-04-06 | 6 | -2/+217 | |
|\ \ | |/ |/| | [stable9] Sabre plugin browser error page | |||||
| * | Add magical regex to catch browsers | Lukas Reschke | 2016-03-24 | 1 | -1/+7 | |
| | | ||||||
| * | In case of exception we return an html page in case the client is a browser | Thomas Müller | 2016-03-24 | 6 | -2/+211 | |
| | | ||||||
* | | Inject the Mount Manager | Joas Schilling | 2016-04-04 | 2 | -6/+10 | |
| | | ||||||
* | | Unmount the share before deleting it, so we don't try to use it later on | Joas Schilling | 2016-04-04 | 1 | -0/+6 | |
| | | ||||||
* | | Merge pull request #23518 from owncloud/stable9-gdrive-stream-download | Thomas Müller | 2016-03-31 | 1 | -4/+5 | |
|\ \ | | | | | | | [stable9] GDrive stream download with RetryWrapper | |||||
| * | | GDrive stream download with RetryWrapper | Vincent Petry | 2016-03-30 | 1 | -4/+5 | |
| | | | ||||||
* | | | Merge pull request #23522 from owncloud/stable9-dropbox-stream-download | Frank Karlitschek | 2016-03-31 | 2 | -8/+32 | |
|\ \ \ | | | | | | | | | [stable9] Dropbox stream download with RetryWrapper | |||||
| * | | | Dropbox stream download with RetryWrapper | Vincent Petry | 2016-03-23 | 1 | -4/+6 | |
| | | | | ||||||
| * | | | Fix dropbox storage to not store the whole file in memory | Vincent Petry | 2016-03-23 | 2 | -7/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Since the library can only store the full response in memory on download, we use an alternate client lib and set the correct headers to be able to stream the content to a temp file. | |||||
* | | | | Revert "Explicitly add the current principal to the acl in case of group ↵ | Thomas Müller | 2016-03-31 | 14 | -137/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | sharing" This reverts commit 52f4acf23d9e388fdc6348858c4572e291bbc56b. | |||||
* | | | | Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapper | Thomas Müller | 2016-03-31 | 1 | -1/+3 | |
|\ \ \ \ | | | | | | | | | | | [stable9] Use RetryWrapper for SFTP storage | |||||
| * | | | | Use RetryWrapper for SFTP storage | Lukas Reschke | 2016-03-30 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Equivalent to https://github.com/owncloud/core/pull/23442 Required for making encryption work with external storage reliable. | |||||
* | | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY .... | Thomas Müller | 2016-03-31 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Fix acls for calendar objects and cards - fixes #23273 | Thomas Müller | 2016-03-31 | 9 | -84/+193 | |
| | | | | | ||||||
* | | | | | Return proper current-user-principal on v1 endpoints - fixes #23306 | Thomas Müller | 2016-03-31 | 1 | -0/+15 | |
| | | | | | ||||||
* | | | | | Fix group shares on v1 caldav and carddav - fixes #23328 | Thomas Müller | 2016-03-31 | 3 | -4/+5 | |
| | | | | | ||||||
* | | | | | Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9 | Thomas Müller | 2016-03-31 | 14 | -67/+139 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Explicitly add the current principal to the acl in case of group sharing | |||||
| * | | | | Fix unit test | Thomas Müller | 2016-03-30 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Explicitly add the current principal to the acl in case of group sharing | Thomas Müller | 2016-03-29 | 14 | -66/+138 | |
| |/ / / | ||||||
* | | | | Merge pull request #23664 from owncloud/stable9-share-displayownerfix | Thomas Müller | 2016-03-30 | 2 | -3/+4 | |
|\ \ \ \ | | | | | | | | | | | [stable9] Fix displaying owner before share icon in file list | |||||
| * | | | | Fix displaying owner before share icon in file list | Vincent Petry | 2016-03-30 | 2 | -3/+4 | |
| |/ / / | | | | | | | | | | | | | Initial display of owner was missing | |||||
* / / / | Use the shipped cacerts.pem instead of the global one | Lukas Reschke | 2016-03-30 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library. | |||||
* | / | Return remote shares in oc:share-types Webdav property | Vincent Petry | 2016-03-24 | 4 | -2/+8 | |
| |/ |/| | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists |