Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translations | Thomas Müller | 2016-03-23 | 1 | -6/+4 |
|\ | |||||
| * | Fix the translations of the User menu | Joas Schilling | 2016-03-23 | 1 | -6/+4 |
* | | Merge pull request #23507 from owncloud/fix-23496-master | Thomas Müller | 2016-03-23 | 1 | -2/+4 |
|\ \ | |||||
| * | | fixes #23496 | Thomas Müller | 2016-03-23 | 1 | -2/+4 |
* | | | Merge pull request #23509 from owncloud/bump_polyfill | Thomas Müller | 2016-03-23 | 1 | -0/+0 |
|\ \ \ | |||||
| * | | | [3rdparty] Bump symfony/polyfill packages | Roeland Jago Douma | 2016-03-23 | 1 | -0/+0 |
|/ / / | |||||
* | | | Merge pull request #22506 from owncloud/node-get-from-cache | Thomas Müller | 2016-03-23 | 6 | -66/+131 |
|\ \ \ | |||||
| * | | | properly use fileinfo objects | Robin Appelman | 2016-03-21 | 2 | -34/+75 |
| * | | | set watch policy in test | Robin Appelman | 2016-03-21 | 2 | -9/+39 |
| * | | | improve reuse in getUserFolder | Robin Appelman | 2016-03-21 | 1 | -6/+6 |
| * | | | pass the fileinfo to the node if available | Robin Appelman | 2016-03-21 | 3 | -17/+10 |
| * | | | Query the cache when checking if a node exists | Robin Appelman | 2016-03-21 | 1 | -2/+3 |
* | | | | Merge pull request #23434 from owncloud/symfony-event-dispatcher | Thomas Müller | 2016-03-23 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | [3rdparty] Bump symfony/event-dispatcher | Roeland Jago Douma | 2016-03-23 | 1 | -0/+0 |
* | | | | | Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2 | Thomas Müller | 2016-03-23 | 3 | -14/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Fix display of vcard and calendar object details page in browser plugin | Thomas Müller | 2016-03-23 | 3 | -14/+29 |
* | | | | | | Merge pull request #23142 from owncloud/request_properties | Thomas Müller | 2016-03-23 | 1 | -1/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix warning in request.php | Roeland Jago Douma | 2016-03-23 | 1 | -1/+8 |
* | | | | | | | Merge pull request #22895 from owncloud/cleanup_default_share_provider | Thomas Müller | 2016-03-23 | 2 | -147/+16 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Remove dead function | Roeland Jago Douma | 2016-03-23 | 1 | -24/+0 |
| * | | | | | | Remove support for old shares in the default share provider | Roeland Jago Douma | 2016-03-23 | 2 | -123/+16 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #23362 from owncloud/fix-l10n-for-themes | Thomas Müller | 2016-03-23 | 6 | -19/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Inject server root - allows proper testing and separation of concerns | Morris Jobke | 2016-03-18 | 5 | -24/+30 |
| * | | | | | | Read available l10n files also from theme folder | Morris Jobke | 2016-03-17 | 3 | -7/+49 |
* | | | | | | | 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 |
| |/ / / / / / |