summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24748 from owncloud/login-explicitlyVincent Petry2016-05-247-18/+43
|\
| * when generating browser/device token, save the login name for later password ...Christoph Wurst2016-05-247-10/+37
| * login explicitlyChristoph Wurst2016-05-242-9/+7
* | Merge pull request #24760 from owncloud/objectstore_multibucketVincent Petry2016-05-242-2/+115
|\ \
| * | 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 updatedJoas Schilling2016-05-231-2/+7
* | | | Merge pull request #23395 from owncloud/mysql-check-speedupVincent Petry2016-05-241-0/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Speedup schema cloning for MySQLVictor Dubiniuk2016-05-231-0/+23
| | |/ | |/|
* | | Merge pull request #24750 from owncloud/lenz1111-share_download_range_request...Vincent Petry2016-05-232-12/+165
|\ \ \
| * | | Code style and doc fixPiotr Filiciak2016-05-232-10/+10
| * | | Http Range requests support in downloadsPiotr Filiciak2016-05-202-12/+165
* | | | Merge pull request #24729 from owncloud/try-token-login-firstVincent Petry2016-05-231-5/+13
|\ \ \ \
| * | | | 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 is disabledChristoph Wurst2016-05-231-3/+4
* | | | | | Merge pull request #24559 from owncloud/2faVincent Petry2016-05-239-3/+283
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | add OCC command to enable/disable 2FA for a userChristoph Wurst2016-05-232-3/+28
| * | | | | Add two factor auth to coreChristoph Wurst2016-05-239-3/+258
| |/ / / /
* | | | | Merge pull request #24777 from owncloud/scanner-dont-propagateVincent Petry2016-05-231-2/+4
|\ \ \ \ \
| * | | | | dont needlessly triger the propgator in the scannerRobin Appelman2016-05-231-2/+4
* | | | | | Merge pull request #24699 from owncloud/background-scan-recursionVincent Petry2016-05-231-3/+6
|\ \ \ \ \ \
| * | | | | | Only recurse into incomplete folders during background scansRobin Appelman2016-05-231-3/+6
* | | | | | | Merge pull request #24695 from owncloud/background-scan-propagateVincent Petry2016-05-231-1/+13
|\ \ \ \ \ \ \
| * | | | | | | 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 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unneeded unsets in encoding wrapperVincent Petry2016-05-201-16/+3
| * | | | | | Fixes for encoding wrapperVincent Petry2016-05-201-41/+19
| * | | | | | Scanner must normalize new children names for cache diffVincent Petry2016-05-201-1/+1
| * | | | | | Add encoding wrapper as opt-in mount optionVincent Petry2016-05-201-4/+2
| * | | | | | 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 imagesmmccarn2016-05-231-10/+13
| | |/ / / | |/| | |
* | | | | Merge pull request #24603 from owncloud/federated_reshareVincent Petry2016-05-234-9/+28
|\ \ \ \ \
| * | | | | use share initiator as fall back to access the fileBjörn Schießle2016-05-204-9/+28
| | |/ / / | |/| | |
* | | | | 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 scannerRobin Appelman2016-04-291-22/+25
* | | | | Merge pull request #24696 from owncloud/lock-jobs-while-executingVincent Petry2016-05-217-36/+149
|\ \ \ \ \
| * | | | | Lock jobs while executing them, to allow multiple executors to run in parallelJoas Schilling2016-05-212-34/+58
| * | | | | Add a method to lock a tableJoas Schilling2016-05-215-2/+91
| | |/ / / | |/| | |
* | | | | Some tweaks for systemtagmanagerVincent Petry2016-05-201-4/+1
* | | | | Act on effective system tag canAssign permissionVincent Petry2016-05-201-1/+1