| 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 | |||||
| * | | | | | | Merge pull request #251 from nextcloud/make-it-user-saml | Marius Blüm | 2016-06-30 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Mark user_saml official and kill user_shibboleth | |||||
| | * | | | | | | Mark user_saml official and kill user_shibboleth | Lukas Reschke | 2016-06-30 | 1 | -2/+2 | |
| | | |_|/ / / | |/| | | | | ||||||
| * | | | | | | Merge pull request #263 from nextcloud/dav-permission-check-stable9 | Morris Jobke | 2016-06-30 | 4 | -6/+97 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | add some additonal permission checks to the webdav backend | |||||
| | * | | | | | 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 | 4 | -6/+97 | |
| | | |/ / / | |/| | | | ||||||
| * | | | | | Merge pull request #240 from nextcloud/password_policy_events_stable9 | Lukas Reschke | 2016-06-30 | 8 | -63/+138 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | [stable9] add events to check passwords with the password policy app | |||||
| | * | | | | add events to check passwords with the password policy app | Bjoern Schiessle | 2016-06-28 | 8 | -63/+138 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #259 from nextcloud/stable9-set-disposition | Lukas Reschke | 2016-06-30 | 2 | -2/+7 | |
| |\ \ \ \ | |/ / / |/| | | | [stable9] Set content-type to "application/octet-stream" | |||||
| | * | | | [stable9] Set content-type to "application/octet-stream" | Lukas Reschke | 2016-06-30 | 2 | -2/+7 | |
| |/ / / | | | | | | | | | | | | | | | | Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly. Backport of https://github.com/nextcloud/server/pull/258 | |||||
| * | | | Merge pull request #227 from nextcloud/stable9-channel-should-be-inside-config | Lukas Reschke | 2016-06-27 | 5 | -3/+62 | |
| |\ \ \ | | | | | | | | | [stable9] Move OC_Channel to system config | |||||
| | * | | | Move OC_Channel to system config | Lukas Reschke | 2016-06-27 | 5 | -3/+62 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | The Nextcloud and ownCloud updaters allow someone to configure a custom release channel, this can then be used to publish different versions. (e.g. one channel stays on 9.x while another one already gets 10.x) There is however one big problem with it: The value is effectively stored in the app config, which is stored in the database. So to be able to read the update channel a connection to the database is necessary. This is quite error prone and also causes some of the issues in the original ownCloud updater. This moves the channel registration to the config.php and also includes a repair step. | |||||
| * | | | Merge pull request #228 from nextcloud/show-updater-all-the-time | Marius Blüm | 2016-06-27 | 3 | -108/+13 | |
| |\ \ \ | | | | | | | | | Revert "[stable9] Don't show the updater if updater is incompatible" | |||||
| | * | | | Revert "[stable9] Don't show the updater if updater is incompatible" | Lukas Reschke | 2016-06-26 | 3 | -108/+13 | |
| | | | | | | | | | | | | | | | | | This reverts commit 5e2bf16db1d5b2726713d04b019ade8557104fbd. | |||||
| * | | | | Merge pull request #210 from Zollak/stable9-config-sample | Morris Jobke | 2016-06-26 | 1 | -133/+100 | |
| |\ \ \ \ | |/ / / |/| | | | [stable9] changed ownCloud to Nextcloud, updated config options | |||||
| | * | | | removed more options that are not in stable9 | Patric Lenhart | 2016-06-26 | 1 | -53/+0 | |
| | | | | | ||||||
| | * | | | removed parameter that is not relevant for stable9 | Patric Lenhart | 2016-06-26 | 1 | -13/+0 | |
| | | | | | ||||||
| | * | | | changed ownCloud to Nextcloud, updated config options | Patric Lenhart | 2016-06-23 | 1 | -133/+166 | |
| | | | | | ||||||
| * | | | | Merge pull request #225 from nextcloud/stable9-upstream-sync | Lukas Reschke | 2016-06-26 | 22 | -55/+189 | |
| |\ \ \ \ | | | | | | | | | | | [Stable9] upstream sync | |||||
| | * | | | | Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync | Lukas Reschke | 2016-06-26 | 22 | -55/+189 | |
| |/| | | | | | |/ / | |/| | | ||||||
| | * | | | Merge pull request #25256 from owncloud/stable9-setupchecks-preventreload | Christoph Wurst | 2016-06-24 | 1 | -2/+4 | |
| | |\ \ \ | | | | | | | | | | | [stable9] Don't reload page in case of auth errors during setup checks | |||||
| | | * | | | Don't reload page in case of auth errors during setup checks | Vincent Petry | 2016-06-24 | 1 | -2/+4 | |
| | |/ / / | | | | | | | | | | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page. | |||||
| | * | | | Merge pull request #25248 from owncloud/stable9-unique_targets | Vincent Petry | 2016-06-23 | 3 | -15/+62 | |
| | |\ \ \ | | | | | | | | | | | [stable9] On mount make sure multiple shares with same target map to unique one… | |||||
| | | * | | | On mount make sure multiple shares with same target map to unique ones (#23937) | Roeland Douma | 2016-06-23 | 3 | -15/+62 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | Merge pull request #25228 from owncloud/stable9-enc-revertversionsize | Vincent Petry | 2016-06-22 | 1 | -1/+8 | |
| | |\ \ \ | | |_|/ | |/| | | [stable9] Rollback version must also adjust cached size | |||||
| | | * | | 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 | |
| | |/ / | ||||||
| | * | | Merge pull request #25165 from owncloud/stable9-capped-user-cache | Vincent Petry | 2016-06-20 | 1 | -2/+4 | |
| | |\ \ | | | | | | | | | [stable9] Capped cache for user config | |||||
| | | * | | Capped cache for user config | Jörn Friedrich Dreyer | 2016-06-17 | 1 | -2/+4 | |
| | | | | | ||||||
| | * | | | Merge pull request #25187 from owncloud/share-app-initorder-stable9 | Vincent Petry | 2016-06-20 | 1 | -2/+3 | |
| | |\ \ \ | | | | | | | | | | | [stable9] Delay files_sharing's registerMountProviders | |||||
| | | * | | | 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 | |
| | | | | | ||||||
| | * | | | Merge pull request #25160 from owncloud/fix-oracle-endless-loop-stable9 | Vincent Petry | 2016-06-17 | 1 | -0/+5 | |
| | |\ \ \ | | |/ / | |/| | | Do not recurse link share fetching | |||||
| | | * | | Do not recurse link share fetching | Roeland Jago Douma | 2016-06-17 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | * Might fix an issue on oracle | |||||
| | * | | | Revert "[stable9] Remove shares of the root folder" (#25157) | Vincent Petry | 2016-06-17 | 3 | -341/+0 | |
| | |/ / | ||||||
| | * | | Remove shares of the root folder (#25138) | Vincent Petry | 2016-06-17 | 3 | -0/+341 | |
| | | | | ||||||
| | * | | ownCloud 9.0.3 RC1v9.0.3RC1 | Daniel Molkentin | 2016-06-16 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Merge pull request #25149 from owncloud/backport25146 | Vincent Petry | 2016-06-16 | 1 | -1/+1 | |
| | |\ \ | | | | | | | | | emit correct signal when disabling an app | |||||
| | | * | | emit correct signal when disabling an app | Jörn Friedrich Dreyer | 2016-06-16 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge pull request #25137 from owncloud/stable9-backport-25126 | Vincent Petry | 2016-06-16 | 1 | -0/+2 | |
| | |\ \ \ | | | | | | | | | | | [stable9] load authentication apps first | |||||
| | | * | | | load authentication apps first | Christoph Wurst | 2016-06-16 | 1 | -0/+2 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #25148 from owncloud/stable9-dropbox-catchratelimit | Vincent Petry | 2016-06-16 | 1 | -0/+5 | |
| | |\ \ \ \ | | | | | | | | | | | | | [stable9] Convert Dropbox Forbidden exception to StorageNotAvailableException | |||||
| | | * | | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-16 | 1 | -0/+5 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #25143 from owncloud/stable9-fix-grouped-inputs | Vincent Petry | 2016-06-16 | 1 | -13/+13 | |
| | |\ \ \ \ | | |/ / / | |/| | | | [9.0] fix grouped input fields, make sure they take precedence | |||||
| | | * | | | fix grouped input fields, make sure they take precedence | Jan-Christoph Borchardt | 2016-06-16 | 1 | -13/+13 | |
| | |/ / / | ||||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |