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

46570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonas Sulzer
87c3f79399
make .button inline-block 
fix #3752

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-10-30 13:03:20 +01:00
Arthur Schiwon
49456e42f9
do not run into UniqueConstraintViolationException 
… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-30 12:12:03 +01:00
Julius Härtl
5a73a9b9de
Fix injection to get the user id 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:41:56 +01:00
Julius Härtl
e6952edaf4
Don't enforce merged property 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:37:11 +01:00
Rayn0r
82c2c10b25 adapted automated test for autocomplete changes 
Signed-off-by: Rayn0r <Andre.Weidemann@web.de>
 2018-10-30 11:36:16 +01:00
Rayn0r
85eb43baff added possibility to disable autocomplete in login form 
Signed-off-by: Rayn0r <Andre.Weidemann@web.de>
 2018-10-30 11:36:16 +01:00
Roeland Jago Douma
75456b057d
Reset bruteforce on token refresh OAuth 
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 11:21:27 +01:00
Morris Jobke
dccfe4bf84
Merge pull request #12036 from olivermg/master 
Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
 2018-10-30 10:49:08 +01:00
Julius Härtl
a0d759b324
Add uuid/name entry to Remote/MailPlugin tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
cb463d73d5
Add name field to mail and remote results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
f116461d4b
Show one share method per contact for inaccurate results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
e8e898ede8
Use tab to complete selected entry to the share entry 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
7a65779316
Add local share if remote cloud id matches a local user ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
61af607525
Make enhancing entries with type property optional 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
192324e4de
Make dropdown height 6 1/2 entries 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
3313c0142d
Simplify share list text 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
fd08dd613a
Add talk icon 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
5059605c99
Increase max-width of the share autocompletion suggestions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
3e11515b9c
Merge contacts and add type of result to the UI 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
870e01518d
Add type to Remote and Mail plugins 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
8b92a6c9cb
Add type of properties to address book results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
06d8438fda
Group share suggestions by userid 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:34 +01:00
Julius Härtl
a1c6e44700
Add collaborators uuid to properly render the avatar and for later grouping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
e5cae301eb
Highlight search term in sharing results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
d7caf841df
Filter out generic remote result for local users 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
ce79e587e4
Filter out local users from address book remote searches 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
45d8aeb9f2
Remove federated sharing address books which are the same as local ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Julius Härtl
6dde7e1183
Improve share select list 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:32 +01:00
Morris Jobke
c9e6a99637
Merge pull request #12085 from nextcloud/add-gss-to-excluded-backends 
add global site selector as user back-end which doesn't support password confirmation
 2018-10-30 10:16:07 +01:00
Morris Jobke
31ccf8580a
Merge pull request #12070 from nextcloud/fix/noid/announce-chosen-uid 
announce the chosen uid (fixes wrong variable usage)
 2018-10-30 10:12:04 +01:00
Joas Schilling
9645e545b3 Fix JS namespace of files_external app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-30 09:43:26 +01:00
Oliver Wegner
401ca28f07 Adding handling of CIDR notation to trusted_proxies for IPv4 
Signed-off-by: Oliver Wegner <void1976@gmail.com>
 2018-10-30 09:15:42 +01:00
Roeland Jago Douma
aa77b4490c
Merge pull request #12000 from nextcloud/dependabot/npm_and_yarn/build/karma-3.1.1 
Bump karma from 2.0.4 to 3.1.1 in /build
 2018-10-30 08:52:40 +01:00
Nextcloud bot
9f99232865
[tx-robot] updated from transifex 2018-10-30 01:12:54 +00:00
Morris Jobke
13fe7b6fc1
Merge pull request #11627 from nextcloud/feature/noid/cli-remove-app 
Add occ app:remove CLI command
 2018-10-30 00:35:45 +01:00
Morris Jobke
0999f07964
Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies 
Fix setup check trusted proxies
 2018-10-29 23:38:37 +01:00
Morris Jobke
2d50478492
Merge pull request #12127 from nextcloud/fix/proper_folder_mimetype 
A folder should get a folder mimetype
 2018-10-29 23:28:39 +01:00
Roeland Jago Douma
90dc8fb42e
A folder should get a folder mimetype 
If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.

If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-29 21:35:08 +01:00
Morris Jobke
963d968f06
Merge pull request #12113 from nextcloud/fileinfo-getextension 
Add getExtension() to FileInfo
 2018-10-29 17:23:27 +01:00
Morris Jobke
76c31857cb
Merge pull request #12107 from nextcloud/fix/12086/no-unintentional-empty-attributes 
remove unneeded empty LDAP search attribute values
 2018-10-29 17:00:14 +01:00
Roeland Jago Douma
3aae3c82a4
Merge pull request #12041 from nextcloud/gridfixes 
Properly hide files when searching
 2018-10-29 16:12:44 +01:00
John Molakvoæ
c05e8acdb1
Merge pull request #12019 from nextcloud/icons-svg-api-fixes 
Move svg api endpoint
 2018-10-29 15:45:45 +01:00
Robin Appelman
e5c3e4b76f
Add getExtension() to FileInfo 
this is a fairly common operation so it makes sense to prevent having
to repeatedly implement it.

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-29 15:24:02 +01:00
Roeland Jago Douma
4a642fc004
Merge pull request #12106 from nextcloud/bugfix/noid/federated-settings-logo 
Fix logo path in personal federated sharing settings
 2018-10-29 14:54:20 +01:00
Roeland Jago Douma
f36e42e098
Merge pull request #12100 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.23.1 
Bump webpack from 4.22.0 to 4.23.1 in /settings
 2018-10-29 14:53:11 +01:00
John Molakvoæ (skjnldsv)
c0477afb5d
Properly hide files when searching 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-29 14:51:29 +01:00
Roeland Jago Douma
4807e9079e
Merge pull request #12097 from nextcloud/dependabot/npm_and_yarn/settings/vue-infinite-loading-2.4.0 
Bump vue-infinite-loading from 2.3.5 to 2.4.0 in /settings
 2018-10-29 14:31:45 +01:00
Roeland Jago Douma
956bd19d58
Merge pull request #12104 from nextcloud/move-acceptance-tests-that-crash-the-php-built-in-server-to-apache 
Move acceptance tests that crash the PHP built-in server to Apache
 2018-10-29 14:28:42 +01:00
Arthur Schiwon
d47e1513bc
remove unneeded empty search attribute values, fixes #12086 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-29 13:21:02 +01:00
Julius Härtl
4dda244ce2
Fix logo path in personal federated sharing settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 13:18:39 +01:00