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

46775 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
6bace99aa1
Fix UniqueConstraintViolationException while insert into files_external config tables 
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-14 15:24:03 +01:00
Morris Jobke
859dd1e742
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist 
Catch UniqueConstraintViolationException inside insertIfNotExist
 2018-11-12 13:41:00 +01:00
Morris Jobke
8e60006744
Exception is not thrown anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 12:22:04 +01:00
Morris Jobke
0fe2a4f6cd
Merge pull request #12408 from nextcloud/bugfix/noid/icon-cacher-update 
Make sure to always load the latest icons-vars.css file
 2018-11-12 12:16:43 +01:00
Morris Jobke
3117e996be
Merge pull request #12384 from nextcloud/fix/12357/public-share-scrollbar 
Reduces the footer link padding
 2018-11-12 11:16:53 +01:00
Julius Härtl
26b160cc43
Make sure to always load the latest icons-vars.css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-12 11:00:56 +01:00
John Molakvoæ
d6de8ebeb2
Merge pull request #12389 from nextcloud/fix-dav-groupid 
Fix displayName return of dav groups request
 2018-11-12 09:49:24 +01:00
Nextcloud bot
48395baa7e
[tx-robot] updated from transifex 2018-11-12 01:12:49 +00:00
Morris Jobke
63249616c3
Merge pull request #12388 from nextcloud/inline-input-confirm-margin-fix 
Fix inline input confirm margin
 2018-11-11 23:34:33 +01:00
Morris Jobke
bbd51f4ddb
Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix 
Fixes the grid toggle for none folder shares
 2018-11-11 23:30:14 +01:00
Nextcloud bot
6dc2b03ebe
[tx-robot] updated from transifex 2018-11-11 01:13:10 +00:00
John Molakvoæ (skjnldsv)
e18548ce75
Fix displayName return of dav groups request 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-10 13:34:07 +01:00
John Molakvoæ (skjnldsv)
dbcea3316a
Fix inline input confirm margin 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-10 09:48:16 +01:00
Nextcloud bot
cc96b93f95
[tx-robot] updated from transifex 2018-11-10 01:12:25 +00:00
Michael Weimann
04b9154c9a
Fixes the grid toggle for none folder shares 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-09 22:28:19 +01:00
Michael Weimann
b4b96fc23f
Fixes the footer #12357 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-09 21:23:02 +01:00
Morris Jobke
b7a59fb56a
Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version 
Check for compatible apps from the appstore fails
 2018-11-09 16:48:12 +01:00
Morris Jobke
5273639d0e
Add deprecation message ofr insertIfNotExist 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-09 12:13:30 +01:00
Morris Jobke
230e93f575
Catch UniqueConstraintViolationException inside insertIfNotExist 
This is the most common case for the usage of this method.

See also https://github.com/nextcloud/server/issues/12369 and the linked tickets.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-09 10:38:20 +01:00
Joas Schilling
eff7a9c904
Adjust unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-09 10:24:34 +01:00
Nextcloud bot
da57aaf814
[tx-robot] updated from transifex 2018-11-09 01:12:25 +00:00
Morris Jobke
bd7e983080
Merge pull request #12349 from nextcloud/feature/noid/populate-notification-message-with-the-comment 
Populate the mention-notification with the actual message
 2018-11-08 22:47:55 +01:00
Morris Jobke
fe261c4866
Merge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu 
Adjust acceptance tests to changes in public share page menu
 2018-11-08 22:44:26 +01:00
Morris Jobke
03b140c008
Improve style of incompatible apps list 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-08 15:28:58 +01:00
blizzz
42121fe4d7
Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames 
do not offer to change display name or password, if not possible.
 2018-11-08 15:13:24 +01:00
Joas Schilling
b04a44babd
Use the version number when checking the appstore for compatible updates 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 14:52:28 +01:00
Morris Jobke
90a35aab29
Fix overlapping update button in notifications 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-08 14:19:46 +01:00
Daniel Calviño Sánchez
b5977bef2e Adjust acceptance tests to changes in public share page menu 
The "Download" item in the menu of public share pages is no longer shown
in wide (>768px) windows (although the element is in the DOM and shown
if resized to a narrow window).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-08 13:19:15 +01:00
Morris Jobke
13d7a2746c
Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1 
15.0.0 beta 1
 2018-11-08 13:12:30 +01:00
Joas Schilling
1b4f1b9a63
Populate the mention-notification with the actual message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 12:10:09 +01:00
Morris Jobke
8dff57deb6
15.0.0 beta 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-08 11:22:01 +01:00
Morris Jobke
78fd8ab0fd
Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated 
Basic CSP no longer deprecated
 2018-11-08 11:14:41 +01:00
Morris Jobke
0fb74aff5a
Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars 
cache webcal calendars on server
 2018-11-08 10:54:18 +01:00
Roeland Jago Douma
58345e02d2
Basic CSP no longer deprecated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-08 10:37:48 +01:00
Roeland Jago Douma
25fe324f41
Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup 
Clear avatar cache with frontend repair
 2018-11-08 10:28:09 +01:00
John Molakvoæ (skjnldsv)
a9eef37456
Clear avatar cache with frontend repair 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-08 08:31:21 +01:00
Nextcloud bot
55f0c2ac3b
[tx-robot] updated from transifex 2018-11-08 01:12:18 +00:00
Roeland Jago Douma
6f5181f811
Merge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontent 
Add fix for IE11 flexbox height bug
 2018-11-07 22:38:10 +01:00
Arthur Schiwon
505722cc0d
do not offer to change display name or password, if not possible. 
Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-11-07 22:37:41 +01:00
Roeland Jago Douma
a8fb7e148d
Merge pull request #12316 from nextcloud/public-download-button-fix 
Better primary visual on public pages
 2018-11-07 22:31:31 +01:00
Roeland Jago Douma
3e8ea395e9
Merge pull request #12340 from nextcloud/ie11-function-fix 
Remove arrow function for ie compatibility
 2018-11-07 20:25:02 +01:00
Julius Härtl
ca9e52b135
Add fix for IE11 flexbox height bug 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 19:51:00 +01:00
John Molakvoæ (skjnldsv)
4d63c5e7d3
Remove arrow function for ie compatibility 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-07 17:51:06 +01:00
Morris Jobke
f77e24e725
Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-title 
Also use default label if share label is null
 2018-11-07 16:58:41 +01:00
Morris Jobke
35a9c51efa
Merge pull request #12334 from nextcloud/bugfix/12164/share-dialog-userid 
Only show label if the shareWith value is relevant
 2018-11-07 16:56:55 +01:00
John Molakvoæ (skjnldsv)
f54b201f23
Better primary visual on public pages 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-07 16:30:59 +01:00
Morris Jobke
7940a79a41
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares 
Add "password" parameter to the response data of link shares
 2018-11-07 16:29:05 +01:00
Morris Jobke
ab3543380c
Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces 
Comment mentions with spaces
 2018-11-07 16:27:36 +01:00
Morris Jobke
11f8dcb59c
Merge pull request #12329 from nextcloud/feature/noid/test-unique-constraint-violation 
Add test that unique constraint is working
 2018-11-07 16:16:01 +01:00
Georg Ehrke
712b79e9bf
update 3rdparty to fix phan error message 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-11-07 16:11:05 +01:00