Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23485 from owncloud/composer_allow_ocp | Thomas Müller | 2016-03-22 | 3 | -1/+5 |
|\ | | | | | Allow OCP classes to be PSR-4 as well | ||||
| * | Move IServerContainter to PSR-4 | Roeland Jago Douma | 2016-03-22 | 1 | -0/+0 |
| | | |||||
| * | Allos OCP classes to be PSR-4 as well | Roeland Jago Douma | 2016-03-22 | 2 | -1/+5 |
| | | | | | | | | | | This adds the OCP namespace to the composer autoloader as well. This means that now we can use proper PSR-4 filenames in OCP. | ||||
* | | Merge pull request #23398 from owncloud/block_group_sharing | Thomas Müller | 2016-03-22 | 16 | -42/+218 |
|\ \ | | | | | | | Allow blocking of group sharing | ||||
| * | | Fix js strings if group sharing is disabled | Roeland Jago Douma | 2016-03-22 | 3 | -6/+20 |
| | | | |||||
| * | | Add intergration tests | Roeland Jago Douma | 2016-03-22 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | * Only for sharees right now * Sharing intergration tests fail due to the test setup we have right now | ||||
| * | | Respect disabled group sharing in sharee endpoint | Roeland Jago Douma | 2016-03-22 | 3 | -35/+69 |
| | | | | | | | | | | | | * Fix tests | ||||
| * | | Block group sharing in API and in share manager | Roeland Jago Douma | 2016-03-22 | 4 | -1/+88 |
| | | | | | | | | | | | | * Fix tests | ||||
| * | | Add config to sharemanager | Roeland Jago Douma | 2016-03-22 | 2 | -0/+14 |
| | | | |||||
| * | | Add `allow sharing with groups` checkbox to admin page | Roeland Jago Douma | 2016-03-22 | 3 | -0/+10 |
| | | | |||||
* | | | Merge pull request #22679 from owncloud/fix_22668 | Thomas Müller | 2016-03-22 | 2 | -1/+91 |
|\ \ \ | | | | | | | | | When the Share API is disabled do not return shares | ||||
| * | | | When the Share API is disabled do not return shares | Roeland Jago Douma | 2016-03-22 | 2 | -1/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22668 Block everything in the OCS Share API | ||||
* | | | | Merge pull request #23488 from owncloud/only-use-usersession-if-installed | Thomas Müller | 2016-03-22 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | Only use the user session if ownCloud is already installed | ||||
| * | | | Only use the user session if ownCloud is already installed | Lukas Reschke | 2016-03-22 | 1 | -1/+5 |
|/ / / | | | | | | | | | | When installing ownCloud with autotest and MySQL some log entries may be created which will invoke the logging class. IUserSession has a dependency on the database which will make the installation fail => :bomb: | ||||
* | | | Merge pull request #23484 from ↵ | Thomas Müller | 2016-03-22 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | | | | | | | owncloud/if-class-is-already-loaded-dont-load-it-again Dont double load class | ||||
| * | | Dont double load class | Lukas Reschke | 2016-03-22 | 1 | -0/+4 |
| |/ | | | | | | | | | | | If the class already exists we should not load it twice. Since the composer autoloader is also used in core this could otherwise load a file twice. This leads to problems otherwise with case insensitive operating systems like OS X. We can get rid of this once all file names in OC follow PSR-4, until then we probably need this check. | ||||
* | | Merge pull request #23437 from owncloud/save-query-when-the-list-is-empty | Thomas Müller | 2016-03-22 | 2 | -1/+12 |
|\ \ | |/ |/| | Save the query when we get tags for no objects | ||||
| * | Save the query when we get tags for no objects | Joas Schilling | 2016-03-22 | 2 | -1/+12 |
| | | |||||
* | | Merge pull request #23461 from ↵ | Thomas Müller | 2016-03-22 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | owncloud/activity-491-autoloading-issue-without-sharing Fix "AutoloadNotAllowedException" when files_sharing is disabled | ||||
| * | | Fix "AutoloadNotAllowedException" when files_sharing is disabled | Joas Schilling | 2016-03-22 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #23411 from owncloud/new_sharing_to_composer | Thomas Müller | 2016-03-22 | 7 | -0/+0 |
|\ \ \ | | | | | | | | | Move sharing 2.0 to composer autoloader | ||||
| * | | | Move (new) sharing over to composer autoloader | Roeland Jago Douma | 2016-03-20 | 7 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #23404 from owncloud/fix-22988 | Thomas Müller | 2016-03-22 | 2 | -4/+10 |
|\ \ \ \ | |_|_|/ |/| | | | adjust PrincipalUri as returned from Sabre to effective username | ||||
| * | | | fix unittest | Arthur Schiwon | 2016-03-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | adjust PrincipilUri as returned from Sabre to effective username | Arthur Schiwon | 2016-03-18 | 1 | -1/+7 |
| |/ / | |||||
* | | | Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar | Thomas Müller | 2016-03-22 | 1 | -16/+12 |
|\ \ \ | | | | | | | | | Create the contact birthday calendar right away as soon as the comman… | ||||
| * | | | Create the contact birthday calendar right away as soon as the command is ↵ | Thomas Müller | 2016-03-16 | 1 | -16/+12 |
| | | | | | | | | | | | | | | | | executed once - fixes #23203 | ||||
* | | | | Merge pull request #23448 from ↵ | Thomas Müller | 2016-03-22 | 2 | -3/+23 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue-22993-soften-exception-on-enable-default-app Do not abort with an exception when a default app can not be enabled | ||||
| * | | | | Do not abort with an exception when a default app can not be enabled | Joas Schilling | 2016-03-21 | 2 | -3/+23 |
| | | | | | |||||
* | | | | | Merge pull request #23443 from owncloud/some-more-logging-information | Thomas Müller | 2016-03-22 | 1 | -8/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Log more information by default | ||||
| * | | | | | Log more information by default | Lukas Reschke | 2016-03-21 | 1 | -8/+15 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the logger to add the following logging information by default: - Request Method - Request URL - Current user | ||||
* | | | | | Merge pull request #23440 from owncloud/fix_22286 | Thomas Müller | 2016-03-22 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | apply retry wrapper to make sure that we always read/write a complete block | ||||
| * | | | | | apply retry wrapper to make sure that we always read/write a complete block | Bjoern Schiessle | 2016-03-21 | 1 | -1/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #23422 from owncloud/icon-and-you-translation-for-comments | Thomas Müller | 2016-03-22 | 1 | -1/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add comment icon and "You commented" translations to activities | ||||
| * | | | | | | Add comment icons and "You commented" translations | Joas Schilling | 2016-03-21 | 1 | -1/+22 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #23377 from owncloud/optimize-svgs | Thomas Müller | 2016-03-22 | 10 | -1382/+10 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Optimize SVGs | ||||
| * | | | | | Optimize SVGs | Morris Jobke | 2016-03-18 | 10 | -1382/+10 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-22 | 4 | -4/+32 |
| | | | | | |||||
* | | | | | Merge pull request #23439 from owncloud/smb-permissions | Thomas Müller | 2016-03-21 | 1 | -0/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | properly use smb permissions | ||||
| * | | | | | properly use smb permissions | Robin Appelman | 2016-03-21 | 1 | -0/+22 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #23386 from owncloud/share-keepoptioncheckboxinblocks | Thomas Müller | 2016-03-21 | 2 | -36/+55 |
|\ \ \ \ \ | | | | | | | | | | | | | Keep share checkboxes together | ||||
| * | | | | | Keep share checkboxes together | Vincent Petry | 2016-03-18 | 2 | -36/+55 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed leading spaces before markup which can affect rendering in some cases - added shareOption CSS class to group and keep share option checkbox + label - moved ".showCruds" arrow into the matching shareOption to keep the arrow together with the checkbox | ||||
* | | | | | Merge pull request #23388 from ↵ | Thomas Müller | 2016-03-21 | 4 | -33/+68 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-22887-infinite-background-job-loop-for-old-versions Do not create a new job when federation failed to connect but use existing job | ||||
| * | | | | | Do not create a new job when it failed to connect atm | Joas Schilling | 2016-03-21 | 4 | -33/+68 |
| |/ / / / | |||||
* | | | | | Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issue | Thomas Müller | 2016-03-21 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix doc issue of cache wrapper | ||||
| * | | | | | Fix doc issue of cache wrapper | Joas Schilling | 2016-03-21 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #23323 from owncloud/gdrive-chunkupload | Thomas Müller | 2016-03-21 | 1 | -5/+52 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Chunk upload for GDrive | ||||
| * | | | | | | Only use GDrive chunks when needed | Vincent Petry | 2016-03-17 | 1 | -29/+43 |
| | | | | | | | |||||
| * | | | | | | Chunk upload for GDrive | Vincent Petry | 2016-03-16 | 1 | -6/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing the WHOLE file in memory in a PHP variable, use the library's chunk upload support. | ||||
* | | | | | | | Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce | Thomas Müller | 2016-03-21 | 3 | -45/+76 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Do not fire pre/post hooks twice on chunk upload |