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
Robin Appelman
9a8cef965f
add test for skipping cookie checks for ocs
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-10 14:11:00 +01:00
Roger Szabo
35369ecc96
author update
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:24:37 +08:00
Roger Szabo
38d8492f30
improvement of userAgent variable assigment
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:20:19 +08:00
Roger Szabo
06a8ac6ff6
log user agent globally instead
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 16:50:15 +08:00
Roeland Jago Douma
53640bbc47
MP3 without cover don't get a preview
...
* Fixes #2739
It tries to create an image from an SVG file. Which we don't support. So
this fails and prints an log line. Then we fall back anyways to the 404
and fetch the default icon.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 08:52:23 +01:00
Stefan Schneider
f6ef024159
Correct incorrectly typed X-OC-Mtime header
...
Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>
2017-03-10 18:16:27 +11:00
Morris Jobke
c38f87e799
Merge pull request #3690 from nextcloud/cleanup-legacy-groups-class
...
Remove legacy class OC_Group and OC_User
2017-03-09 19:09:22 -06:00
Nextcloud bot
8904fb1cf3
[tx-robot] updated from transifex
2017-03-10 01:08:01 +00:00
Morris Jobke
a5ba1f7803
Remove legacy class OC_Group and OC_User
...
* basically a straight replacement of the wrapped code at the calling code parts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 17:35:09 -06:00
Lukas Reschke
6fd0e7e939
Merge pull request #3791 from nextcloud/combine_sass
...
Combine sass
2017-03-09 23:25:17 +01:00
Morris Jobke
0c22a66967
Add more styles to the server.scss
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 15:36:03 -06:00
Roeland Jago Douma
db5fc4d3cb
Merge pull request #3693 from nextcloud/get-user-folder-of-correct-user
...
Get the user folder of the correct user for mention notifications
2017-03-09 21:50:05 +01:00
Roeland Jago Douma
c16cb1978b
Merge pull request #3621 from kuimovvg/master
...
don't setted status when file is lock
2017-03-09 21:28:32 +01:00
Joas Schilling
d4200a08cc
Get the user folder of the correct user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-09 21:07:37 +01:00
Roeland Jago Douma
f2cf85fad2
[PoC] combine 2 scss files!
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:42:34 +01:00
Roeland Jago Douma
57be594f1f
Allow using import in sass files
...
This allows us to combine multiple sass files that we have to always
load together anyway.
Fixes #3389
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:29:50 +01:00
Roeland Jago Douma
8626ccab1c
dont require strict same site cookies for ocs requests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 16:48:48 +01:00
Morris Jobke
15fa306ae8
Merge pull request #3785 from nextcloud/bump_autoloader
...
Bump autoloader
2017-03-09 09:27:12 -06:00