summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge pull request #25118 from owncloud/stable9-fs-usermountcache-cappedVincent Petry2016-06-161-3/+14
| |\ \ \ | | | | | | | | | | [stable9] Capped cache for cache info in UserMountCache
| | * | | Capped cache for cache info in UserMountCacheVincent Petry2016-06-151-3/+14
| | | | |
| * | | | Merge pull request #25052 from owncloud/stable9-webdav-download-mimetypeVincent Petry2016-06-156-11/+53
| |\ \ \ \ | | |/ / / | |/| | | [stable9] DAV now returns file name with Content-Disposition header
| | * | | DAV now returns file name with Content-Disposition headerVincent Petry2016-06-136-11/+53
| | | | |
| * | | | Merge pull request #25084 from owncloud/stable9-enc-cappedcache-getaccesslistVincent Petry2016-06-151-0/+3
| |\ \ \ \ | | | | | | | | | | | | [stable9] Use capped cache for encryption's user access list
| | * | | | Use capped cache for encryption's user access listVincent Petry2016-06-131-0/+3
| | | | | |
| * | | | | Merge pull request #25105 from owncloud/stable9-initial-userloading-workaroundVincent Petry2016-06-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | [stable9] decrease initial users to load to 50
| | * | | | | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-141-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 Petry2016-06-151-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 Dreyer2016-06-141-1/+6
| |/ / / / /
| * / / / / Use an explicit version of sabre/dav to allow caching on the jenkins slaves ↵Thomas Müller2016-06-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | - fixes #25087 (#25089)
* | | | | Merge pull request #216 from ↵Marius Blüm2016-06-241-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | nextcloud/stable9-replace-occurence-of-owncloud-by-nextcloud [stable9] Replace occurence of "ownCloud" by "Nextcloud"
| * | | | Replace occurence of "ownCloud" by "Nextcloud"Marius Blüm2016-06-241-1/+1
|/ / / / | | | | | | | | * backport of #214
* | | | Merge pull request #203 from nextcloud/fix_audit_log-stable9Lukas Reschke2016-06-222-31/+5
|\ \ \ \ | | | | | | | | | | [stable9] don't try to log the currently logged in user, this fails on cronjobs
| * | | | 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
* | | | Merge pull request #200 from nextcloud/stable9-backport-197Morris Jobke2016-06-221-11/+11
|\ \ \ \ | | | | | | | | | | [stable9] some text-changes to nextcloud
| * | | | some text-changes to nextcloudJoachim Sokolowski2016-06-221-11/+11
| | | | |
* | | | | Merge pull request #199 from nextcloud/stable9-backport-194Björn Schießle2016-06-221-6/+6
|\ \ \ \ \ | |/ / / / |/| | | | [stable9] default.php for nextcloud
| * | | | default.php for nextcloudJoachim Sokolowski2016-06-221-6/+6
|/ / / / | | | | | | | | changing it to nextcloud
* | | | Merge pull request #192 from nextcloud/drop-authtokenMarius Blüm2016-06-211-0/+1
|\ \ \ \ | | | | | | | | | | Drop old authtoken table (pre 5.0.0)
| * | | | Drop old authtoken table (pre 5.0.0)Morris Jobke2016-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | * fixes #155
* | | | | Merge pull request #193 from nextcloud/stable9-backport-191Marius Blüm2016-06-212-1/+15
|\ \ \ \ \ | |/ / / / |/| | | | [stable9] Add postgres to CI
| * | | | Add postgres to CIMorris Jobke2016-06-212-1/+15
|/ / / /
* | | | Merge pull request #178 from nextcloud/fix-itv9.0.51Lukas Reschke2016-06-20382-994/+994
|\ \ \ \ | | | | | | | | | | [stable9] Branding
| * | | | Adjust integration testLukas Reschke2016-06-201-10/+10
| | | | |
| * | | | Some more brandingLukas Reschke2016-06-20172-736/+736
| | | | |
| * | | | fixed codeMorris Jobke2016-06-2026-42/+42
| | | | |
| * | | | fixed translationsMorris Jobke2016-06-20184-206/+206
| | | | |
* | | | | Merge pull request #177 from nextcloud/v9.0.51Lukas Reschke2016-06-201-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | v9.0.51
| * | | | v9.0.51Lukas Reschke2016-06-201-2/+2
|/ / / /
* | | | Merge pull request #174 from nextcloud/stable9-upstream-syncMorris Jobke2016-06-2013-28/+66
|\ \ \ \ | | | | | | | | | | [stable9] Upstream Sync
| * | | | 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
| | | | |
| * | | | Capped cache for user configJörn Friedrich Dreyer2016-06-201-2/+4
| | | | |
| * | | | Do not recurse link share fetchingRoeland Jago Douma2016-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | * Might fix an issue on oracle
| * | | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-201-0/+5
| | | | |
| * | | | fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-201-13/+13
| | | | |
| * | | | load authentication apps firstChristoph Wurst2016-06-201-0/+2
| | | | |
| * | | | Capped cache for cache info in UserMountCacheVincent Petry2016-06-201-3/+14
| | | | |
| * | | | Allow empty host when installing on oracle via CLI (#25034)Jörn Friedrich Dreyer2016-06-201-1/+6
| | | | |
| * | | | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-201-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
| * | | | Use an explicit version of sabre/dav to allow caching on the jenkins slaves ↵Thomas Müller2016-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | - fixes #25087 (#25089)
| * | | | Use capped cache for encryption's user access listVincent Petry2016-06-201-0/+3
|/ / / /
* | | | 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
| | | | |
* | | | | Merge pull request #172 from nextcloud/fix-references-trash-and-versions-stable9Björn Schießle2016-06-202-4/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable9] no need to mention ownCloud explicitely in the versions and trash bin app
| * | | | | no need to mention ownCloud explicitelyBjoern Schiessle2016-06-202-4/+4
|/ / / / /
* | | | | Merge pull request #110 from ↵Lukas Reschke2016-06-203-21/+61
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/stable9-soften-policy-if-no-cookie-is-sent Soften the cookie check if no cookies are sent