Commit graph

37438 commits

Author SHA1 Message Date
Robin Appelman
8217b16cfe Merge pull request 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
Nextcloud bot
8d91c84ec4
[tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Morris Jobke
5730c587ec Merge pull request 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 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 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 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 from nextcloud/oc-27328-delay-language-initialisation
use closure to properly defer l10n initialization ()
2017-03-13 15:00:26 +01:00
Roeland Jago Douma
938f432113 Merge pull request 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 from GitHubUser4234/audit_log_agent
Audit log the User-Agent
2017-03-13 12:38:04 +01:00
Lukas Reschke
08cbd82a16 Merge pull request 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 () 2017-03-13 08:52:54 +01:00
Morris Jobke
f7cef9f702 Merge pull request 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
Lukas Reschke
801b600ec3 Merge pull request 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
Morris Jobke
a10476a3c6 Merge pull request 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 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
Lukas Reschke
27de443fc4 Merge pull request 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 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 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 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 from nextcloud/fix_2739
MP3 without cover don't get a preview
2017-03-10 18:10:49 +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 

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 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 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 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 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