Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #265 from nextcloud/stable9-add-wnd | Morris Jobke | 2016-06-30 | 12 | -5/+679 |
|\ | | | | | [stable9] Backport WND | ||||
| * | [stable9] Backport WND | Lukas Reschke | 2016-06-30 | 12 | -5/+679 |
| | | | | | | | | | | | | | | | | Backports: - https://github.com/nextcloud/server/pull/233 - https://github.com/nextcloud/server/pull/190 - https://github.com/nextcloud/server/pull/188 | ||||
* | | Name method properly | Lukas Reschke | 2016-06-30 | 1 | -1/+1 |
| | | |||||
* | | add some additonal permission checks to the webdav backend | Bjoern Schiessle | 2016-06-30 | 2 | -5/+48 |
|/ | |||||
* | Revert "[stable9] Don't show the updater if updater is incompatible" | Lukas Reschke | 2016-06-26 | 3 | -108/+13 |
| | | | | This reverts commit 5e2bf16db1d5b2726713d04b019ade8557104fbd. | ||||
* | Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync | Lukas Reschke | 2016-06-26 | 18 | -50/+169 |
|\ | |||||
| * | On mount make sure multiple shares with same target map to unique ones (#23937) | Roeland Douma | 2016-06-23 | 2 | -15/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Scenario: user0 shares a folder 'foo' with user2 user1 shares a folder 'foo' with user2 user2 logs in Before: show only the 'foo' from user1 After: show both. * Added intergration tests | ||||
| * | Rollback version must also adjust cached size | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| | | |||||
| * | Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9 | Vincent Petry | 2016-06-21 | 1 | -1/+8 |
| |\ | | | | | | | [stable9] Fix null pointer exception in user_ldap | ||||
| | * | Fix null pointer exception in user_ldap | Jörn Friedrich Dreyer | 2016-06-21 | 1 | -1/+8 |
| | | | |||||
| * | | Merge pull request #25199 from owncloud/shared-mount-catch-9 | Vincent Petry | 2016-06-21 | 2 | -11/+25 |
| |\ \ | | | | | | | | | [9.0] Catch exceptions while creating shared mounts | ||||
| | * | | Catch exceptions while creating shared mounts | Robin Appelman | 2016-06-21 | 2 | -11/+25 |
| | |/ | |||||
| * / | dd support to know where the storage test comes from (#25166) | Juan Pablo Villafañez | 2016-06-21 | 8 | -18/+33 |
| |/ | |||||
| * | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-20 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
| * | Make getShareFolder use given view instead of static FS (#25150) | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
| | | |||||
| * | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-16 | 1 | -0/+5 |
| | | |||||
| * | Merge pull request #25052 from owncloud/stable9-webdav-download-mimetype | Vincent Petry | 2016-06-15 | 5 | -9/+51 |
| |\ | | | | | | | [stable9] DAV now returns file name with Content-Disposition header | ||||
| | * | DAV now returns file name with Content-Disposition header | Vincent Petry | 2016-06-13 | 5 | -9/+51 |
| | | | |||||
* | | | don't try to log the currently logged in user, this fails on cronjobs. The ↵ | Bjoern Schiessle | 2016-06-22 | 2 | -31/+5 |
| | | | | | | | | | | | | users are logged anyway | ||||
* | | | Some more branding | Lukas Reschke | 2016-06-20 | 1 | -1/+1 |
| | | | |||||
* | | | fixed code | Morris Jobke | 2016-06-20 | 9 | -13/+13 |
| | | | |||||
* | | | fixed translations | Morris Jobke | 2016-06-20 | 94 | -94/+94 |
| | | | |||||
* | | | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-20 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
* | | | Make getShareFolder use given view instead of static FS (#25150) | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
| | | | |||||
* | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-20 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #170 from nextcloud/fix-references-stable9 | Morris Jobke | 2016-06-20 | 128 | -444/+444 |
|\ \ \ | | | | | | | | | [stable9] Fix some ownCloud/Nextcloud references | ||||
| * | | | fix references in encryption app | Bjoern Schiessle | 2016-06-20 | 73 | -217/+217 |
| | | | | |||||
| * | | | fix references in the federation app | Bjoern Schiessle | 2016-06-20 | 53 | -225/+225 |
| | | | | |||||
| * | | | fix references in the federated files sharing provider | Bjoern Schiessle | 2016-06-20 | 2 | -2/+2 |
| | | | | |||||
* | | | | no need to mention ownCloud explicitely | Bjoern Schiessle | 2016-06-20 | 2 | -4/+4 |
|/ / / | |||||
* | | | fix padding of 3-dot button on mobile | Jan-Christoph Borchardt | 2016-06-15 | 1 | -7/+7 |
| | | | |||||
* | | | Merge pull request #75 from nextcloud/brand-to-nextcloud | Lukas Reschke | 2016-06-14 | 2 | -9/+3 |
|\ \ \ | | | | | | | | | Brand to nextcloud | ||||
| * | | | Do not link to ownCloud Federation page | Lukas Reschke | 2016-06-13 | 2 | -9/+3 |
| | | | | |||||
* | | | | Add some super basic cache busting | Lukas Reschke | 2016-06-14 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | At least the logo should be correct after an update..... | ||||
* | | | | Merge pull request #80 from ↵ | Lukas Reschke | 2016-06-14 | 3 | -13/+108 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/dont-show-updater-if-updater-is-incompatible [stable9] Don't show the updater if updater is incompatible | ||||
| * | | | | [stable9] Don't show the updater if updater is incompatible | Lukas Reschke | 2016-06-13 | 3 | -13/+108 |
| |/ / / | | | | | | | | | | | | | Prevents us from breaking instances. | ||||
* | | | | Merge branch 'stable9' of https://github.com/owncloud/core into ↵ | Arthur Schiwon | 2016-06-13 | 2 | -5/+28 |
|\ \ \ \ | |/ / / |/| / / | |/ / | downstream-160613 | ||||
| * / | Show the path relative to the requesting user (#25067) | Roeland Douma | 2016-06-13 | 2 | -5/+28 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | A share can only be requested by 3 'types' of people * owner * initiator * recipient So we have to get the path as the current user. Since that is the only path that has any meaning to the user. - Fixed tests | ||||
* | | Show spinner for files_drop again | Lukas Reschke | 2016-06-13 | 1 | -0/+1 |
| | | | | | | | | Somehow the spinner wasn't there anymore after some changes. This makes it appear again. | ||||
* | | smaller files drop fixes | Arthur Schiwon | 2016-06-13 | 2 | -3/+38 |
| | | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation | ||||
* | | [stable9] Backport files drop feature | Lukas Reschke | 2016-06-11 | 10 | -36/+306 |
| | | |||||
* | | Merge pull request #51 from nextcloud/fix-some-more-branding-texts | Lukas Reschke | 2016-06-11 | 3 | -7/+7 |
|\ \ | | | | | | | Adjust some more branding texts | ||||
| * | | Adjust some more branding texts | Lukas Reschke | 2016-06-11 | 3 | -7/+7 |
| | | | | | | | | | | | | Replaces ownCloud with Nextcloud in the user-facing messages | ||||
* | | | Merge pull request #37 from nextcloud/downstream-stable9-160610 | Lukas Reschke | 2016-06-11 | 3 | -13/+70 |
|\ \ \ | | |/ | |/| | Downstream stable9 16-06-10 | ||||
| * | | Merge pull request #24950 from owncloud/stable9-fixdynamicldapgroupaccess | Vincent Petry | 2016-06-10 | 2 | -9/+64 |
| |\ \ | | | | | | | | | [stable9] Fixed dynamic group ldap access | ||||
| | * | | Add unit test for LDAP multi group caching | Vincent Petry | 2016-06-09 | 1 | -0/+53 |
| | | | | |||||
| | * | | Use array_merge when reading cached groups members | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | formatting, white-space changes only | Arthur Schiwon | 2016-06-01 | 1 | -7/+7 |
| | | | | |||||
| | * | | fixed possible indention problem | alexweirig | 2016-06-01 | 1 | -13/+13 |
| | | | | | | | | | | | | spaces -> tab conversion | ||||
| | * | | Fixing group handling | alexweirig | 2016-06-01 | 1 | -6/+15 |
| | | | | | | | | | | | | added back the cache processing and fixed |