aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23485 from owncloud/composer_allow_ocpThomas Müller2016-03-223-1/+5
|\ | | | | Allow OCP classes to be PSR-4 as well
| * Move IServerContainter to PSR-4Roeland Jago Douma2016-03-221-0/+0
| |
| * Allos OCP classes to be PSR-4 as wellRoeland Jago Douma2016-03-222-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_sharingThomas Müller2016-03-2216-42/+218
|\ \ | | | | | | Allow blocking of group sharing
| * | Fix js strings if group sharing is disabledRoeland Jago Douma2016-03-223-6/+20
| | |
| * | Add intergration testsRoeland Jago Douma2016-03-222-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 endpointRoeland Jago Douma2016-03-223-35/+69
| | | | | | | | | | | | * Fix tests
| * | Block group sharing in API and in share managerRoeland Jago Douma2016-03-224-1/+88
| | | | | | | | | | | | * Fix tests
| * | Add config to sharemanagerRoeland Jago Douma2016-03-222-0/+14
| | |
| * | Add `allow sharing with groups` checkbox to admin pageRoeland Jago Douma2016-03-223-0/+10
| | |
* | | Merge pull request #22679 from owncloud/fix_22668Thomas Müller2016-03-222-1/+91
|\ \ \ | | | | | | | | When the Share API is disabled do not return shares
| * | | When the Share API is disabled do not return sharesRoeland Jago Douma2016-03-222-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #22668 Block everything in the OCS Share API
* | | | Merge pull request #23488 from owncloud/only-use-usersession-if-installedThomas Müller2016-03-221-1/+5
|\ \ \ \ | |/ / / |/| | | Only use the user session if ownCloud is already installed
| * | | Only use the user session if ownCloud is already installedLukas Reschke2016-03-221-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üller2016-03-221-0/+4
|\ \ \ | |/ / |/| | | | | | | | owncloud/if-class-is-already-loaded-dont-load-it-again Dont double load class
| * | Dont double load classLukas Reschke2016-03-221-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-emptyThomas Müller2016-03-222-1/+12
|\ \ | |/ |/| Save the query when we get tags for no objects
| * Save the query when we get tags for no objectsJoas Schilling2016-03-222-1/+12
| |
* | Merge pull request #23461 from ↵Thomas Müller2016-03-221-2/+2
|\ \ | | | | | | | | | | | | owncloud/activity-491-autoloading-issue-without-sharing Fix "AutoloadNotAllowedException" when files_sharing is disabled
| * | Fix "AutoloadNotAllowedException" when files_sharing is disabledJoas Schilling2016-03-221-2/+2
| | |
* | | Merge pull request #23411 from owncloud/new_sharing_to_composerThomas Müller2016-03-227-0/+0
|\ \ \ | | | | | | | | Move sharing 2.0 to composer autoloader
| * | | Move (new) sharing over to composer autoloaderRoeland Jago Douma2016-03-207-0/+0
| | | |
* | | | Merge pull request #23404 from owncloud/fix-22988Thomas Müller2016-03-222-4/+10
|\ \ \ \ | |_|_|/ |/| | | adjust PrincipalUri as returned from Sabre to effective username
| * | | fix unittestArthur Schiwon2016-03-211-3/+3
| | | |
| * | | adjust PrincipilUri as returned from Sabre to effective usernameArthur Schiwon2016-03-181-1/+7
| |/ /
* | | Merge pull request #23320 from owncloud/early-creation-of-birthday-calendarThomas Müller2016-03-221-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üller2016-03-161-16/+12
| | | | | | | | | | | | | | | | executed once - fixes #23203
* | | | Merge pull request #23448 from ↵Thomas Müller2016-03-222-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 enabledJoas Schilling2016-03-212-3/+23
| | | | |
* | | | | Merge pull request #23443 from owncloud/some-more-logging-informationThomas Müller2016-03-221-8/+15
|\ \ \ \ \ | | | | | | | | | | | | Log more information by default
| * | | | | Log more information by defaultLukas Reschke2016-03-211-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_22286Thomas Müller2016-03-221-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 blockBjoern Schiessle2016-03-211-1/+4
| | | | | |
* | | | | | Merge pull request #23422 from owncloud/icon-and-you-translation-for-commentsThomas Müller2016-03-221-1/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add comment icon and "You commented" translations to activities
| * | | | | | Add comment icons and "You commented" translationsJoas Schilling2016-03-211-1/+22
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #23377 from owncloud/optimize-svgsThomas Müller2016-03-2210-1382/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Optimize SVGs
| * | | | | Optimize SVGsMorris Jobke2016-03-1810-1382/+10
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-224-4/+32
| | | | |
* | | | | Merge pull request #23439 from owncloud/smb-permissionsThomas Müller2016-03-211-0/+22
|\ \ \ \ \ | | | | | | | | | | | | properly use smb permissions
| * | | | | properly use smb permissionsRobin Appelman2016-03-211-0/+22
| | |_|/ / | |/| | |
* | | | | Merge pull request #23386 from owncloud/share-keepoptioncheckboxinblocksThomas Müller2016-03-212-36/+55
|\ \ \ \ \ | | | | | | | | | | | | Keep share checkboxes together
| * | | | | Keep share checkboxes togetherVincent Petry2016-03-182-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üller2016-03-214-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 atmJoas Schilling2016-03-214-33/+68
| |/ / / /
* | | | | Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issueThomas Müller2016-03-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix doc issue of cache wrapper
| * | | | | Fix doc issue of cache wrapperJoas Schilling2016-03-211-1/+1
| | | | | |
* | | | | | Merge pull request #23323 from owncloud/gdrive-chunkuploadThomas Müller2016-03-211-5/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | Chunk upload for GDrive
| * | | | | | Only use GDrive chunks when neededVincent Petry2016-03-171-29/+43
| | | | | | |
| * | | | | | Chunk upload for GDriveVincent Petry2016-03-161-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-onlyfirehooksonceThomas Müller2016-03-213-45/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not fire pre/post hooks twice on chunk upload