summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #265 from nextcloud/stable9-add-wndMorris Jobke2016-06-3012-5/+679
|\ | | | | [stable9] Backport WND
| * [stable9] Backport WNDLukas Reschke2016-06-3012-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 properlyLukas Reschke2016-06-301-1/+1
| |
* | add some additonal permission checks to the webdav backendBjoern Schiessle2016-06-302-5/+48
|/
* Revert "[stable9] Don't show the updater if updater is incompatible"Lukas Reschke2016-06-263-108/+13
| | | | This reverts commit 5e2bf16db1d5b2726713d04b019ade8557104fbd.
* Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-syncLukas Reschke2016-06-2618-50/+169
|\
| * On mount make sure multiple shares with same target map to unique ones (#23937)Roeland Douma2016-06-232-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 sizeVincent Petry2016-06-221-1/+8
| |
| * Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9Vincent Petry2016-06-211-1/+8
| |\ | | | | | | [stable9] Fix null pointer exception in user_ldap
| | * Fix null pointer exception in user_ldapJörn Friedrich Dreyer2016-06-211-1/+8
| | |
| * | Merge pull request #25199 from owncloud/shared-mount-catch-9Vincent Petry2016-06-212-11/+25
| |\ \ | | | | | | | | [9.0] Catch exceptions while creating shared mounts
| | * | Catch exceptions while creating shared mountsRobin Appelman2016-06-212-11/+25
| | |/
| * / dd support to know where the storage test comes from (#25166)Juan Pablo Villafañez2016-06-218-18/+33
| |/
| * Delay files_sharing's registerMountProvidersVincent Petry2016-06-201-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 Petry2016-06-202-5/+9
| |
| * Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-161-0/+5
| |
| * Merge pull request #25052 from owncloud/stable9-webdav-download-mimetypeVincent Petry2016-06-155-9/+51
| |\ | | | | | | [stable9] DAV now returns file name with Content-Disposition header
| | * DAV now returns file name with Content-Disposition headerVincent Petry2016-06-135-9/+51
| | |
* | | don't try to log the currently logged in user, this fails on cronjobs. The ↵Bjoern Schiessle2016-06-222-31/+5
| | | | | | | | | | | | users are logged anyway
* | | Some more brandingLukas Reschke2016-06-201-1/+1
| | |
* | | fixed codeMorris Jobke2016-06-209-13/+13
| | |
* | | fixed translationsMorris Jobke2016-06-2094-94/+94
| | |
* | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-201-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 Petry2016-06-202-5/+9
| | |
* | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-201-0/+5
| | |
* | | Merge pull request #170 from nextcloud/fix-references-stable9Morris Jobke2016-06-20128-444/+444
|\ \ \ | | | | | | | | [stable9] Fix some ownCloud/Nextcloud references
| * | | fix references in encryption appBjoern Schiessle2016-06-2073-217/+217
| | | |
| * | | fix references in the federation appBjoern Schiessle2016-06-2053-225/+225
| | | |
| * | | fix references in the federated files sharing providerBjoern Schiessle2016-06-202-2/+2
| | | |
* | | | no need to mention ownCloud explicitelyBjoern Schiessle2016-06-202-4/+4
|/ / /
* | | fix padding of 3-dot button on mobileJan-Christoph Borchardt2016-06-151-7/+7
| | |
* | | Merge pull request #75 from nextcloud/brand-to-nextcloudLukas Reschke2016-06-142-9/+3
|\ \ \ | | | | | | | | Brand to nextcloud
| * | | Do not link to ownCloud Federation pageLukas Reschke2016-06-132-9/+3
| | | |
* | | | Add some super basic cache bustingLukas Reschke2016-06-141-6/+6
| | | | | | | | | | | | | | | | At least the logo should be correct after an update.....
* | | | Merge pull request #80 from ↵Lukas Reschke2016-06-143-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 incompatibleLukas Reschke2016-06-133-13/+108
| |/ / / | | | | | | | | | | | | Prevents us from breaking instances.
* | | | Merge branch 'stable9' of https://github.com/owncloud/core into ↵Arthur Schiwon2016-06-132-5/+28
|\ \ \ \ | |/ / / |/| / / | |/ / downstream-160613
| * / Show the path relative to the requesting user (#25067)Roeland Douma2016-06-132-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 againLukas Reschke2016-06-131-0/+1
| | | | | | | | Somehow the spinner wasn't there anymore after some changes. This makes it appear again.
* | smaller files drop fixesArthur Schiwon2016-06-132-3/+38
| | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation
* | [stable9] Backport files drop featureLukas Reschke2016-06-1110-36/+306
| |
* | Merge pull request #51 from nextcloud/fix-some-more-branding-textsLukas Reschke2016-06-113-7/+7
|\ \ | | | | | | Adjust some more branding texts
| * | Adjust some more branding textsLukas Reschke2016-06-113-7/+7
| | | | | | | | | | | | Replaces ownCloud with Nextcloud in the user-facing messages
* | | Merge pull request #37 from nextcloud/downstream-stable9-160610Lukas Reschke2016-06-113-13/+70
|\ \ \ | | |/ | |/| Downstream stable9 16-06-10
| * | Merge pull request #24950 from owncloud/stable9-fixdynamicldapgroupaccessVincent Petry2016-06-102-9/+64
| |\ \ | | | | | | | | [stable9] Fixed dynamic group ldap access
| | * | Add unit test for LDAP multi group cachingVincent Petry2016-06-091-0/+53
| | | |
| | * | Use array_merge when reading cached groups membersVincent Petry2016-06-081-1/+1
| | | |
| | * | formatting, white-space changes onlyArthur Schiwon2016-06-011-7/+7
| | | |
| | * | fixed possible indention problemalexweirig2016-06-011-13/+13
| | | | | | | | | | | | spaces -> tab conversion
| | * | Fixing group handlingalexweirig2016-06-011-6/+15
| | | | | | | | | | | | added back the cache processing and fixed