mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
40,471 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

40471 Commits

Author SHA1 Message Date
Christopher Bartz bbd8797f1e Remove tmpFiles Array in Swift.php 
tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.
 2017-08-14 17:35:04 +02:00
Morris Jobke 5b2d6b080f Merge pull request #6080 from nextcloud/header-bottom-border 
Add buttom border for header
 2017-08-14 17:29:03 +02:00
Robin Appelman ca3aef0486 Merge pull request #5872 from nextcloud/swift-filter-dot 
Filter magic dot object when swift directory
 2017-08-14 15:11:53 +02:00
Morris Jobke 317521c7e7 Merge pull request #6091 from nextcloud/authpage-design 
Add heading to account access page
 2017-08-14 14:27:09 +02:00
Morris Jobke 95b7fa306e Merge pull request #6097 from nextcloud/issue-6078-accounts-table-missing 
Make sure the accounts table exists
 2017-08-14 12:14:09 +02:00
Morris Jobke 44c6745159 Remove quotes around device name 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 11:48:56 +02:00
Morris Jobke ba8d26a150 Merge pull request #6090 from nextcloud/federationscope-title-bold 
Bold federation scope title in dropdown menu, as intended
 2017-08-14 11:47:47 +02:00
Morris Jobke 3d1f6a041d Fix federation scope dropdown 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 11:16:24 +02:00
Morris Jobke 228baa45fd Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 11:11:18 +02:00
Morris Jobke bd43758118 Highlight client identifier in auth grant page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 10:42:19 +02:00
Joas Schilling 1c2f628d8e
Fix headers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-14 09:53:48 +02:00
Joas Schilling 601f795122
Make sure the accounts table exists 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-14 09:52:41 +02:00
Morris Jobke 995ddc61d1 Add buttom border for header 
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-14 09:40:55 +02:00
Nextcloud bot d1f3e1de96
[tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot ded780a45a
[tx-robot] updated from transifex 2017-08-13 00:08:14 +00:00
Jan-Christoph Borchardt ebdfcb1fe3 Add heading to account access page 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-12 19:29:49 +02:00
Jan-Christoph Borchardt faea9cb294 Shorten text of untrusted domain error 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-12 19:01:42 +02:00
Morris Jobke 83b0191017 fix design of the track trace 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-12 18:48:48 +02:00
Jan-Christoph Borchardt 9f67fb86c8 Improve design of various error messages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-12 18:48:48 +02:00
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