Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 13 | -45/+197 |
|\ | |||||
| * | Various database migration fixes (#25209) | Thomas Müller | 2016-06-29 | 5 | -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 transifex | Jenkins for ownCloud | 2016-06-29 | 4 | -0/+30 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-28 | 2 | -0/+4 |
| | | |||||
| * | Fix getting the certificate bundle for dav external storage (#25274) | Robin Appelman | 2016-06-27 | 1 | -1/+6 |
| | | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage | ||||
| * | Login hooks (#25260) | Christoph Wurst | 2016-06-27 | 1 | -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 Appelman | 2016-06-27 | 1 | -3/+3 |
| | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability | ||||
* | | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 4 | -11/+47 |
|\ \ | | | | | | | [Master] sync upstream | ||||
| * | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 4 | -11/+47 |
| |\| | |||||
| | * | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 2 | -6/+24 |
| | |\ | | | | | | | | | Add explicit delete permission to link shares | ||||
| | | * | Repair step to adjust link share delete permissions | Vincent Petry | 2016-06-24 | 1 | -0/+23 |
| | | | | |||||
| | | * | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 1 | -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-whennotinstalled | Vincent Petry | 2016-06-27 | 1 | -3/+12 |
| | |\ \ | | | | | | | | | | | Make code integrity check work when OC is not installed yet | ||||
| | | * | | Make code integrity check work when OC is not installed yet | Vincent Petry | 2016-06-24 | 1 | -3/+12 |
| | | |/ | |||||
| | * / | check login name when authenticating with client token | Christoph Wurst | 2016-06-24 | 1 | -2/+11 |
| | |/ | |||||
* | | | Merge pull request #59 from nextcloud/theming-app | Lukas Reschke | 2016-06-27 | 2 | -1/+21 |
|\ \ \ | |/ / |/| | | Theming app | ||||
| * | | Check if server is installed | Lukas Reschke | 2016-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | AppManager has a dependency on Nc being installed | ||||
| * | | Migrate logic to dynamic controller | Lukas Reschke | 2016-06-27 | 3 | -34/+25 |
| | | | | | | | | | | | | Also adds support for having custom login backgrounds | ||||
| * | | write theme settings to database | Bjoern Schiessle | 2016-06-27 | 1 | -4/+33 |
| | | | |||||
* | | | verify user password on change | Bjoern Schiessle | 2016-06-27 | 1 | -2/+8 |
| | | | |||||
* | | | remove old hook, no longer needed | Bjoern Schiessle | 2016-06-27 | 1 | -13/+1 |
| | | | |||||
* | | | check password for link shares | Bjoern Schiessle | 2016-06-27 | 2 | -3/+19 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 12 | -108/+376 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 2 | -2/+112 |
| | | |||||
| * | Merge pull request #25172 from owncloud/token-login-validation | Vincent Petry | 2016-06-22 | 6 | -96/+174 |
| |\ | | | | | | | Token login validation | ||||
| | * | fix unit test warning/errors | Christoph Wurst | 2016-06-20 | 1 | -11/+9 |
| | | | |||||
| | * | fix nitpick | Christoph Wurst | 2016-06-20 | 1 | -2/+3 |
| | | | |||||
| | * | dont create a session token for clients, validate the app password instead | Christoph Wurst | 2016-06-17 | 1 | -8/+24 |
| | | | |||||
| | * | store last check timestamp in token instead of session | Christoph Wurst | 2016-06-17 | 6 | -76/+150 |
| | | | |||||
| | * | use token last_activity instead of session value | Christoph Wurst | 2016-06-17 | 3 | -21/+10 |
| | | | |||||
| * | | occ web executor (#24957) | VicDeo | 2016-06-22 | 2 | -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-firemkdirhooksforparents | Vincent Petry | 2016-06-22 | 1 | -1/+22 |
| |\ \ | | | | | | | | | Fire hooks for mkdir for folder upload | ||||
| | * | | Fire hooks for mkdir for folder upload | karakayasemi | 2016-06-21 | 1 | -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 Wurst | 2016-06-21 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side | ||||
| * | | | update session token password on user password change | Christoph Wurst | 2016-06-21 | 3 | -0/+44 |
| | | | | |||||
* | | | | some text-changes to nextcloud | Joachim Sokolowski | 2016-06-22 | 1 | -13/+13 |
| | | | | |||||
* | | | | Merge pull request #185 from nextcloud/fix-permission-issue | Lukas Reschke | 2016-06-21 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Show error message if config file is not readable | ||||
| * | | | | Show error message if config file is not readable | Morris Jobke | 2016-06-21 | 1 | -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-upstream | Lukas Reschke | 2016-06-21 | 24 | -65/+430 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-21 | 2 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #25162 from owncloud/password-login-forbidden-hint | Vincent Petry | 2016-06-20 | 3 | -19/+56 |
| |\ \ \ | | | | | | | | | | | Password login forbidden hint | ||||
| | * | | | add PasswordLoginForbiddenException | Christoph Wurst | 2016-06-17 | 3 | -19/+56 |
| | | |/ | | |/| | |||||
| * | | | Update ExcludeFileByNameFilterIterator.php (#25184) | Thomas Müller | 2016-06-20 | 1 | -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-cursor | Vincent Petry | 2016-06-20 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | close cursor after loading a token | ||||
| | * | | | close cursor after loading a token | Christoph Wurst | 2016-06-17 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | Merge pull request #25168 from owncloud/capped-user-cache | Vincent Petry | 2016-06-20 | 1 | -2/+4 |
| |\ \ \ | | | | | | | | | | | Capped cache for user config | ||||
| | * | | | Capped cache for user config | Jörn Friedrich Dreyer | 2016-06-17 | 1 | -2/+4 |
| | |/ / | |||||
| * | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 2 | -2/+2 |
| | |/ | |/| | |||||
| * | | Use getLazyRootFolder from RemoveRootShares repair step | Vincent Petry | 2016-06-17 | 1 | -1/+1 |
| |/ | | | | | | | | | This prevents the command registration to setup the FS too early when FS-related apps might need upgrading. | ||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 2 | -0/+8 |
| | |