summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update unit testsBjoern Schiessle2017-04-0710-98/+55
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* update capabilitiesBjoern Schiessle2017-04-072-6/+31
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* change permission orderBjoern Schiessle2017-04-031-12/+10
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* setting to disable sending password by mailBjoern Schiessle2017-04-038-6/+194
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* make sure that variables are defined correctlyBjoern Schiessle2017-04-031-4/+2
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* fix typo and capitalize crudsBjoern Schiessle2017-04-031-8/+8
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* set expire date for all share typesBjoern Schiessle2017-04-037-57/+124
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* add secure drop functionallity to mail sharesBjoern Schiessle2017-04-033-2/+53
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* allow password protected mail sharesBjoern Schiessle2017-04-038-18/+315
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* fix share provider idBjoern Schiessle2017-04-031-1/+1
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* add new password column to the share table in order to set passwords for ↵Bjoern Schiessle2017-04-039-16/+107
| | | | | | share by mails Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* allow the user to set a expire date for all sharesBjoern Schiessle2017-04-032-0/+38
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* [tx-robot] updated from transifexNextcloud bot2017-04-0332-24/+204
|
* Merge pull request #4183 from nextcloud/css-shortcuts-viewLukas Reschke2017-04-021-1/+30
|\ | | | | Add CSS for styling of keyboard shortcuts view
| * Add CSS for styling of keyboard shortcuts viewJan-Christoph Borchardt2017-03-301-1/+30
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-04-0218-2/+64
| |
* | Merge pull request #4139 from nextcloud/phpseclibRoeland Jago Douma2017-04-011-0/+0
|\ \ | | | | | | [3rdparty] Bump phpseclib to 2.0.4
| * | [3rdparty] Bump phpseclib to 2.0.4Roeland Jago Douma2017-03-301-0/+0
| | | | | | | | | | | | | | | | | | See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4174 from nextcloud/mergejs-newlineChristoph Wurst2017-04-012-7/+24
|\ \ \ | | | | | | | | mergejs should print a newline between imports
| * | | mergejs should print a newline between importsRoeland Jago Douma2017-03-312-7/+24
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0126-200/+1036
|/ / /
* | | Merge pull request #3438 from nextcloud/external-storage-user-folderRoeland Jago Douma2017-03-312-2/+2
|\ \ \ | | | | | | | | Allow using '/' as external storage mountpoint
| * | | Allow using '/' as external storage rootRobin Appelman2017-03-232-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4140 from nextcloud/no_encryption_no_wrapperBjörn Schießle2017-03-312-3/+6
|\ \ \ \ | | | | | | | | | | Don't add the Encryption Storage Wrapper if there are no encryption modules
| * | | | fix setup of external storage integration testsRobin Appelman2017-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Don't add the Encryption Storage Wrapper if there are no encryption modulesRoeland Jago Douma2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4125 If there is no encryption module enabled it makes no sense to setup the encryption wrapper (because we can't do anything anyway). This saves reading the header of files. Especialy on external storage/objectstore this should improve performance Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-3154-224/+568
| | | | |
* | | | | Merge pull request #3832 from nextcloud/fix_1303Roeland Jago Douma2017-03-301-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Do not clear CSRF token on logout (fix for #1303)
| * | | | | Do not clear CSRF token on logout (fix for #1303)Roeland Jago Douma2017-03-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a hacky way to allow the use case of #1303. What happens is 1. User tries to login 2. PreLoginHook kicks in and figures out that the user need to change their LDAP password or whatever => redirects user 3. While loading the redirect some logic of ours kicks in and logouts the user (thus clearing the session). 4. We render the new page but now the session and the page disagree about the CSRF token This is kind of hacky but I don't think it introduces new attack vectors. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4150 from nextcloud/capped-memcache-pushJoas Schilling2017-03-302-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | support pushing to CappedMemoryCache
| * | | | | | user ids are stringsRobin Appelman2017-03-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | support pushing to CappedMemoryCacheRobin Appelman2017-03-301-1/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4128 from nextcloud/updateclipboardJoas Schilling2017-03-306-1485/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update clipboard.js
| * | | | | | Use minified clipboard.jsRoeland Jago Douma2017-03-295-1517/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Update clipboard.jsRoeland Jago Douma2017-03-292-210/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #4143 from nextcloud/ldap-downstream-64Roeland Jago Douma2017-03-302-32/+366
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correctly apply quota
| * | | | | | | Include tests for "default" and "none" quotasJuan Pablo Villafáñez2017-03-291-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Add comments in the updateQuota method to explain the behaviorJuan Pablo Villafáñez2017-03-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Add new testes to cover more casesJuan Pablo Villafáñez2017-03-291-0/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Adjust current tests to match the expectationsJuan Pablo Villafáñez2017-03-291-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Check if the user exists before trying to set the quotaJuan Pablo Villafáñez2017-03-291-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Correctly apply quotaJuan Pablo Villafáñez2017-03-291-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #3089 from nextcloud/cache-move-single-queryRoeland Jago Douma2017-03-3018-28/+542
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Move all children of a folder in a single query
| * | | | | | | rename fun to funcRobin Appelman2017-03-304-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | Add tests for query builder (i)likeRobin Appelman2017-03-302-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | dont double escapeRobin Appelman2017-03-302-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | update autoloaderRobin Appelman2017-03-302-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | fix licence headersRobin Appelman2017-03-306-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | Move all children of a folder in a single queryRobin Appelman2017-03-301-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | Add function builder to the query builderRobin Appelman2017-03-308-0/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>