mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,472 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

37472 Commits

Author SHA1 Message Date
Lukas Reschke 6c8d48b0f6
Harden t() with DOMPurify 
This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-16 14:17:42 +01:00
Lukas Reschke 793d7d1bd7 Merge pull request #3860 from nextcloud/fix_master_after_3802 
Fix unit tests of master
 2017-03-16 14:08:32 +01:00
Roeland Jago Douma bb2ec51bbb
Fix unit tests of master 
Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-16 12:46:02 +01:00
Roeland Jago Douma 57c1be8633 Merge pull request #3802 from Ko-/master 
Check that set_time_limit is not disabled before calling it
 2017-03-16 12:27:26 +01:00
Joas Schilling 7ca2f5f137 Merge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invitations 
Fix scheduling plugin on legacy caldav endpoint
 2017-03-16 12:14:32 +01:00
Ko- 786ee72146 Add warning on admin screen when set_time_limit is unavailable 2017-03-16 11:48:28 +01:00
Joas Schilling 652ee8a605
Fix scheduling plugin on legacy caldav endpoint 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-16 09:55:15 +01:00
Roeland Jago Douma 4d207680f2 Merge pull request #3624 from marncz/master 
Update.js: countdown feedback before redirect
 2017-03-16 07:56:51 +01:00
Nextcloud bot 2fafdb39ac
[tx-robot] updated from transifex 2017-03-16 01:07:36 +00:00
Roeland Jago Douma 93c9a06761 Merge pull request #3788 from nextcloud/fed-share-modify 
Add api to change the remote of an incoming federated share
 2017-03-15 17:32:35 +01:00
Joas Schilling f2d3704e97 Merge pull request #3843 from nextcloud/encryption-fix-mail-share 
take share by mail into consideration if we calculate the access list
 2017-03-15 15:23:17 +01:00
Roeland Jago Douma 5ed45fc8e6 Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query 
Remove single quotes around search query like in user search
 2017-03-15 15:05:15 +01:00
Joas Schilling 0fe45966a0
Remove single quotes around search query like in user search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-15 12:53:44 +01:00
Björn Schießle 5a998da206 Merge pull request #3841 from nextcloud/encyryption-trash-bin 
Delete files on encryption error
 2017-03-15 09:07:07 +01:00
Marcin Czarnecki 1a3617cdd6 Spacing 
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
 2017-03-15 06:35:40 +00:00
Nextcloud bot 4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Marcin Czarnecki df2670ca3c Update: feedback before redirect 
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
 2017-03-14 20:36:17 +00:00
Roeland Jago Douma 67faf7edc4 Merge pull request #3838 from Xuanwo/basename-fix 
[OC/Files/Cache]: Fix wrong usage of basename
 2017-03-14 21:00:24 +01:00
Roeland Jago Douma 562c45d925 Merge pull request #3829 from nextcloud/reshares-in-folder 
switch reshares to true (display reshares in the folder/filelist)
 2017-03-14 20:13:09 +01:00
Maxence Lange 16e1c21fcc
fix mock 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-14 19:27:20 +01:00
Maxence Lange 1b9ed81cb6
switch reshares to true 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-14 19:27:07 +01:00
Roeland Jago Douma 25553172f4 Merge pull request #3836 from nextcloud/do-not-double-check-app-update 
Do not check for app update twice
 2017-03-14 19:26:01 +01:00
Bjoern Schiessle 8f92808caf
take share by mail into consideration if we calculate the access list 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 17:40:42 +01:00
Roeland Jago Douma 6565533d3b Merge pull request #3600 from coletivoEITA/master 
added method needsPartFile() in Storage
 2017-03-14 15:14:59 +01:00
Roeland Jago Douma 3c2312fb09 Merge pull request #3783 from andrius-kulbis/master 
Fix deleted objectstore shares
 2017-03-14 15:14:39 +01:00
Robin Appelman 8217b16cfe Merge pull request #3824 from nextcloud/dav-search-getlastmodified 
fix searching and ordering on getlastmodified
 2017-03-14 14:42:57 +01:00
Robin Appelman e392d02d80
safer casting of datetime 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-14 14:12:40 +01:00
Vinicius Cubas Brand 13e50cbcd7 added method needsPartFile() in Storage 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2017-03-14 10:06:50 -03:00
Bjoern Schiessle 79d362f4a6
delete files right away in case of a encryption exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 12:11:28 +01:00
Bjoern Schiessle 9ce32d9941
always throw a encryption exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 12:11:28 +01:00
Xuanwo 210f4106c4 [OC/Files/Cache]: Fix wrong usage of basename 
Fix https://github.com/nextcloud/server/issues/3837

Signed-off-by: Xuanwo <xuanwo@yunify.com>
 2017-03-14 13:27:17 +08:00
Nextcloud bot 8d91c84ec4
[tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Morris Jobke 252858ec5e
Do not double cherck app update 
In base.php the apps are already checked for an update. No need to
repeat this during loading of the app.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-13 18:07:41 -06:00
Morris Jobke 5730c587ec Merge pull request #3827 from nextcloud/issue-3826-remove-double-password-confirmation 
Remove the double password confirmation on changing cron
 2017-03-13 16:03:11 -06:00
Morris Jobke ef14dc671f
fix unit test 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-13 15:59:04 -06:00
Lukas Reschke af16416de5 Merge pull request #3828 from nextcloud/no-no-empty-wildcard-search 
dont allow empty wildcard search
 2017-03-13 19:28:00 +01:00
Lukas Reschke 756bc90eac Merge pull request #3648 from nextcloud/sabre-3.2.2 
[3rdparty] Bump sabre/dav to 3.2.2
 2017-03-13 19:27:09 +01:00
Robin Appelman 6d0c756ff9
dont allow empty wildcard search 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-13 16:06:19 +01:00
Joas Schilling beb3f92c4d
Remove the double password confirmation on changing cron 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-13 15:52:16 +01:00
Robin Appelman c1cf872f1d Merge pull request #3822 from nextcloud/webui-upoad-no-mtime 
dont preserve mtime when uploading trough the web interface
 2017-03-13 15:48:59 +01:00
Roeland Jago Douma 308e8bb5ec Merge pull request #3814 from nextcloud/oc-27328-delay-language-initialisation 
use closure to properly defer l10n initialization (#27328)
 2017-03-13 15:00:26 +01:00
Roeland Jago Douma 938f432113 Merge pull request #3819 from nextcloud/dont-add-user-to-subadmin 
Call right function after sudo mode
 2017-03-13 14:59:48 +01:00
Robin Appelman 6074dc9979
fix searching and ordering on getlastmodified 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-13 14:44:52 +01:00
Robin Appelman ad4b5c82da
dont preserve mtime when uploading trough the web interface 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-13 13:33:18 +01:00
Lukas Reschke 4395cf4fa7 Merge pull request #3780 from GitHubUser4234/audit_log_agent 
Audit log the User-Agent
 2017-03-13 12:38:04 +01:00
Lukas Reschke 08cbd82a16 Merge pull request #3803 from Thijsdh/master 
Create app password by pressing enter
 2017-03-13 12:37:19 +01:00
Lukas Reschke ec7be8bd43
Call right function after sudo mode 
This should call the `applyGroupSelect` and not the `applySubadminSelect`.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-13 12:22:44 +01:00
Thijs den Hartog f72373dfda Create app password by pressing enter 
Signed-off-by: Thijs den Hartog <Thijs@thijsbeer.nl>
 2017-03-13 08:57:01 +01:00
Jörn Friedrich Dreyer fbd2dd49b6
use closure to properly defer l10n initialization (#27328) 2017-03-13 08:52:54 +01:00
Morris Jobke f7cef9f702 Merge pull request #3772 from nextcloud/favorite-search 
Allow searching for favorites
 2017-03-13 00:55:12 -06:00