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

44057 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
5e5671983c
[tx-robot] updated from transifex 2018-06-17 00:12:48 +00:00
Nextcloud bot
db9ad32d75
[tx-robot] updated from transifex 2018-06-16 00:13:15 +00:00
Morris Jobke
2ec4fb4327
Merge pull request #9883 from nextcloud/return-user-groups-ids 
Return groups IDs and not Names
 2018-06-15 17:16:45 +02:00
Morris Jobke
8f6acbff62
Merge pull request #9258 from nextcloud/theming-logo-png 
Convert theming app logo to PNG to show it properly in emails
 2018-06-15 17:02:14 +02:00
John Molakvoæ (skjnldsv)
f0ce44fedf
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-15 16:51:53 +02:00
John Molakvoæ (skjnldsv)
d666723cb0
Return groups IDs and not Names 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-15 16:42:39 +02:00
Morris Jobke
d82ef72161
Merge pull request #9197 from nextcloud/fix-avatar-center 
Fix avatar generator centering
 2018-06-15 16:16:13 +02:00
John Molakvoæ (skjnldsv)
543188d0cb
Removed debug stack 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-15 15:40:10 +02:00
Morris Jobke
a0496b2a78
Merge pull request #9875 from wiyh12nf89x/Issue#9864_WebDAV_timeout_fix_maxDelay 
Fix #9864: Decrease $maxDelay in Throttler.php
 2018-06-15 07:34:28 +02:00
Morris Jobke
3ea9f18871
Merge pull request #9873 from nextcloud/fix-http-client-given-options-being-overriden-by-default-options 
Fix HTTP client given options being overriden by default options
 2018-06-15 07:27:31 +02:00
Mark Berezovsky
ad66c6bf08 Fix #9864: Decrease $maxDelay in Throttler.php 
Signed-off-by: Mark Berezovsky <xpnf@yandex.ru>
 2018-06-15 04:58:08 +03:00
Nextcloud bot
84a1c915e6
[tx-robot] updated from transifex 2018-06-15 00:12:49 +00:00
Daniel Calviño Sánchez
00c3a7eb4c Fix HTTP client given options being overriden by default options 
According to the array_merge documentation, "If the input arrays have
the same string keys, then the later value for that key will overwrite
the previous one." Thus, the default options must be the first parameter
passed to array_merge.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-06-14 21:36:04 +02:00
Julius Härtl
ceee91d9d4
Add info message if an exception occurs during the svg to png conversion 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-14 17:36:02 +02:00
Nextcloud bot
479e31997f
[tx-robot] updated from transifex 2018-06-14 00:13:06 +00:00
John Molakvoæ
90f9e0a88e
Merge pull request #9846 from nextcloud/feature/noid/add_stricter_csps 
Add stricter CSPs
 2018-06-13 23:19:10 +02:00
Morris Jobke
e2795b0202
Merge pull request #9859 from nextcloud/fix/noid/iconcontroller_timing_fix 
Fix possible test timing issues in IconController
 2018-06-13 23:14:42 +02:00
Roeland Jago Douma
e4db293cc1
Fix possible test timing issues in IconController 
Since the response now handles the caching. We need to provide a default
ITimeFactory mock. Else you might have failing tests.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-13 22:54:08 +02:00
Roeland Jago Douma
699049be1b
Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-backup-dirs 
Background job to clean up old backups of the updater
 2018-06-13 22:16:24 +02:00
John Molakvoæ (skjnldsv)
fd4330c38f
Fix indent 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 22:07:40 +02:00
Morris Jobke
b6457d9968
Merge pull request #9852 from nextcloud/feature/noid/merge-setup-checks-into-one-controller 
Merge all setup checks into one controller
 2018-06-13 20:36:14 +02:00
John Molakvoæ (skjnldsv)
16ec9d9670
Removed old route, fix tests and fix var type 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
156da29cea
Avatar imagick bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
4432cfd445
Embedded font 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
eb3f43a0b5
Fixed since requirement 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:05 +02:00
John Molakvoæ (skjnldsv)
03d6be0877
Added new tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
ed4309ce41
Unify colour algorithm output 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
eea6f74ca4
Controller tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
c1766b2abc
Use base image size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
adf3856d35
Return Svg avatars 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
John Molakvoæ (skjnldsv)
8e3382ceda
Fix avatar generator centering 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 18:46:04 +02:00
Morris Jobke
dc4c158ea7
Background job to clean up old backups of the updater 
* a one-time job gets scheduled after each update via a repair job
* the job remove all directories inside data/updater-INSTANCEID/backups except the 3 most recent ones (determined by mtime of the folder)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 17:43:29 +02:00
Morris Jobke
9c4aecb539
Merge all setup checks into one controller 
* renamed hasMissingIndexes to missingIndexes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 15:25:08 +02:00
Roeland Jago Douma
b38fa573e1
Add stricter CSPs 
* Deprecate our default CSP
* Add strict CSP that is always our strictest setting
* Add strict eval CSP (disable unsafe-eval)
* Add strict inline CSP (disables inline styles)

This is just to move forward and have a incremental improvement of our
CSP

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-13 14:47:57 +02:00
Morris Jobke
cd87a40eb3
Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks 
Merge tips & tricks section into setup checks
 2018-06-13 13:18:40 +02:00
Morris Jobke
6756c8d2b5
Merge pull request #9850 from nextcloud/fix/noid/setup-check-empty-index 
Fix wrong hint about missing indexes
 2018-06-13 12:21:02 +02:00
Morris Jobke
4a0b7aaf6c
Merge tips & tricks section into setup checks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 12:05:38 +02:00
Morris Jobke
624d191ef6
Fix wrong hint about missing indexes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-06-13 11:56:43 +02:00
John Molakvoæ
c4a2632d95
Merge pull request #9833 from nextcloud/dependabot/composer/build/integration/phpunit/phpunit-approx-6.5 
Update phpunit/phpunit requirement to ~6.5 in /build/integration
 2018-06-13 08:40:45 +02:00
John Molakvoæ (skjnldsv)
49d0f0c499
Fixed phpunit Test class 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-13 07:24:41 +02:00
dependabot[bot]
9a32592aca
Update phpunit/phpunit requirement to ~6.5 in /build/integration 
Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-6.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/commits/6.5.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-06-13 07:24:40 +02:00
Nextcloud bot
5ecfd80f07
[tx-robot] updated from transifex 2018-06-13 00:12:59 +00:00
John Molakvoæ
ed25fc3440
Merge pull request #9834 from nextcloud/copy-fix 
Copyright fix, changed vue settings output name and fixes template name
 2018-06-12 11:28:57 +02:00
John Molakvoæ (skjnldsv)
885b6be733
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-12 11:13:24 +02:00
Morris Jobke
dbd4da2e91
Merge pull request #9828 from nextcloud/gc-s3-list 
Fix listing s3 objects when using google cloud aws compatibility
 2018-06-12 10:39:28 +02:00
John Molakvoæ (skjnldsv)
27e68964a0
Indent fix and copy2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-12 10:32:18 +02:00
John Molakvoæ (skjnldsv)
62667914a0
Copyright fix, changed vue settings output name and fixes template name 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-12 10:26:53 +02:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Robin Appelman
47fd3499a3
Fix listing s3 objects when using google cloud aws compatibility 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-11 17:10:57 +02:00
Morris Jobke
61fa284d07
Merge pull request #9473 from nextcloud/dav-upload-no-partfile-lock 
properly lock the target file on dav upload when not using part files
 2018-06-11 16:54:05 +02:00