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

46753 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Julius Härtl
d110f0c29c
Also use default label if share label is null 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 16:04:51 +01:00
Morris Jobke
9eb5ab9e70
Merge pull request #12317 from nextcloud/deps/noid/es6-polyfill 
Add es6-shim as polyfill and minify core vendor scripts
 2018-11-07 16:03:33 +01:00
Julius Härtl
8ed945a519
Only show label if the shareWith value is relevant 
For local users / groups the display name is enough to show, we just need details for email/remote shares

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 15:40:50 +01:00
Morris Jobke
836ba4f419
Merge pull request #11569 from nextcloud/bug-11514/hide-header-actions-for-filedrops 
Hides the header actions for file drops
 2018-11-07 15:01:37 +01:00
Georg Ehrke
30d13bb760
cache webcal calendars on server 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-11-07 13:25:14 +01:00
Joas Schilling
375589b274
Fix the comments UI and activities for space-mentions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-07 12:33:44 +01:00
Joas Schilling
10ba0bed8a
Match mentions when the username is wrapped in quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-07 12:33:44 +01:00
Morris Jobke
b56cb41e2f
Merge pull request #12328 from nextcloud/more-icon-move 
Fix missing dot before class name
 2018-11-07 12:28:36 +01:00
Julius Härtl
c48722c201
Fix file move tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 11:14:19 +01:00
Julius Härtl
2ba519a5d4
Add es6-shim as polyfill and minify underscore.js 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-07 11:14:18 +01:00
Morris Jobke
463dfb50d9
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:25:36 +01:00
Morris Jobke
9669d451e3
Reduce function calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Morris Jobke
ca93d73f97
Improve text to be better translatable and use CSS instead of HTML for bold text 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Morris Jobke
68d39e4b92
Fix indentation of CSS 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Michael Weimann
c572c669e5
Adapts the code to the new master state 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:20 +01:00
Michael Weimann
e0ab2902d6
Moves the terms of service into a dialog 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
95a19bdfdd
Inlines the share note for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
08e681b221
Inlines the share note for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
16f379b974
Hides the header actions for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Nextcloud bot
c26d847d19
[tx-robot] updated from transifex 2018-11-07 01:12:29 +00:00
Daniel Calviño Sánchez
b2cc2d6023 Add "password" parameter to the response data of link shares 
Due to legacy reasons the password of link shares was returned in the
"share_with" and "share_with_displayname" parameters of the response
data. Now a proper "password" parameter is returned too; the old
"share_with" and "share_with_displayname" parameters are kept, although
deprecated, and they will be removed in a future version of Nextcloud.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-06 23:48:28 +01:00
Roeland Jago Douma
85d2c7ec38
Merge pull request #12312 from nextcloud/bugfix/11527/fix-index-name 
Fix index names
 2018-11-06 21:55:39 +01:00