summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24760 from owncloud/objectstore_multibucketVincent Petry2016-05-242-2/+115
|\ | | | | Objectstore multibucket
| * Store user bucket in preferencesRoeland Jago Douma2016-05-231-8/+16
| |
| * Fix NameRoeland Jago Douma2016-05-231-4/+4
| |
| * Allow multibucket in objectstoreRoeland Jago Douma2016-05-232-2/+107
| |
* | Merge pull request #24787 from owncloud/fix-update-issue-on-masterVincent Petry2016-05-241-2/+7
|\ \ | | | | | | Add the background jobs after the table was updated
| * | Add the background jobs after the table was updatedJoas Schilling2016-05-231-2/+7
| | |
* | | Merge pull request #23395 from owncloud/mysql-check-speedupVincent Petry2016-05-241-0/+23
|\ \ \ | | | | | | | | Speedup schema cloning for MySQL
| * | | Speedup schema cloning for MySQLVictor Dubiniuk2016-05-231-0/+23
| | |/ | |/|
* | | Merge pull request #24750 from ↵Vincent Petry2016-05-233-12/+200
|\ \ \ | | | | | | | | | | | | | | | | owncloud/lenz1111-share_download_range_requests_support Http Range requests support in downloads
| * | | Code style and doc fixPiotr Filiciak2016-05-233-10/+11
| | | |
| * | | Http Range requests support in downloadsPiotr Filiciak2016-05-203-12/+199
| | | | | | | | | | | | | | | | Http range requests support is required for video preview
* | | | Merge pull request #24729 from owncloud/try-token-login-firstVincent Petry2016-05-231-5/+13
|\ \ \ \ | | | | | | | | | | try token login first
| * | | | try token login firstChristoph Wurst2016-05-201-5/+13
| | | | |
* | | | | Merge pull request #24658 from owncloud/invalidate-disabled-user-sessionVincent Petry2016-05-231-3/+4
|\ \ \ \ \ | | | | | | | | | | | | invalidate user session if the user was disabled
| * | | | | invalidate user session if the user is disabledChristoph Wurst2016-05-231-3/+4
| | | | | |
* | | | | | Merge pull request #24559 from owncloud/2faVincent Petry2016-05-2310-3/+376
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | two factor auth
| * | | | | add OCC command to enable/disable 2FA for a userChristoph Wurst2016-05-232-3/+28
| | | | | |
| * | | | | Add two factor auth to coreChristoph Wurst2016-05-2310-3/+351
| |/ / / /
* | | | | Merge pull request #24777 from owncloud/scanner-dont-propagateVincent Petry2016-05-231-2/+4
|\ \ \ \ \ | | | | | | | | | | | | dont needlessly triger the propgator in the scanner
| * | | | | dont needlessly triger the propgator in the scannerRobin Appelman2016-05-231-2/+4
| | | | | |
* | | | | | Merge pull request #24699 from owncloud/background-scan-recursionVincent Petry2016-05-232-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only recurse into incomplete folders during background scans
| * | | | | | Only recurse into incomplete folders during background scansRobin Appelman2016-05-232-3/+7
| | | | | | |
* | | | | | | Merge pull request #24695 from owncloud/background-scan-propagateVincent Petry2016-05-231-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Trigger propagation from the background scanner
| * | | | | | | Trigger propagation from the background scannerRobin Appelman2016-05-181-1/+13
| | | | | | | |
* | | | | | | | Merge pull request #24765 from owncloud/boolean-installed-configVincent Petry2016-05-231-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Make sure we evaluate installed everywhere as a boolean
| * | | | | | | Make sure that installed is a booleanJoas Schilling2016-05-231-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #24703 from owncloud/personal-settings-auth-tokensVincent Petry2016-05-236-6/+51
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Personal settings auth tokens
| * | | | | | | add button to invalidate browser sessions/device tokensChristoph Wurst2016-05-235-6/+37
| | | | | | | |
| * | | | | | | add button to add new device tokensChristoph Wurst2016-05-232-1/+4
| | | | | | | |
| * | | | | | | list user's auth tokens on the personal settings pageChristoph Wurst2016-05-232-2/+13
| |/ / / / / /
* | | | | | | Merge pull request #24349 from owncloud/nfd-storagewrapperVincent Petry2016-05-233-1/+541
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add wrapper for NFD encoding workaround
| * | | | | | Remove unneeded unsets in encoding wrapperVincent Petry2016-05-201-16/+3
| | | | | | |
| * | | | | | Fixes for encoding wrapperVincent Petry2016-05-201-41/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved label Fixed rename/copy/moveFromStorage/copyFromStorage and added tests Improved findPathToUse algo
| * | | | | | Scanner must normalize new children names for cache diffVincent Petry2016-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since new children from the storage might contain NFD entries, these must be normalized to NFC to be properly diff'ed with the cache contents which is always NFC. This fixes an issue where NFD entries would disappear from the cache after rescannng for children.
| * | | | | | Add encoding wrapper as opt-in mount optionVincent Petry2016-05-201-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encoding wrapper is now only applied when the mount option is set, disabled by default.
| * | | | | | Add wrapper for NFD encoding workaroundVincent Petry2016-05-202-0/+577
| | | | | | |
* | | | | | | Merge pull request #24766 from owncloud/mmccarn-patch-2Vincent Petry2016-05-231-10/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Update imagePath to prefer theme, then app, then core images
| * | | | | | Update imagePath to prefer theme, then app, then core imagesmmccarn2016-05-231-10/+13
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imagePath updated so that image searches follow this priority: 1) /themes/$theme/apps/$app/img 2) /themes/$theme/$app/img 3) /themes/$theme/core/img 4) $appPath/img 5) /$app/img 6) /core/img For each folder: - if the specified file exists, use it. - otherwise, if $basename.svg does NOT exist, try $basename.png (This might better be "if filename was an svg, try the png"...)
* | | | | | Merge pull request #24603 from owncloud/federated_reshareVincent Petry2016-05-234-9/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | flat federated re-share
| * | | | | | use share initiator as fall back to access the fileBjörn Schießle2016-05-204-9/+28
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | in case of federated re-shares the owner can be a remote user. Therefore we can't always use to owner to access the local file
* | | | | | Merge pull request #24356 from owncloud/scanner-recursion-memoryVincent Petry2016-05-231-22/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Free up folder content from memory before recursing in the file scanner
| * | | | | | Free up folder content from memory before recursing in the file scannerRobin Appelman2016-04-291-22/+25
| | | | | | |
* | | | | | | Move EntityEvent to PSR-4Joas Schilling2016-05-231-0/+0
| | | | | | |
* | | | | | | Make the root collection neutral so it does not only work for filesJoas Schilling2016-05-231-0/+76
| |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-238-8/+24
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-224-12/+20
| | | | | |
* | | | | | Merge pull request #24732 from owncloud/autoloader_fixVincent Petry2016-05-213-7/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Autoloader fix
| * | | | | | Move Template to PSR-4Roeland Jago Douma2016-05-201-0/+0
| | | | | | |
| * | | | | | Only allow loading of legacy (lib/private/legacy) by defaultRoeland Jago Douma2016-05-201-5/+1
| | | | | | |
| * | | | | | \OCP is handled by composer autoloaderRoeland Jago Douma2016-05-201-2/+0
| | |/ / / / | |/| | | |