summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-syncLukas Reschke2016-06-2622-55/+189
|\
| * Merge pull request #25256 from owncloud/stable9-setupchecks-preventreloadChristoph Wurst2016-06-241-2/+4
| |\
| | * Don't reload page in case of auth errors during setup checksVincent Petry2016-06-241-2/+4
| |/
| * Merge pull request #25248 from owncloud/stable9-unique_targetsVincent Petry2016-06-233-15/+62
| |\
| | * On mount make sure multiple shares with same target map to unique ones (#23937)Roeland Douma2016-06-233-15/+62
| |/
| * Merge pull request #25228 from owncloud/stable9-enc-revertversionsizeVincent Petry2016-06-221-1/+8
| |\
| | * 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
| |\
| | * 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
| |\ \
| | * | 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
| |/
| * Merge pull request #25165 from owncloud/stable9-capped-user-cacheVincent Petry2016-06-201-2/+4
| |\
| | * Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| * | Merge pull request #25187 from owncloud/share-app-initorder-stable9Vincent Petry2016-06-201-2/+3
| |\ \
| | * | Delay files_sharing's registerMountProvidersVincent Petry2016-06-201-2/+3
| |/ /
| * | Make getShareFolder use given view instead of static FS (#25150)Vincent Petry2016-06-202-5/+9
| * | Merge pull request #25160 from owncloud/fix-oracle-endless-loop-stable9Vincent Petry2016-06-171-0/+5
| |\ \ | | |/ | |/|
| | * Do not recurse link share fetchingRoeland Jago Douma2016-06-171-0/+5
| * | Revert "[stable9] Remove shares of the root folder" (#25157)Vincent Petry2016-06-173-341/+0
| |/
| * Remove shares of the root folder (#25138)Vincent Petry2016-06-173-0/+341
| * ownCloud 9.0.3 RC1v9.0.3RC1Daniel Molkentin2016-06-161-2/+2
| * Merge pull request #25149 from owncloud/backport25146Vincent Petry2016-06-161-1/+1
| |\
| | * –emit correct signal when disabling an appJörn Friedrich Dreyer2016-06-161-1/+1
| * | Merge pull request #25137 from owncloud/stable9-backport-25126Vincent Petry2016-06-161-0/+2
| |\ \
| | * | load authentication apps firstChristoph Wurst2016-06-161-0/+2
| * | | Merge pull request #25148 from owncloud/stable9-dropbox-catchratelimitVincent Petry2016-06-161-0/+5
| |\ \ \
| | * | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-161-0/+5
| |/ / /
| * | | Merge pull request #25143 from owncloud/stable9-fix-grouped-inputsVincent Petry2016-06-161-13/+13
| |\ \ \ | | |/ / | |/| |
| | * | fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-161-13/+13
| |/ /
| * | Merge pull request #25118 from owncloud/stable9-fs-usermountcache-cappedVincent Petry2016-06-161-3/+14
| |\ \
| | * | 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
| |\ \ \ | | |/ / | |/| |
| | * | 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
| |\ \ \
| | * | | 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
| |\ \ \ \
| | * | | | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-141-1/+1
| | |/ / /
| * | | | Merge pull request #25106 from owncloud/stable9-allow-empty-host-when-install...Vincent Petry2016-06-151-1/+6
| |\ \ \ \
| | * | | | 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
| |/ / /
* | | | Merge pull request #216 from nextcloud/stable9-replace-occurence-of-owncloud-...Marius Blüm2016-06-241-1/+1
|\ \ \ \
| * | | | Replace occurence of "ownCloud" by "Nextcloud"Marius Blüm2016-06-241-1/+1
|/ / / /
* | | | Merge pull request #203 from nextcloud/fix_audit_log-stable9Lukas Reschke2016-06-222-31/+5
|\ \ \ \
| * | | | don't try to log the currently logged in user, this fails on cronjobs. The us...Bjoern Schiessle2016-06-222-31/+5
|/ / / /
* | | | Merge pull request #200 from nextcloud/stable9-backport-197Morris Jobke2016-06-221-11/+11
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | default.php for nextcloudJoachim Sokolowski2016-06-221-6/+6
|/ / / /
* | | | Merge pull request #192 from nextcloud/drop-authtokenMarius Blüm2016-06-211-0/+1
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 18:09:31 +0000