| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs | Thomas Müller | 2016-03-01 | 15 | -36/+458 |
| |\ | | | | | Add autodiscovery support to server-to-server sharing implementation | ||||
| | * | Fix Scrutinizer issues | Lukas Reschke | 2016-02-29 | 2 | -0/+3 |
| | | | |||||
| | * | Add autodiscovery support to server-to-server sharing | Lukas Reschke | 2016-02-26 | 15 | -36/+456 |
| | | | | | | | | | Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support. | ||||
| * | | Merge pull request #22728 from owncloud/external-share-testremote | Thomas Müller | 2016-03-01 | 4 | -28/+65 |
| |\ \ | | | | | | | use ocs discover endpoint to test remote | ||||
| | * | | Only use scanner if remote is an ownCloud | Lukas Reschke | 2016-03-01 | 1 | -1/+17 |
| | | | | |||||
| | * | | /shareinfo is not required | Lukas Reschke | 2016-03-01 | 2 | -0/+8 |
| | | | | |||||
| | * | | Fix tests | Lukas Reschke | 2016-03-01 | 1 | -20/+14 |
| | | | | |||||
| | * | | Add missing trailing slash | Lukas Reschke | 2016-03-01 | 2 | -3/+3 |
| | | | | |||||
| | * | | use ocs discover endpoint to test remote | Robin Appelman | 2016-03-01 | 2 | -8/+27 |
| | | | | |||||
| * | | | Merge pull request #17451 from owncloud/apps-disablebrokenappafterenable | Thomas Müller | 2016-03-01 | 2 | -28/+78 |
| |\ \ \ | | | | | | | | | Disable app that bricks the server after enabling | ||||
| | * | | | Disable app that bricks the server after enabling | Vincent Petry | 2016-02-29 | 2 | -28/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If an app is getting enabled in the web UI, an ajax call is now made to make sure the server still works. If it doesn't, it sends an emergency app disabling call to disable the breaking app. | ||||
| * | | | | Merge pull request #22700 from owncloud/only_1_linkshare | Thomas Müller | 2016-03-01 | 3 | -0/+41 |
| |\ \ \ \ | | | | | | | | | | | For now only allow 1 link share per file/folder | ||||
| | * | | | | Intergration tests | Roeland Jago Douma | 2016-03-01 | 2 | -0/+32 |
| | | | | | | |||||
| | * | | | | For now only allow 1 link share per file/folder | Roeland Jago Douma | 2016-03-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22692 This is a temp fix util we get #22327 We just block it in the OCS Share API since we have 1 endpoint now anyway. | ||||
| * | | | | | Merge pull request #22731 from owncloud/hide-nodes-from-listening | Thomas Müller | 2016-03-01 | 8 | -3/+499 |
| |\ \ \ \ \ | | | | | | | | | | | | | Hides nodes from listing that the user has no access to | ||||
| | * | | | | | Hides nodes from listing that the user has no access to | Lukas Reschke | 2016-02-29 | 8 | -3/+499 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset | Thomas Müller | 2016-03-01 | 9 | -22/+157 |
| |\ \ \ \ \ | | | | | | | | | | | | | Don't return quota when none set | ||||
| | * | | | | | Return -3 for unlimited quota | Vincent Petry | 2016-02-29 | 9 | -22/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns -3 for unlimited quota in Webdav response. Also adjusted personal page to show unlimited quota when set. | ||||
| * | | | | | | Merge pull request #22667 from owncloud/scrollbar | Thomas Müller | 2016-03-01 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | make scrollbar less obnoxious: tad narrower, rounded corners | ||||
| | * | | | | | | make scrollbar less obnoxious: tad narrower, rounded corners | Jan-Christoph Borchardt | 2016-02-26 | 1 | -1/+2 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge pull request #22677 from ↵ | Thomas Müller | 2016-03-01 | 3 | -8/+39 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/allow-to-overwrite-single-l10n-string-via-theme Allow to overwrite a single language string via the theme folder | ||||
| | * | | | | | | Improved JS L10N bundle merging + tests | Vincent Petry | 2016-02-29 | 2 | -3/+9 |
| | | | | | | | | |||||
| | * | | | | | | Allow to overwrite a single language string via the theme folder | Joas Schilling | 2016-02-26 | 2 | -8/+33 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #22691 from ↵ | Thomas Müller | 2016-03-01 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | owncloud/distributions-are-gone-insane-nobody-ever-should-install-the-owncloud-debian-package Add question from where ownCloud was installed | ||||
| | * | | | | | | Fix wording | Lukas Reschke | 2016-02-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add question from where ownCloud was enabled | Lukas Reschke | 2016-02-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With regard to the following patch in Debian I'd recommend that we add to the issue template that we ask where users got their ownCloud from. This is super dangerous stuff from Debian again. Can't call it otherwise. With 9.0 we can detect that since the question for the code integrity would return "Not enabled" instead of passed. But unluckily this is already 8.2. (while skipping one version *might* work it is completely untested and I smell already users reporting very hard to debug bugs to us => Waste of time) https://sources.debian.net/src/owncloud/8.2.2~dfsg-1/debian/patches/0009-Don-t-stop-update-over-several-major-versions.patch/ | ||||
| * | | | | | | | Merge pull request #22722 from owncloud/fix-personal-page | Thomas Müller | 2016-03-01 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix personal page layout for LDAP users, fix #22272 | ||||
| | * | | | | | | | fix personal page layout for LDAP users, fix #22272 | Jan-Christoph Borchardt | 2016-02-29 | 2 | -2/+4 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #22725 from owncloud/app-banners | Thomas Müller | 2016-03-01 | 3 | -163/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | compress app banners on personal page | ||||
| | * | | | | | | | compress app banners on personal page | Jan-Christoph Borchardt | 2016-02-29 | 3 | -163/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #22727 from owncloud/decrypt_all_master_key | Thomas Müller | 2016-03-01 | 3 | -27/+46 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | make decrypt all work with the master key | ||||
| | * | | | | | | | | make decrypt all work with the master key | Bjoern Schiessle | 2016-02-29 | 3 | -27/+46 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #22733 from owncloud/size-propagation-new-file | Thomas Müller | 2016-03-01 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix size propagation for new files | ||||
| | * | | | | | | | | fix size propagation for new files | Robin Appelman | 2016-02-29 | 1 | -1/+5 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #22736 from owncloud/propagation-ignore-encryption | Thomas Müller | 2016-03-01 | 2 | -0/+68 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | ignore encryption keys for propagation | ||||
| | * | | | | | | | | ignore encryption keys for propagation | Robin Appelman | 2016-02-29 | 2 | -0/+68 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #22740 from owncloud/fix_resare_updates | Thomas Müller | 2016-03-01 | 3 | -0/+41 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Check correct permissions when resharing | ||||
| | * | | | | | | | | Check correct permissions when resharing | Roeland Jago Douma | 2016-02-29 | 3 | -0/+41 |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22675 Since we only get a share id we do not know the path for the sharer. Now if we edit a share we start searching for shares for that user of that node. And deduce the permissions that way. * Intergration test added * Fix unit tests | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-01 | 24 | -6/+108 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #22707 from owncloud/use-our-public-api | Thomas Müller | 2016-03-01 | 15 | -69/+76 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* | ||||
| | * | | | | | | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* | Joas Schilling | 2016-02-29 | 15 | -69/+76 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #22623 from owncloud/docker-logs-on-swift-external | Thomas Müller | 2016-02-29 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Print docker logs to the console fro debugging | ||||
| | * | | | | | | | | Print docker logs to the console fro debugging | Thomas Müller | 2016-02-24 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #22701 from owncloud/input-tel | Thomas Müller | 2016-02-29 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | Style telephone inputs like other types | ||||
| | * | | | | | | | | style telephone inputs like other types | Hendrik Leppelsack | 2016-02-29 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #22663 from owncloud/sidebar-mobile | Thomas Müller | 2016-02-29 | 2 | -5/+1 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | do not expand sidebar to full width on mobile, but up the min-width | ||||
| | * | | | | | | | | do not expand sidebar to full width on mobile, but up the min-width, fix #19915 | Jan-Christoph Borchardt | 2016-02-25 | 2 | -5/+1 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #22662 from owncloud/comments-count | Thomas Müller | 2016-02-29 | 2 | -5/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove comments count because it is not that relevant to show directly | ||||
| | * | | | | | | | | remove comments count because it is not that relevant to show directly | Jan-Christoph Borchardt | 2016-02-25 | 2 | -5/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #22713 from owncloud/fix-since-version-on-commentsvevent | Thomas Müller | 2016-02-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix since version | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |