Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23463 from owncloud/lets-consistently-use-no-referer | Thomas Müller | 2016-03-23 | 14 | -55/+55 |
|\ | |||||
| * | Consistently use rel=noreferrer | Lukas Reschke | 2016-03-20 | 14 | -55/+55 |
* | | Merge pull request #23495 from owncloud/disable-paste-zone | Thomas Müller | 2016-03-23 | 3 | -0/+3 |
|\ \ | |||||
| * | | Disable pastezone for jquery.fileupload | Lukas Reschke | 2016-03-22 | 3 | -0/+3 |
* | | | Merge pull request #23474 from owncloud/RealRancor-exclude_lost_and_found | Thomas Müller | 2016-03-23 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'exclude_lost_and_found' of https://github.com/RealRancor/core i... | Lukas Reschke | 2016-03-22 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | Exclude lost+found dir in integrity check | RealRancor | 2016-03-19 | 1 | -1/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-23 | 94 | -172/+34 |
* | | | | | Merge pull request #23485 from owncloud/composer_allow_ocp | Thomas Müller | 2016-03-22 | 3 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
* | | | | | | Merge pull request #23398 from owncloud/block_group_sharing | Thomas Müller | 2016-03-22 | 16 | -42/+218 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| * | | | | | | Respect disabled group sharing in sharee endpoint | Roeland Jago Douma | 2016-03-22 | 3 | -35/+69 |
| * | | | | | | Block group sharing in API and in share manager | Roeland Jago Douma | 2016-03-22 | 4 | -1/+88 |
| * | | | | | | 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 | Roeland Jago Douma | 2016-03-22 | 2 | -1/+91 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | 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 | Lukas Reschke | 2016-03-22 | 1 | -1/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #23484 from owncloud/if-class-is-already-loaded-dont-load-... | Thomas Müller | 2016-03-22 | 1 | -0/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Dont double load class | Lukas Reschke | 2016-03-22 | 1 | -0/+4 |
| |/ / / / | |||||
* | | | | | 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 | Joas Schilling | 2016-03-22 | 2 | -1/+12 |
| |/ / / | |||||
* | | | | Merge pull request #23461 from owncloud/activity-491-autoloading-issue-withou... | Thomas Müller | 2016-03-22 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | 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 (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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | 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 command is exe... | Thomas Müller | 2016-03-16 | 1 | -16/+12 |
* | | | | | | Merge pull request #23448 from owncloud/issue-22993-soften-exception-on-enabl... | Thomas Müller | 2016-03-22 | 2 | -3/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | Lukas Reschke | 2016-03-21 | 1 | -8/+15 |
| |/ / / / / / | |||||
* | | | | | | | 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 | 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 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 | 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 | 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 | Vincent Petry | 2016-03-18 | 2 | -36/+55 |
| | |/ / / / / | |/| | | | | |