wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38011 commits 157 branches 562 tags 714 MiB
Commit graph

38011 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
bb94b39745
Do not clear CSRF token on logout (fix for #1303) 
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>
 2017-03-13 22:16:56 +01: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
Nextcloud bot
0dd0242d2f
[tx-robot] updated from transifex 2017-03-13 01:08:19 +00:00
Nextcloud bot
37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Ko-
0024b67aaf Check that set_time_limit is not disabled before calling it 
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
 2017-03-11 17:04:21 +01:00
Lukas Reschke
801b600ec3 Merge pull request #3739 from fti7/master 
Serve robots.txt if the RewriteBase is configured
 2017-03-11 09:56:38 +01:00
Nextcloud bot
456cd81a20
[tx-robot] updated from transifex 2017-03-11 01:07:48 +00:00
Vincent Petry
5dbb32fb81
Properly expire ext storage versions (#26601) 
* Properly expire ext storage versions

System-wide external storages have no real owner so the current user is
used as owner. However when running cron.php there is no current user,
so no expiry can be done.

This fix adds an user argument to the expire() function to tell for
which user to expire files. This information is anyway always available
now through the expire command job.

* Move version expire setupFS into the expire function

* Add comment about not tearing down in version Storage::expire()

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-10 15:58:44 -06:00
Morris Jobke
a10476a3c6 Merge pull request #3798 from nextcloud/fix-login 
Fix login page, because only guest.css is loaded now
 2017-03-10 14:57:05 -06:00
Morris Jobke
c1be2d80ad
Fix login page, because only guest.css is loaded now 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-10 14:43:14 -06:00
Lukas Reschke
f2c0218652 Merge pull request #3755 from nextcloud/scan-tipstricks 
Add security scan to tips & tricks section
 2017-03-10 21:31:37 +01:00
Roeland Jago Douma
e8ac348f47
Make intergration tests work again 
The regex was to greedy

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-10 20:40:47 +01:00
Roeland Jago Douma
5c2772fb36
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-10 20:40:47 +01:00
Roeland Jago Douma
8a8df607c1
[3rdparty] Bump sabre/dav to 3.2.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-10 20:40:41 +01:00
Roeland Jago Douma
f86b5c2ebb
Properly calculate webdir using the serverroot 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-10 20:00:34 +01:00
Roeland Jago Douma
f7ebf1d47d
SCSS files don't exist on the default fs so just add them to the 
resource list

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-10 19:13:44 +01:00
Lukas Reschke
27de443fc4 Merge pull request #3774 from artem-sidorenko/posix-exit-1 
Exit with error code if posix ext missing or wrong user
 2017-03-10 18:18:59 +01:00
Lukas Reschke
42ee401376 Merge pull request #3778 from nextcloud/verify_jpg_files 
Test if a file is a valid jpg file
 2017-03-10 18:17:51 +01:00
Lukas Reschke
f74911b638 Merge pull request #3787 from nextcloud/ocs-cookie 
dont require strict same site cookies for ocs requests
 2017-03-10 18:14:38 +01:00
Lukas Reschke
1045bf4a2b Merge pull request #3793 from stefan-squareweave/master 
Correct incorrectly typed X-OC-Mtime header
 2017-03-10 18:12:55 +01:00
Lukas Reschke
350aa8d8d2 Merge pull request #3794 from nextcloud/fix_2739 
MP3 without cover don't get a preview
 2017-03-10 18:10:49 +01:00
Robin Appelman
1c59240894
Add api to change the remote of an incoming federated share 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-10 14:45:40 +01:00
Morris Jobke
3ca9d53194
Fix SCSS usage in apps 
* fix the web root detection of the ResourceLocator for apps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-10 14:44:01 +01:00