Commit Graph

40952 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 04d6dfa67c Bold federation scope title in dropdown menu, as intended
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-12 15:48:15 +02:00
Roeland Jago Douma 6b5c6e580b Merge pull request #6084 from nextcloud/brand-it
Brand it 🙈
2017-08-12 10:31:47 +02:00
Nextcloud bot a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Lukas Reschke e9ab7e4fc6
Brand it 🙈
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-11 15:47:24 +02:00
Lukas Reschke 1c88e59930 Merge pull request #5861 from nextcloud/shareinfo
Move shareinfo over to proper controller
2017-08-11 14:02:43 +02:00
Nextcloud bot c9612b9324
[tx-robot] updated from transifex 2017-08-11 00:08:20 +00:00
Roeland Jago Douma 8ea434d2d0 Merge pull request #6004 from nextcloud/forward-5902-repair-drop-account-terms-on-oc-migration
[13] Repair step: drop account terms on oc migration
2017-08-10 21:18:06 +02:00
Morris Jobke 43facdb95f Merge pull request #5616 from nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-attempt
LDAP Wizard: do not attempt to recognise cert issue by using LDAPTLS_REQCERT
2017-08-10 21:06:14 +02:00
Morris Jobke d3cb4a7965 Merge pull request #6065 from nextcloud/mysql5.5
Add CI job for mysql 5.5
2017-08-10 18:12:42 +02:00
Roeland Jago Douma 685f272212
Add unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 16:25:58 +02:00
Roeland Jago Douma 31af5cc321
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 14:27:35 +02:00
Roeland Jago Douma d34bd3f17c
Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 14:27:35 +02:00
Bjoern Schiessle bae5be3dc1
add prefix to user and system keys to avoid name collisions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-10 14:27:35 +02:00
Bjoern Schiessle 9524badccc
extend the identity proof manager to allow system wide key pairs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-10 14:27:35 +02:00
Roeland Jago Douma ca121b7561 Merge pull request #5981 from nextcloud/fix-preview-of-theming
Fix preview of theming
2017-08-10 14:23:03 +02:00
Roeland Jago Douma c9d2e31d52
Remove old code + add Middleware
* Add proper middleware for shareinfo
* Remove old shareinfo routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 13:49:09 +02:00
Roeland Jago Douma 8a539ec0f6
Move shareinfo over to proper controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 13:49:06 +02:00
Morris Jobke f8d5dbcdb5 Add CI job for mysql 5.5
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-10 13:49:01 +02:00
Roeland Jago Douma cc0c430d25 Merge pull request #6056 from nextcloud/mysql5.6
Add CI job for mysql 5.6
2017-08-10 13:46:25 +02:00
Daniel Calviño Sánchez b16ce1b4ba Fix preview of theming
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:58 +02:00
Daniel Calviño Sánchez 5999b212d1 Refactor reloadStylesheets to receive absolute URLs
This is a preparatory step for a following change in which
reloadStylesheets will have to be able to receive absolute URLs.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez db52e861dd Provide "server.css" URL in ThemingController response
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez 986dffdae4 Split updateStylesheet tests for success and error
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez d7e45d45c4 Unify DataResponse format with its uses in the rest of the file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez 0c8627a7ee Add acceptance tests for setting the color in the Theming app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez 63004c8ce5 Add getter for the timeout multiplier
In some cases the acceptance tests have to explicitly wait for something
to happen without using the "find" method from the actor; in those cases
the timeout multiplier needs to be taken into account too, so the test
cases must be able to retrieve it from the actor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 12:37:56 +02:00
Joas Schilling b9b88aa666
Don't lock in the appdata_ directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-10 12:35:33 +02:00
Joas Schilling 5515c7b2c0
Still throw a locked exception when the path is not relative to $user/files/
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-10 11:58:01 +02:00
Morris Jobke 3dc1bcd4c1 Merge pull request #6052 from nextcloud/fix_jail_copy
Fix copy from jailed storage
2017-08-10 10:21:56 +02:00
Roeland Jago Douma 073216e827 Merge pull request #6057 from nextcloud/fix-require-once
Fix require once for actionInclude
2017-08-10 07:52:21 +02:00
Nextcloud bot 0ef9f943b2
[tx-robot] updated from transifex 2017-08-10 00:08:15 +00:00
Morris Jobke 5aa25fcdd5 Fix require once for actionInclude
* regression from #5791

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:51:49 +02:00
Morris Jobke 7904404842 Add CI job for mysql 5.6
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:17:25 +02:00
Morris Jobke 0b1a1a58e6 Merge pull request #6051 from nextcloud/redis-cluster
Enable redis cluster CI step
2017-08-09 23:03:50 +02:00
Morris Jobke f83a783d91 Fix redis-cluster support on drone
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 22:45:25 +02:00
Morris Jobke 3b955a1625 Merge pull request #5791 from nextcloud/add-php7.2-tests
[CI] Add PHP 7.2 testing container
2017-08-09 22:08:02 +02:00
Roeland Jago Douma c6f6413bb1
Fix ldap tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 21:10:15 +02:00
Roeland Jago Douma c81e79f8b9
Fix files_sharing CacheTests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:15:27 +02:00
Roeland Jago Douma 1ea7f14f0a
Fix SessionTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:13:54 +02:00
Roeland Jago Douma 26bf0ca9d4
Fix RepairMimeTypeTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:04:57 +02:00
Roeland Jago Douma db27bbf90d
Fix CacheTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:01:09 +02:00
Roeland Jago Douma ba7cf03daf
Fix LostControllerTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:13 +02:00
Roeland Jago Douma 9717cdfb9e
If there is no content don't error
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:13 +02:00
Roeland Jago Douma 459ae6d94a
User proper anonymous function
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:12 +02:00
Roeland Jago Douma 8b0051eb40
Fix encryption test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:08 +02:00
Roeland Jago Douma 3bd104ef7c
Fix LoginController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:12:02 +02:00
Lukas Reschke 70d42afb93
Use non-deprecated INTL_IDNA_VARIANT_UTS46
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:02 +02:00
Lukas Reschke c78e999b21
Make definition compatible
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:02 +02:00
Lukas Reschke 0857780eb0
Update PHP 7.2 container
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:01 +02:00
Lukas Reschke e9dc4f107a
Make declaration compatible
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:01 +02:00