]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoUpdate login flow redirection 4588/head
Mario Danic [Fri, 28 Apr 2017 21:33:09 +0000 (23:33 +0200)]
Update login flow redirection

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4694 from nextcloud/fix_4676
Christoph Wurst [Thu, 4 May 2017 15:21:07 +0000 (17:21 +0200)]
Merge pull request #4694 from nextcloud/fix_4676

Load proper fonts in guest.css

7 years agoMerge pull request #4681 from nextcloud/link_radio
Morris Jobke [Thu, 4 May 2017 14:26:01 +0000 (11:26 -0300)]
Merge pull request #4681 from nextcloud/link_radio

Make read/write options in sharing view radiobuttons

7 years agoMerge pull request #4693 from nextcloud/fix_4644
Roeland Jago Douma [Thu, 4 May 2017 12:37:45 +0000 (14:37 +0200)]
Merge pull request #4693 from nextcloud/fix_4644

Do not reload the filelist on first open

7 years agoLoad proper fonts in guest.css 4694/head
Roeland Jago Douma [Thu, 4 May 2017 11:42:58 +0000 (13:42 +0200)]
Load proper fonts in guest.css

Fixes #4676

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4690 from nextcloud/fix-igroup-since
Morris Jobke [Thu, 4 May 2017 11:42:00 +0000 (08:42 -0300)]
Merge pull request #4690 from nextcloud/fix-igroup-since

Documentation fix IGroup::getDisplayName is available since version 12

7 years agoDo not reload the filelist on first open 4693/head
Roeland Jago Douma [Thu, 4 May 2017 11:23:04 +0000 (13:23 +0200)]
Do not reload the filelist on first open

Fixes: #4644
Without this patch the filelist would always reload. However since not
all the correct data was set yet it would often:

1. fireoff a propfind to ../webdav/
2. fireoff a propfind to ../webdav/<PATH>

When just opening the file list those are the same so the result is just
fine. However if opening a direct link it means that there is a race
condition on which finishes first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4689 from nextcloud/fix-password-protected-mail-shares
Björn Schießle [Thu, 4 May 2017 10:19:36 +0000 (12:19 +0200)]
Merge pull request #4689 from nextcloud/fix-password-protected-mail-shares

check password for mail shares as well

7 years agoIGroup::getDisplayName is available version 12, not 11 (9.2) 4690/head
Julius Härtl [Thu, 4 May 2017 10:06:03 +0000 (12:06 +0200)]
IGroup::getDisplayName is available version 12, not 11 (9.2)

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agocheck password for mail shares as well 4689/head
Bjoern Schiessle [Thu, 4 May 2017 09:20:20 +0000 (11:20 +0200)]
check password for mail shares as well

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoFix event firing 4681/head
Roeland Jago Douma [Thu, 4 May 2017 07:22:21 +0000 (09:22 +0200)]
Fix event firing

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissions
Morris Jobke [Thu, 4 May 2017 03:09:27 +0000 (00:09 -0300)]
Merge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissions

Revert "fix permissions of mountpoints"

7 years agoRevert "fix permissions of mountpoints" 4684/head
Morris Jobke [Thu, 4 May 2017 03:09:09 +0000 (00:09 -0300)]
Revert "fix permissions of mountpoints"

7 years agoMerge pull request #4682 from nextcloud/try-to-start-browser-sessions-again-when...
Morris Jobke [Thu, 4 May 2017 03:02:18 +0000 (00:02 -0300)]
Merge pull request #4682 from nextcloud/try-to-start-browser-sessions-again-when-they-fail-in-acceptance-tests

Try to start browser sessions again when they fail in acceptance tests

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 4 May 2017 00:07:29 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoAdd radio class to read/write sharing options and 1px left adjustment
Felix A. Epp [Wed, 3 May 2017 23:34:29 +0000 (01:34 +0200)]
Add radio class to read/write sharing options and 1px left adjustment

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoFix read-only label id
Felix A. Epp [Wed, 3 May 2017 23:32:52 +0000 (01:32 +0200)]
Fix read-only label id

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoMake files drop more permanent
Roeland Jago Douma [Thu, 9 Mar 2017 12:56:27 +0000 (13:56 +0100)]
Make files drop more permanent

Implement the suggestions from #2207

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoSet timeout multiplier to 10 for acceptance tests run by Drone 4682/head
Daniel Calviño Sánchez [Wed, 3 May 2017 15:29:37 +0000 (17:29 +0200)]
Set timeout multiplier to 10 for acceptance tests run by Drone

Sometimes, acceptance tests run by Drone fail due to a timeout when
starting the web browser sessions. Increasing the timeout should
minimize the possibility of the failure happening, although it can not
guarantee that it will not happen. A timeout multiplier of 10 was set
just because it looks like a reasonable margin of time, although it is
not based on any hard data.

The timeout multiplier affects too the timeout used when finding
elements. Like when starting a session, increasing the find timeout
simply gives the acceptance tests more time to find the objects before
giving up, so it does not change their behaviour when successful and can
also prevent failures due to default timeouts being too low for a
strained system.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd option to acceptance test runners to set a custom timeout multiplier
Daniel Calviño Sánchez [Wed, 3 May 2017 15:24:30 +0000 (17:24 +0200)]
Add option to acceptance test runners to set a custom timeout multiplier

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoTry again to start browser sessions when they fail
Daniel Calviño Sánchez [Wed, 3 May 2017 10:53:02 +0000 (12:53 +0200)]
Try again to start browser sessions when they fail

Starting a session for an Actor can fail, typically, due to a timeout
connecting with the web browser. Now if the session fails to start it
will be tried again up to "actorTimeoutMultiplier" times in total before
giving up.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoGeneralize attribute name
Daniel Calviño Sánchez [Wed, 3 May 2017 10:45:52 +0000 (12:45 +0200)]
Generalize attribute name

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoFix exponential increase of timeout when finding ancestor elements
Daniel Calviño Sánchez [Wed, 3 May 2017 10:34:04 +0000 (12:34 +0200)]
Fix exponential increase of timeout when finding ancestor elements

The timeout passed to the "find" method was multiplied by the
"findTimeoutMultiplier" attribute. However, as "find" used
"findAncestor" and "findAncestor", in turn, used "find" itself the
timeout was increased exponentially for ancestor elements. Now "find"
was split in "find" and "findInternal"; the first method is the public
one and modifies the given parameters as needed and then calls the
second method, private, that performs the find itself.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 3 May 2017 00:07:31 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4662 from nextcloud/remove-named-selectors-from-acceptance-tests
Morris Jobke [Tue, 2 May 2017 23:44:23 +0000 (20:44 -0300)]
Merge pull request #4662 from nextcloud/remove-named-selectors-from-acceptance-tests

Remove named selectors from acceptance tests

7 years agoMerge pull request #4545 from individual-it/access-control-3726
blizzz [Tue, 2 May 2017 22:21:40 +0000 (00:21 +0200)]
Merge pull request #4545 from individual-it/access-control-3726

show error message when "files-drop" upload fails

7 years agoMerge pull request #4623 from nextcloud/fileinfo-mount-permissions
Morris Jobke [Tue, 2 May 2017 20:28:33 +0000 (17:28 -0300)]
Merge pull request #4623 from nextcloud/fileinfo-mount-permissions

fix permissions of mountpoints

7 years agoMerge pull request #4667 from nextcloud/split-up-more-integration-tests
Morris Jobke [Tue, 2 May 2017 20:27:37 +0000 (17:27 -0300)]
Merge pull request #4667 from nextcloud/split-up-more-integration-tests

Split up sharing-v1-part2.feature to avoid timeouts

7 years agoMerge pull request #4669 from nextcloud/checkers
Morris Jobke [Tue, 2 May 2017 20:27:00 +0000 (17:27 -0300)]
Merge pull request #4669 from nextcloud/checkers

Consolidate all the code checkers into one job

7 years agoMerge pull request #4665 from nextcloud/enable-redis
Morris Jobke [Tue, 2 May 2017 20:16:19 +0000 (17:16 -0300)]
Merge pull request #4665 from nextcloud/enable-redis

Add redis support to our CI jobs

7 years agoMerge pull request #4620 from nextcloud/preview-error-handling
Roeland Jago Douma [Tue, 2 May 2017 19:49:14 +0000 (21:49 +0200)]
Merge pull request #4620 from nextcloud/preview-error-handling

better handling of preview generation errors

7 years agoMerge pull request #4664 from nextcloud/redis-sample-config.php
Lukas Reschke [Tue, 2 May 2017 19:46:34 +0000 (21:46 +0200)]
Merge pull request #4664 from nextcloud/redis-sample-config.php

Improve documentation for redis cluster

7 years agoMerge pull request #4611 from nextcloud/js-use-dot-notation
Roeland Jago Douma [Tue, 2 May 2017 19:44:44 +0000 (21:44 +0200)]
Merge pull request #4611 from nextcloud/js-use-dot-notation

Use dot notation for array access - JSLint recommendation

7 years agoConsolidate all the code checkers into one job 4669/head
Morris Jobke [Tue, 2 May 2017 19:04:09 +0000 (16:04 -0300)]
Consolidate all the code checkers into one job

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd redis support to our CI jobs 4665/head
Morris Jobke [Tue, 2 May 2017 15:44:54 +0000 (12:44 -0300)]
Add redis support to our CI jobs

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoSplit up sharing-v1-part2.feature to avoid timeouts 4667/head
Morris Jobke [Tue, 2 May 2017 15:55:29 +0000 (12:55 -0300)]
Split up sharing-v1-part2.feature to avoid timeouts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoImprove documentation 4664/head
Morris Jobke [Tue, 2 May 2017 15:42:06 +0000 (12:42 -0300)]
Improve documentation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu
Lukas Reschke [Tue, 2 May 2017 15:02:16 +0000 (17:02 +0200)]
Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu

Do not show an email action for contacts with emtpy email addresses

7 years agoMerge pull request #4636 from nextcloud/jquery-migrate-browser
Lukas Reschke [Tue, 2 May 2017 15:01:27 +0000 (17:01 +0200)]
Merge pull request #4636 from nextcloud/jquery-migrate-browser

Remove dependency on jquery-migrate.js for browser detection

7 years agoMerge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes
Lukas Reschke [Tue, 2 May 2017 14:08:11 +0000 (16:08 +0200)]
Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes

Hide 2FA backup codes if no other 2FA providers are enabled

7 years agoMerge pull request #4657 from nextcloud/add_caching_imageexport
Roeland Jago Douma [Tue, 2 May 2017 13:57:29 +0000 (15:57 +0200)]
Merge pull request #4657 from nextcloud/add_caching_imageexport

Add caching imageexport

7 years agoMerge pull request #4651 from nextcloud/fix_appfetcher_update
Morris Jobke [Tue, 2 May 2017 13:45:04 +0000 (10:45 -0300)]
Merge pull request #4651 from nextcloud/fix_appfetcher_update

Make sure the AppFetcher fetches the new applist from the appstore

7 years agoReplace "named" Mink selectors with "named_exact" Mink selectors 4662/head
Daniel Calviño Sánchez [Tue, 2 May 2017 12:33:34 +0000 (14:33 +0200)]
Replace "named" Mink selectors with "named_exact" Mink selectors

The "named" Mink selector first tries to find an exact match for its
locator and then, if not found, tries to find a partial match. Besides
other harder to track problems (see comment in the commit in which the
"content" locator was removed), this could cause, for example, finding
an action link titled "Favorited" when looking for the action link
titled "Favorite" (that is, one that conveys the opposite state to the
one found).

Although currently all the acceptance tests are compatible with both the
"named" and the "named_exact" Mink selectors the predefined locators are
modified to use the "named_exact" Mink selector to make them more
future-proof; the "named" Mink selector can still be used if needed
through the "customSelector" method in the builder object.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoRemove "content" locator from acceptance tests
Daniel Calviño Sánchez [Tue, 2 May 2017 10:49:27 +0000 (12:49 +0200)]
Remove "content" locator from acceptance tests

The "content" locator uses the "named" Mink selector and the "content"
Mink locator to find the element. The "named" Mink first tries to find
the elements whose content match exactly the given content but, if none
is found, then it tries to find elements that just contain the given
content.

This behaviour can lead to hard to track issues. Finding the exact match
and, if not found, finding the partial match is done in quick
succession. In most cases, when looking for an exact match the element
is already there, it is returned, and everything works as expected. Or
it may not be there, but then it is not there either when finding the
partial match, so no element is returned, and everything works as
expected (that is, the actor tries to find again the element after some
time).

However, it can also happen that when looking for an exact match there
is no element yet, but it appears after trying to find the exact match
but before trying to find the partial match. In that situation the
desired element would be returned along with its ancestors. However, as
only the first found element is taken into account and the ancestors
would appear first the find action would be successful, but the returned
element would not be the expected one. This is highly unlikely, yet
possible, and can cause sporadic failures in acceptance tests that,
apparently, work as expected.

Using a "named_exact" Mink selector instead of the "named" Mink selector
does not provide the desired behaviour in most cases either. As it finds
any element whose content matches exactly the given content, looking for
"Hello world" in "<div><p><a>Hello world</a></p></div>" would match the
"div", "p" and "a" elements; in that situation the "div" element would
be the one returned, when typically the "a" element would be the
expected one.

As it is error prone and easily replaceable by more robust locators the
"content" locator was removed from the predefined ones (although it can
still be used if needed through the "customSelector" method in the
builder object).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoHide 2FA backup codes if no other 2FA providers are enabled 4660/head
Christoph Wurst [Tue, 2 May 2017 12:40:44 +0000 (14:40 +0200)]
Hide 2FA backup codes if no other 2FA providers are enabled

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoDo not show an email action for contacts with emtpy email addresses 4659/head
Christoph Wurst [Tue, 2 May 2017 12:12:04 +0000 (14:12 +0200)]
Do not show an email action for contacts with emtpy email addresses

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agofix preview tests 4620/head
Robin Appelman [Tue, 2 May 2017 11:23:02 +0000 (13:23 +0200)]
fix preview tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoHandle more error cases
Morris Jobke [Mon, 1 May 2017 21:41:37 +0000 (18:41 -0300)]
Handle more error cases

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd PHPDoc
Morris Jobke [Mon, 1 May 2017 21:35:47 +0000 (18:35 -0300)]
Add PHPDoc

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agobetter handling of preview generation errors
Robin Appelman [Mon, 1 May 2017 12:03:00 +0000 (14:03 +0200)]
better handling of preview generation errors

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoFix tests 4657/head
Roeland Jago Douma [Tue, 2 May 2017 10:35:42 +0000 (12:35 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd caching to the imageexport plugin
Roeland Jago Douma [Tue, 2 May 2017 10:30:34 +0000 (12:30 +0200)]
Add caching to the imageexport plugin

Since we now heavily use this endpoint for the contacts menu we better
set proper caching on the images. Else this gets reload over and over
again leading to slow loading menu and unneded bytes transfered.

* cache for 1 hour by default
* added ETag for validation

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBump version 4651/head
Roeland Jago Douma [Tue, 2 May 2017 09:38:37 +0000 (11:38 +0200)]
Bump version

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix test
Roeland Jago Douma [Tue, 2 May 2017 09:38:21 +0000 (11:38 +0200)]
Fix test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMake sure the AppFetcher fetches the new applist from the appstore
Roeland Jago Douma [Tue, 2 May 2017 08:08:16 +0000 (10:08 +0200)]
Make sure the AppFetcher fetches the new applist from the appstore

When in the upgrade process the version in the config is still the old
version. (Since we only upgrade it after the upgrade is complete).
However the app list fetched from the appstore must be the new list.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4638 from nextcloud/fix-copy-tooltip
Lukas Reschke [Tue, 2 May 2017 08:10:23 +0000 (10:10 +0200)]
Merge pull request #4638 from nextcloud/fix-copy-tooltip

Fix "Copied" message for public links

7 years agoMerge pull request #4649 from nextcloud/update-links-to-12
Lukas Reschke [Tue, 2 May 2017 08:09:57 +0000 (10:09 +0200)]
Merge pull request #4649 from nextcloud/update-links-to-12

Update documentation go.php URL to 12

7 years agoMerge pull request #4650 from nextcloud/appcache_on_update v12.0.0beta1
Lukas Reschke [Tue, 2 May 2017 07:15:35 +0000 (09:15 +0200)]
Merge pull request #4650 from nextcloud/appcache_on_update

Do not use caching for appstore fetchers after upgrade

7 years agoBump version 4650/head
Roeland Jago Douma [Tue, 2 May 2017 07:00:09 +0000 (09:00 +0200)]
Bump version

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix and update tests
Roeland Jago Douma [Tue, 2 May 2017 06:59:53 +0000 (08:59 +0200)]
Fix and update tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDo not do ETag caching when the version is updated
Roeland Jago Douma [Tue, 2 May 2017 06:44:20 +0000 (08:44 +0200)]
Do not do ETag caching when the version is updated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate documentation go.php URL to 12 4649/head
Lukas Reschke [Tue, 2 May 2017 06:17:59 +0000 (08:17 +0200)]
Update documentation go.php URL to 12

Fixes https://github.com/nextcloud/server/issues/4646

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 2 May 2017 00:07:20 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-protecti...
Morris Jobke [Mon, 1 May 2017 21:03:39 +0000 (18:03 -0300)]
Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-protection-is-disabled

Mark IP as whitelisted if brute force protection is disabled

7 years agoFix "Copied" message for public links 4638/head
Morris Jobke [Mon, 1 May 2017 20:56:38 +0000 (17:56 -0300)]
Fix "Copied" message for public links

* share a file/fodler by public link and click the
  copy to clipboard icon and watch the tooltip
* before: it said "Copy"
* after: it now says "Copied" after clicking the button

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove dependency on jquery-migrate.js for browser detection 4636/head
Morris Jobke [Mon, 1 May 2017 20:52:53 +0000 (17:52 -0300)]
Remove dependency on jquery-migrate.js for browser detection

* ref #4628

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4626 from nextcloud/adjust-shipped-json
Lukas Reschke [Mon, 1 May 2017 18:49:43 +0000 (20:49 +0200)]
Merge pull request #4626 from nextcloud/adjust-shipped-json

Remove apps delivered from the appstore

7 years agoMerge pull request #4615 from nextcloud/js-reduce-share.js-complexity
Lukas Reschke [Mon, 1 May 2017 18:44:19 +0000 (20:44 +0200)]
Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity

Remove abandoned methods in OC.Share that refer to old API endpoints

7 years agoAdd missing space 4630/head
Lukas Reschke [Mon, 1 May 2017 18:36:25 +0000 (20:36 +0200)]
Add missing space

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4612 from nextcloud/js-fix-long-lines
Roeland Jago Douma [Mon, 1 May 2017 17:55:56 +0000 (19:55 +0200)]
Merge pull request #4612 from nextcloud/js-fix-long-lines

Fix some long lines in JS - JSLinut recommendation

7 years agoMerge pull request #4613 from nextcloud/remove-unused
Roeland Jago Douma [Mon, 1 May 2017 17:42:12 +0000 (19:42 +0200)]
Merge pull request #4613 from nextcloud/remove-unused

Remove unused JS file

7 years agoMark IP as whitelisted if brute force protection is disabled
Lukas Reschke [Mon, 1 May 2017 16:31:45 +0000 (18:31 +0200)]
Mark IP as whitelisted if brute force protection is disabled

Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling.

This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4599 from nextcloud/contactsmenu-mobile
Lukas Reschke [Mon, 1 May 2017 16:05:52 +0000 (18:05 +0200)]
Merge pull request #4599 from nextcloud/contactsmenu-mobile

Define max-width for Contacts menu for mobile

7 years agoMerge pull request #4598 from nextcloud/menu-flashing
Lukas Reschke [Mon, 1 May 2017 16:04:51 +0000 (18:04 +0200)]
Merge pull request #4598 from nextcloud/menu-flashing

Prevent flashing of apps and user menu on page load

7 years agoMerge pull request #4594 from nextcloud/theming-image-default
Morris Jobke [Mon, 1 May 2017 15:55:00 +0000 (12:55 -0300)]
Merge pull request #4594 from nextcloud/theming-image-default

Delete theming images when logo/background is reset to default

7 years agoMerge pull request #4527 from nextcloud/downstream-27504
Morris Jobke [Mon, 1 May 2017 15:53:49 +0000 (12:53 -0300)]
Merge pull request #4527 from nextcloud/downstream-27504

Adjust SMB permissions on the root

7 years agoMerge pull request #4624 from nextcloud/email-settings-html
Lukas Reschke [Mon, 1 May 2017 15:51:15 +0000 (17:51 +0200)]
Merge pull request #4624 from nextcloud/email-settings-html

fix email settings

7 years agoMerge pull request #4610 from nextcloud/js-semicolons
Lukas Reschke [Mon, 1 May 2017 14:55:35 +0000 (16:55 +0200)]
Merge pull request #4610 from nextcloud/js-semicolons

Fix semicolon at end of JS lines

7 years agoMerge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate
Lukas Reschke [Mon, 1 May 2017 14:54:53 +0000 (16:54 +0200)]
Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate

Fix variable definitions in oc dialogs

7 years agoMerge pull request #4513 from nextcloud/bump-version-to-beta1
Lukas Reschke [Mon, 1 May 2017 14:53:16 +0000 (16:53 +0200)]
Merge pull request #4513 from nextcloud/bump-version-to-beta1

Bump version to Nextcloud 12.0 beta 1

7 years agoRemove apps delivered from the appstore 4626/head
Lukas Reschke [Mon, 1 May 2017 14:45:13 +0000 (16:45 +0200)]
Remove apps delivered from the appstore

Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature.

Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore.

Fixes https://github.com/nextcloud/server/issues/4605

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agofix email settings 4624/head
Robin Appelman [Mon, 1 May 2017 14:32:09 +0000 (16:32 +0200)]
fix email settings

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agofix permissions of mountpoints 4623/head
Robin Appelman [Mon, 1 May 2017 13:37:02 +0000 (15:37 +0200)]
fix permissions of mountpoints

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogview.js
Roeland Jago Douma [Mon, 1 May 2017 12:21:28 +0000 (14:21 +0200)]
Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogview.js

Fix variable definition in sharedialogview.js

7 years agoFix variable definition in sharedialogview.js 4616/head
Morris Jobke [Mon, 1 May 2017 04:32:54 +0000 (01:32 -0300)]
Fix variable definition in sharedialogview.js

* improves readability of conditional statements
  and fixes warning in JSLint for varibale definition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove unused methods from OC.Share 4615/head
Morris Jobke [Mon, 1 May 2017 04:19:46 +0000 (01:19 -0300)]
Remove unused methods from OC.Share

* they do calls against core/ajax/share.php which doesn't exist anymore
* also the methods are not called in any of our apps or any of the apps in the appstore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix variable definitions in oc dialogs 4614/head
Morris Jobke [Mon, 1 May 2017 04:09:29 +0000 (01:09 -0300)]
Fix variable definitions in oc dialogs

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove unused JS file 4613/head
Morris Jobke [Mon, 1 May 2017 03:59:10 +0000 (00:59 -0300)]
Remove unused JS file

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix some long lines in JS - JSLinut recommendation 4612/head
Morris Jobke [Mon, 1 May 2017 03:49:00 +0000 (00:49 -0300)]
Fix some long lines in JS - JSLinut recommendation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUse dot notation for array access - JSLint recommendation 4611/head
Morris Jobke [Mon, 1 May 2017 03:45:41 +0000 (00:45 -0300)]
Use dot notation for array access - JSLint recommendation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix semicolon at end of JS lines 4610/head
Morris Jobke [Mon, 1 May 2017 03:42:53 +0000 (00:42 -0300)]
Fix semicolon at end of JS lines

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 1 May 2017 00:07:32 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4602 from nextcloud/make-tooltip-intransparent
Morris Jobke [Sun, 30 Apr 2017 14:13:36 +0000 (11:13 -0300)]
Merge pull request #4602 from nextcloud/make-tooltip-intransparent

Make tooltip intransparent

7 years agoDelete theming images when logo/background is reset to default 4594/head
Julius Härtl [Sat, 29 Apr 2017 09:22:34 +0000 (11:22 +0200)]
Delete theming images when logo/background is reset to default

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 30 Apr 2017 00:07:21 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4603 from nextcloud/basic-settings
blizzz [Sat, 29 Apr 2017 21:28:50 +0000 (23:28 +0200)]
Merge pull request #4603 from nextcloud/basic-settings

Rename “Server settings” to “Basic settings”

7 years agoRename “Server settings” to “Basic settings” 4603/head
Marius Blüm [Sat, 29 Apr 2017 15:13:21 +0000 (17:13 +0200)]
Rename “Server settings” to “Basic settings”

* fixes #4587

Signed-off-by: Marius Blüm <marius@lineone.io>
7 years agoMerge pull request #4583 from nextcloud/theming-fixes-admin
Jan-Christoph Borchardt [Sat, 29 Apr 2017 15:05:11 +0000 (17:05 +0200)]
Merge pull request #4583 from nextcloud/theming-fixes-admin

Theming admin section fixes

7 years agoMake tooltip intransparent 4602/head
Morris Jobke [Sat, 29 Apr 2017 13:44:38 +0000 (10:44 -0300)]
Make tooltip intransparent

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4597 from nextcloud/tooltips-invert
Morris Jobke [Sat, 29 Apr 2017 13:43:33 +0000 (10:43 -0300)]
Merge pull request #4597 from nextcloud/tooltips-invert

Invert tooltip color to white, fix #4563