| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [stable9] Fix decrypt message stable9 (#25188) | Thomas Müller | 2016-07-01 | 3 | -24/+51 |
| | | | | | | | | | | | | | | | | | | * Fix Decrypt message via occ * Comments fixed * Fixed reviews * Originally: commit 2304e4bda027e61ff1302c55c2f70f8e4c8f47d0 Author: Joas Schilling <nickvergessen@owncloud.com> Date: Tue Jun 7 09:13:11 2016 +0200 Allow to decrypt user '0' files only * Fix uid comparison | ||||
| * | Suppress warnings from DAV migration if there's nothing to do (#25279) | Thomas Müller | 2016-07-01 | 4 | -2/+34 |
| | | |||||
| * | Merge pull request #25264 from ↵ | Vincent Petry | 2016-07-01 | 1 | -2/+9 |
| |\ | | | | | | | | | owncloud/stable9-search-fixsearchfromotherfilelists [stable9] Fix search result link for file results outside default list | ||||
| | * | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -0/+7 |
| | | | | | | | | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear. | ||||
| | * | Fix search result link for file results outside default list | Vincent Petry | 2016-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list. | ||||
| * | | Merge pull request #25234 from owncloud/stable9-iedavclient-nullheaders | Vincent Petry | 2016-07-01 | 1 | -0/+1 |
| |\ \ | | | | | | | [stable9] Init the headers in iedavclient.js | ||||
| | * | | Init the headers in iedavclient.js | Vincent Petry | 2016-06-22 | 1 | -0/+1 |
| | | | | |||||
| * | | | ownCloud 9.0.3v9.0.3 | Daniel Molkentin | 2016-06-29 | 1 | -2/+2 |
| | |/ |/| | |||||
| * | | 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 |
| |/ / | |||||
| * | | Merge pull request #25118 from owncloud/stable9-fs-usermountcache-capped | Vincent Petry | 2016-06-16 | 1 | -3/+14 |
| |\ \ | | | | | | | [stable9] Capped cache for cache info in UserMountCache | ||||
| | * | | Capped cache for cache info in UserMountCache | Vincent Petry | 2016-06-15 | 1 | -3/+14 |
| | | | | |||||
| * | | | Merge pull request #25052 from owncloud/stable9-webdav-download-mimetype | Vincent Petry | 2016-06-15 | 6 | -11/+53 |
| |\ \ \ | |/ / |/| | | [stable9] DAV now returns file name with Content-Disposition header | ||||
| | * | | DAV now returns file name with Content-Disposition header | Vincent Petry | 2016-06-13 | 6 | -11/+53 |
| | | | | |||||
| * | | | Merge pull request #25084 from owncloud/stable9-enc-cappedcache-getaccesslist | Vincent Petry | 2016-06-15 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | [stable9] Use capped cache for encryption's user access list | ||||
| | * | | | Use capped cache for encryption's user access list | Vincent Petry | 2016-06-13 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge pull request #25105 from owncloud/stable9-initial-userloading-workaround | Vincent Petry | 2016-06-15 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [stable9] decrease initial users to load to 50 | ||||
| | * | | | | decrease initial users to load to 50 | Jörn Friedrich Dreyer | 2016-06-14 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994 Workaround for https://github.com/owncloud/core/issues/24734 | ||||
| * | | | | Merge pull request #25106 from ↵ | Vincent Petry | 2016-06-15 | 1 | -1/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/stable9-allow-empty-host-when-installing-on-oracle-via-cli [stable9] Allow empty host when installing on oracle via CLI (#25034) | ||||
| | * | | | | Allow empty host when installing on oracle via CLI (#25034) | Jörn Friedrich Dreyer | 2016-06-14 | 1 | -1/+6 |
| |/ / / / | |||||
| * / / / | Use an explicit version of sabre/dav to allow caching on the jenkins slaves ↵ | Thomas Müller | 2016-06-14 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | - fixes #25087 (#25089) | ||||
| * | | | 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 | ||||
| * | | | Repair job to fix permissions for avatars (#25068) | Roeland Douma | 2016-06-13 | 3 | -0/+299 |
| |/ / | | | | | | | | | | | | | | | | | | | Backport of #24898 Cherry-picked: 1b66db72d916a763b1c22613b9df5c42e93593a8 60225284f3b8ef947f67bbe168b12dca867d6f3d 28d9ad2817b744bcef35a9259f65eb56b0b2ae78 But manually since we renamed stuff and the repair procedures changed | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |