summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-0113-45/+197
|\
| * Various database migration fixes (#25209)Thomas Müller2016-06-295-1/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | * String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating * Adding schema migration tests to prevent unnecessary and non-sense migration steps Fix Oracle autoincrement and unsigned handling * Fix sqlite integer type for autoincrement * Use lower case table names - fixes pg * Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-294-0/+30
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+4
| |
| * Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-271-1/+6
| | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage
| * Login hooks (#25260)Christoph Wurst2016-06-271-40/+61
| | | | | | | | | | | | | | | | | | | | | | | | * fix login hooks * adjust user session tests * fix login return value of successful token logins * trigger preLogin hook earlier; extract method 'loginWithPassword' * call postLogin hook earlier; add PHPDoc
| * handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-271-3/+3
| | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability
* | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-284-11/+47
|\ \ | | | | | | [Master] sync upstream
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-274-11/+47
| |\|
| | * Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-272-6/+24
| | |\ | | | | | | | | Add explicit delete permission to link shares
| | | * Repair step to adjust link share delete permissionsVincent Petry2016-06-241-0/+23
| | | |
| | | * Add explicit delete permission to link sharesVincent Petry2016-06-241-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15.
| | * | Merge pull request #25258 from owncloud/integritycheck-whennotinstalledVincent Petry2016-06-271-3/+12
| | |\ \ | | | | | | | | | | Make code integrity check work when OC is not installed yet
| | | * | Make code integrity check work when OC is not installed yetVincent Petry2016-06-241-3/+12
| | | |/
| | * / check login name when authenticating with client tokenChristoph Wurst2016-06-241-2/+11
| | |/
* | | Merge pull request #59 from nextcloud/theming-appLukas Reschke2016-06-272-1/+21
|\ \ \ | |/ / |/| | Theming app
| * | Check if server is installedLukas Reschke2016-06-271-1/+1
| | | | | | | | | | | | AppManager has a dependency on Nc being installed
| * | Migrate logic to dynamic controllerLukas Reschke2016-06-273-34/+25
| | | | | | | | | | | | Also adds support for having custom login backgrounds
| * | write theme settings to databaseBjoern Schiessle2016-06-271-4/+33
| | |
* | | verify user password on changeBjoern Schiessle2016-06-271-2/+8
| | |
* | | remove old hook, no longer neededBjoern Schiessle2016-06-271-13/+1
| | |
* | | check password for link sharesBjoern Schiessle2016-06-272-3/+19
|/ /
* | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-2612-108/+376
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-242-2/+112
| |
| * Merge pull request #25172 from owncloud/token-login-validationVincent Petry2016-06-226-96/+174
| |\ | | | | | | Token login validation
| | * fix unit test warning/errorsChristoph Wurst2016-06-201-11/+9
| | |
| | * fix nitpickChristoph Wurst2016-06-201-2/+3
| | |
| | * dont create a session token for clients, validate the app password insteadChristoph Wurst2016-06-171-8/+24
| | |
| | * store last check timestamp in token instead of sessionChristoph Wurst2016-06-176-76/+150
| | |
| | * use token last_activity instead of session valueChristoph Wurst2016-06-173-21/+10
| | |
| * | occ web executor (#24957)VicDeo2016-06-222-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
| * | Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparentsVincent Petry2016-06-221-1/+22
| |\ \ | | | | | | | | Fire hooks for mkdir for folder upload
| | * | Fire hooks for mkdir for folder uploadkarakayasemi2016-06-211-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | fromTmpFile function, usual mkdir call is only working for file's parent directory. Does not care upper parent folders. I added a recursive function that creates parent non-existing folders with usual mkdir.
| * | | redirect to new login route (#25099)Christoph Wurst2016-06-211-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side
| * | | update session token password on user password changeChristoph Wurst2016-06-213-0/+44
| | | |
* | | | some text-changes to nextcloudJoachim Sokolowski2016-06-221-13/+13
| | | |
* | | | Merge pull request #185 from nextcloud/fix-permission-issueLukas Reschke2016-06-211-3/+3
|\ \ \ \ | | | | | | | | | | Show error message if config file is not readable
| * | | | Show error message if config file is not readableMorris Jobke2016-06-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * when the config file is not writable there is a error message shown * same happens now if the config file is not readable * fixes #180
* | | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2124-65/+430
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-212-0/+6
| | | |
| * | | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-203-19/+56
| |\ \ \ | | | | | | | | | | Password login forbidden hint
| | * | | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-173-19/+56
| | | |/ | | |/|
| * | | Update ExcludeFileByNameFilterIterator.php (#25184)Thomas Müller2016-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application: 1: .webapp tag with more detailed info on the configuration done by webapp-config 2: .webapp-appname with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
| * | | Merge pull request #25174 from owncloud/tokenmapper-close-cursorVincent Petry2016-06-201-0/+1
| |\ \ \ | | | | | | | | | | close cursor after loading a token
| | * | | close cursor after loading a tokenChristoph Wurst2016-06-171-0/+1
| | |/ /
| * | | Merge pull request #25168 from owncloud/capped-user-cacheVincent Petry2016-06-201-2/+4
| |\ \ \ | | | | | | | | | | Capped cache for user config
| | * | | Capped cache for user configJörn Friedrich Dreyer2016-06-171-2/+4
| | |/ /
| * | / [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-2/+2
| | |/ | |/|
| * | Use getLazyRootFolder from RemoveRootShares repair stepVincent Petry2016-06-171-1/+1
| |/ | | | | | | | | This prevents the command registration to setup the FS too early when FS-related apps might need upgrading.
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-172-0/+8
| |