summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Repair mime types only when upgrading from OC 8.0Vincent Petry2015-09-232-24/+44
|
* Move mimetype files into /resources/config/Lukas Reschke2015-09-222-14/+25
|
* Move certificate bundle into resources/config/Lukas Reschke2015-09-223-9/+2
|
* Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ | | | | Revert "Show cached previews directly"
| * Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
| | | | | | | | This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6.
* | Move dummy backend to Tests namespaceLukas Reschke2015-09-222-169/+4
|/
* Merge pull request #19231 from phil-davis/r1Thomas Müller2015-09-212-4/+4
|\ | | | | Minor text typos
| * Minor text typosPhil Davis2015-09-212-4/+4
| | | | | | | | that I noticed while looking at some code.
* | Merge pull request #18481 from owncloud/fix-apache-login-masterThomas Müller2015-09-211-4/+6
|\ \ | | | | | | Repeated calls to loginWithApache() should not not try to set user in…
| * | Repeated calls to loginWithApache() should not not try to set user ↵Thomas Müller2015-09-211-4/+6
| | | | | | | | | | | | information in the session again
* | | Merge pull request #19221 from owncloud/improved_error_messagesThomas Müller2015-09-211-0/+5
|\ \ \ | | | | | | | | decrypt-all: improved error message if user doesn't exists
| * | | improved error message if user doesn't existsBjoern Schiessle2015-09-211-0/+5
| |/ /
* | | Merge pull request #17347 from owncloud/dav-fopen-overwriteRobin Appelman2015-09-211-2/+7
|\ \ \ | | | | | | | | dont download the existing file for webdav if we're going to overwrite it
| * | | dont download the existing file for webdav if we're going to overwrite itRobin Appelman2015-09-211-2/+7
| |/ /
* | | Merge pull request #19081 from owncloud/prevent0bytedownloadsRobin Appelman2015-09-211-2/+5
|\ \ \ | |/ / |/| | prevent 0 byte downloads when storage returns false
| * | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-09-171-2/+5
| | |
* | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinksharesThomas Müller2015-09-211-0/+5
|\ \ \ | |_|/ |/| | Discard expiration date from result for non-link shares
| * | Discard expiration date from result for non-link sharesVincent Petry2015-09-171-0/+5
| |/
* | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7Thomas Müller2015-09-181-4/+1
|\ \ | | | | | | [jenkins] changed ZipStreamer to use composer for updates, update to 0.7
| * \ Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core ↵Thomas Müller2015-09-181-4/+1
| |\ \ | | | | | | | | | | | | into McNetic-zipstreamer-0.7
| | * | use zipstreamer via composerNicolai Ehemann2015-09-141-3/+0
| | | |
| | * | lib/private/files.php: adapted to minimally changed ZipStreamer APINicolai Ehemann2015-09-141-2/+2
| | | |
* | | | Merge pull request #19098 from owncloud/db-lock-no-transactionThomas Müller2015-09-182-16/+35
|\ \ \ \ | |/ / / |/| | | Remove the need for the transaction in the database locking backend
| * | | improve docRobin Appelman2015-09-171-1/+1
| | | |
| * | | expire old lock rowsRobin Appelman2015-09-172-12/+46
| | | |
| * | | Remove the need for the transaction in the database locking backendRobin Appelman2015-09-171-16/+1
| | |/ | |/|
* | | Prefer OCS Id from databaseLukas Reschke2015-09-181-0/+6
| | | | | | | | | | | | To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
* | | Add repair step for outdated OCS IDsLukas Reschke2015-09-182-2/+112
| | | | | | | | | | | | | | | | | | There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved") To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
* | | Merge pull request #18911 from owncloud/preview-show-cached-directlyThomas Müller2015-09-181-0/+6
|\ \ \ | | | | | | | | Show cached previews directly
| * | | Show cached previews directlyRobin Appelman2015-09-081-0/+6
| | | |
* | | | Merge pull request #18840 from owncloud/fix-app-disable-routeThomas Müller2015-09-181-23/+0
|\ \ \ \ | | | | | | | | | | Rebuild app navigation in JS
| * \ \ \ Merge branch 'master' into fix-app-disable-routeRobin McCorkell2015-09-1464-290/+2022
| |\ \ \ \
| * | | | | Rebuild app navigation in JSRobin McCorkell2015-09-051-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieve all app navigations to prevent reloading appinfo/app.php and causing an error when the app isn't fully loaded. The addition/deletion logic has been moved to JS, simplifying a lot of code.
* | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiersThomas Müller2015-09-182-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow checking whether there are notifiers registered
| * | | | | | Allow checking whether there are notifiers registeredJoas Schilling2015-09-172-0/+14
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19088 from owncloud/fix-availability-intThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Explicitly cast number to integer
| * | | | | | Explicitly cast number to integerRobin McCorkell2015-09-161-1/+1
| | | | | | |
* | | | | | | Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenanceThomas Müller2015-09-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make sure Maintenance is checked before auth and others
| * | | | | | | Make sure Maintenance is checked before auth and othersJoas Schilling2015-09-171-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Do not "use" ServerJoas Schilling2015-09-171-3/+2
| | | | | | |
* | | | | | | Add a Sabre plugin that emits an event for appsJoas Schilling2015-09-172-1/+64
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-172-0/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-172-0/+2
| | | | | |
* | | | | | Merge pull request #19086 from owncloud/restore-loadapp-autoloadThomas Müller2015-09-162-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Restore loadApp() autoload registration
| * | | | | | Restore loadApp() autoload registrationRobin McCorkell2015-09-162-3/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Also changes the autoloader validRoots into a hashmap to try and reduce duplicate entries
* | | | | | Merge pull request #19022 from owncloud/console-loader-validrootThomas Müller2015-09-161-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Register valid root for all installed apps in console
| * | | | | Register valid root for all installed apps in consoleRobin McCorkell2015-09-141-1/+3
| | |_|_|/ | |/| | | | | | | | We need to use commands from apps that aren't enabled (so don't get loaded).
* | | | | Merge pull request #19077 from ↵Thomas Müller2015-09-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/check-maintenance-before-everything-else-master Check for maintenance mode first so we send the 503 instead of login…
| * | | | | Check for maintenance mode first so we send the 503 instead of login ↵Joas Schilling2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | verification
* | | | | | started to implement sharee list view. not completed yet, do not cry please.Arthur Schiwon2015-09-161-0/+1
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 19:11:30 +0000