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

46398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxence Lange
750196aa7f public interfaces FullTextSearch 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-@return mixed

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interfaces-fulltextsearch-2' into interfaces-fulltextsearch-2

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-10-30 18:24:15 +01:00
John Molakvoæ
3eb5ac9cff
Merge pull request #12138 from nextcloud/fix/3752/inline-block-button 
make .button inline-block
 2018-10-30 15:07:44 +01:00
Morris Jobke
b28a0c10bf
Merge pull request #11946 from nextcloud/bugfix/11945/fix-js-namespace-of-files-external 
Fix JS namespace of files_external app
 2018-10-30 14:57:57 +01:00
Roeland Jago Douma
c1698948b8
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth 
Reset bruteforce on token refresh OAuth
 2018-10-30 14:26:50 +01:00
Roeland Jago Douma
8b2b238d86
Merge pull request #12054 from nextcloud/fix/5212/interact-with-userobject 
LDAP: announce display name changes so that addressbook picks it up
 2018-10-30 13:38:16 +01:00
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
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
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
John Molakvoæ
c58b935bf5
Merge pull request #11993 from nextcloud/headings-standards 
Headings standard
 2018-10-29 13:15:55 +01:00
Julius Härtl
34a71f57fc
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 13:06:55 +01:00
dependabot[bot]
91d33054bb
Bump webpack from 4.22.0 to 4.23.1 in /settings 
Bumps [webpack](https://github.com/webpack/webpack) from 4.22.0 to 4.23.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.22.0...v4.23.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-29 11:59:23 +00:00
Roeland Jago Douma
0ee7ffcde1
Merge pull request #12099 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.23.1 
Bump webpack from 4.22.0 to 4.23.1 in /apps/oauth2
 2018-10-29 12:57:27 +01:00
Daniel Calviño Sánchez
565556b277 Move acceptance tests that crash the PHP built-in server to Apache 
The PHP built-in server can crash when certain actions are performed in
Nextcloud (but although the crash is triggered by Nextcloud it does not
seem to be a Nextcloud bug), which can lead to failures in the
acceptance tests that would have otherwise passed.

A crash of the PHP built-in server during an acceptance test can be
identified by the message "sh: 1: kill: No such process" in the
acceptance tests output; as the PHP built-in server crashed its process
does no longer exist when it is tried to be killed when the scenario
ends.

Although the crash has been observed in other tests too it is more
prevalent in the tests for tags and the theming app. In order to
reduce the false positives those tests are now run on Apache instead of
on the PHP built-in sever. However, the rest of tests are still run on
the PHP built-in server due to its lower resource consumption.

In order to run a feature or just a scenario using Apache it has to be
tagged with "@apache"; features or scenarios without that tag (the
default) will run on the PHP built-in server instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-29 12:38:42 +01:00
Daniel Calviño Sánchez
34f397fd22 Link the default Apache directory to the Nextcloud server in all runners 
In order to run the acceptance tests in Apache "/var/www/html" has to be
linked to the root directory of the Nextcloud server. Before this was
automatically done when launching the acceptance tests through
"./run.sh", but an explicit command was needed when run in Drone. Now
the linking was moved from "run.sh" to "run-local.sh", so it is
automatically done when run through "./run.sh" and in Drone, including
when running the tests for an app instead of for the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-29 12:38:42 +01:00
Julius Härtl
4b7ef668a4
Adjust accessibility app color replacement 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 12:09:44 +01:00
Julius Härtl
aec0a6c096
Fix icon cacher url matching 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 12:09:30 +01:00
John Molakvoæ (skjnldsv)
5c74423902
Move svg api endpoint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-29 11:45:13 +01:00
dependabot[bot]
8c202f3af1
Bump webpack from 4.22.0 to 4.23.1 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.22.0 to 4.23.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.22.0...v4.23.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-29 10:43:49 +00:00
John Molakvoæ
0c89dd2197
Merge pull request #12076 from trendzetter/patch-3 
Add missing tag
 2018-10-29 11:32:39 +01:00
Roeland Jago Douma
3aac778f9a
Merge pull request #12098 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.23.1 
Bump webpack from 4.22.0 to 4.23.1 in /apps/updatenotification
 2018-10-29 11:16:35 +01:00
dependabot[bot]
55f94695d0
Bump webpack from 4.22.0 to 4.23.1 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.22.0 to 4.23.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.22.0...v4.23.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-29 08:22:25 +00:00
Roeland Jago Douma
972f4191f4
Merge pull request #12096 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.23.1 
Bump webpack from 4.22.0 to 4.23.1 in /apps/accessibility
 2018-10-29 09:19:35 +01:00
Daniel Calviño Sánchez
95dc2ad13c Extract acceptance tests for tags to their own feature file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-29 08:40:05 +01:00
dependabot[bot]
5b1aa559c0
Bump vue-infinite-loading from 2.3.5 to 2.4.0 in /settings 
Bumps [vue-infinite-loading](https://github.com/PeachScript/vue-infinite-loading) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/PeachScript/vue-infinite-loading/releases)
- [Commits](https://github.com/PeachScript/vue-infinite-loading/compare/v2.3.5...v2.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-29 01:16:10 +00:00
Nextcloud bot
18fef12721
[tx-robot] updated from transifex 2018-10-29 01:13:07 +00:00
dependabot[bot]
0e750aa3c9
Bump webpack from 4.22.0 to 4.23.1 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.22.0 to 4.23.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.22.0...v4.23.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-28 18:28:05 +00:00
Morris Jobke
8c7432fa6d
Merge pull request #12063 from nextcloud/bring-the-browser-window-of-an-actor-to-the-foreground-when-acting-as-him 
Bring the browser window of an actor to the foreground when acting as him
 2018-10-28 13:57:46 +01:00