Commit graph

41627 commits

Author SHA1 Message Date
Roeland Jago Douma
e47137c7d4
Merge pull request #6682 from nextcloud/dav-mimetype-fallback
Fallback to filename based detection if the remote dav server doesn't…
2017-12-11 15:28:05 +01:00
Roeland Jago Douma
c1fcd6fc98
Merge pull request #7324 from nextcloud/no-sorters-no-instances
don't create sorter instances when none was requested
2017-12-11 15:27:44 +01:00
Morris Jobke
7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails
Fix email buttons for white theme
2017-12-11 15:16:28 +01:00
Morris Jobke
5b20600da9
Merge pull request #7313 from nextcloud/ensure-that-x-oc-mtime-header-is-an-integer-with-chunked-uploads
Ensure that X-OC-MTime header is an integer with chunked uploads
2017-12-11 15:07:05 +01:00
Morris Jobke
f4d7afc950
Merge pull request #7244 from nextcloud/css-file-suffix-with-apps-versions
Use apps versions to generate suffix when possible
2017-12-11 14:51:21 +01:00
Morris Jobke
cce4c285db
Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
Morris Jobke
52e7d05163
Fix syntax error
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv)
1ac31260ac
Fixed phpdoc and function type
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv)
f018bfc7de
Fixed md5 generation and added fallback for scss requests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv)
820e7b5aba
Use apps versions to generate suffix when possible
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
Nextcloud bot
8ed728c1a2
[tx-robot] updated from transifex 2017-12-11 01:10:20 +00:00
Nextcloud bot
a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Nextcloud bot
855acc727b
[tx-robot] updated from transifex 2017-12-09 01:10:24 +00:00
Morris Jobke
ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar
Always generate avatar
2017-12-08 23:58:17 +01:00
Morris Jobke
79ed0d105d
Merge pull request #7426 from nextcloud/Abijeet-master
Allows adding of hex color to the theme-color
2017-12-08 23:49:52 +01:00
Morris Jobke
3f34861d58
Merge pull request #7433 from nextcloud/fix-constructor-spy-in-unit-test-with-sinon-4.1.3
Fix constructor spy in unit test with Sinon 4.1.3
2017-12-08 23:49:11 +01:00
Daniel Calviño Sánchez
b70b38ce31 Fix constructor spy in unit test with Sinon 4.1.3
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-08 21:26:45 +01:00
blizzz
83509b0fd3
Merge pull request #7334 from nextcloud/feature/noid/language-depending-skeleton-directory
Allow `{lang}` as a placeholder in the skeleton directory
2017-12-08 18:19:01 +01:00
Morris Jobke
66f523e13f
Better center the letter and use semibold font type
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 16:24:31 +01:00
Morris Jobke
6aac1ffa33
Merge pull request #7115 from nextcloud/fix-flow
Fix flow
2017-12-08 16:01:57 +01:00
Morris Jobke
4c19e75f5d
Merge pull request #7390 from nextcloud/update-php-info
Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
2017-12-08 15:33:27 +01:00
Morris Jobke
5724e75827
Merge pull request #7252 from nextcloud/send-comment-on-enter
Submit comments with Enter and use Shift+Enter for new lines
2017-12-08 15:31:10 +01:00
Lukas Reschke
bb8acc5824
Merge pull request #7321 from nextcloud/ldap-update-loginfilter
Update login filter when user filter was newly generated
2017-12-08 15:24:57 +01:00
Bjoern Schiessle
555fe7047f
fix tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-08 13:29:33 +01:00
Morris Jobke
8ffd4428bb
Fallback to "default" and check if directory exists
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 12:28:41 +01:00
Abijeet
81f34e224c
Allows adding of hex color to the theme-color
Fixes #7158. Adds a # on the color if missing.

Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event.

Since the input element now allows a hex code, changed values to hexcode.

In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison.

Also changed the way we were determining whether the jscolor component had loaded.

Changed the control to use data-jscolor rather than defining opts in the class.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-08 10:42:41 +01:00
Morris Jobke
ace96a406a
Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 10:02:41 +01:00
Nextcloud bot
ef2b0969dd
[tx-robot] updated from transifex 2017-12-08 01:10:13 +00:00
Daniel Calviño Sánchez
9b1f3b969e Fix Enter sending comment instead of adding autocomplete item to message
When the autocomplete popover is shown the At.js plugin listens on the
message input field for key down events, and when Enter is pressed it
adds the selected item to the message. However, as "_onTypeComment" also
handles key down events for the message input field, when Enter was
pressed the comment was submitted and At.js had no chance to add the
item before that happened. Now when Enter is pressed and the
autocomplete popover is shown the comment is not submitted, and thus
At.js adds the selected item to the message as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-07 15:38:46 +01:00
Nextcloud bot
7d529c081a
[tx-robot] updated from transifex 2017-12-07 01:10:37 +00:00
Tobias Kaminsky
430f60db21
Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface
Handle encryption state in web interface
2017-12-06 16:19:17 +01:00
Morris Jobke
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root
delay calculating the shared cache root until it's used
2017-12-06 15:14:48 +01:00
Lukas Reschke
de8fefeb18
Merge pull request #7395 from nextcloud/remove-unused
Remove unused variables
2017-12-06 13:09:01 +01:00
Roeland Jago Douma
1287da8a38
Merge pull request #7348 from nextcloud/filterout_shares_of_nonexisting_users
Check if the owner of a share exists
2017-12-06 09:13:53 +01:00
Roeland Jago Douma
6e45034745
Merge pull request #7351 from nextcloud/change-default-german-language
use formal version of German by default
2017-12-06 08:30:14 +01:00
Roeland Jago Douma
cde58610b4
Merge pull request #7387 from nextcloud/swift-retry
add retry wrapper when reading files from swift
2017-12-06 08:28:20 +01:00
Nextcloud bot
9505c56447
[tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Morris Jobke
a73f86912f
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-05 09:58:15 +01:00
John Molakvoæ
cb951b42b2
Merge pull request #7391 from nextcloud/config-sample
Fix typos in config.sample.php
2017-12-05 07:29:30 +01:00
Nextcloud bot
f25d55c972
[tx-robot] updated from transifex 2017-12-05 01:10:20 +00:00
Morris Jobke
041dc6b3e8
Fix typos in config.sample.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-04 23:13:23 +01:00
Morris Jobke
41c1f862f1
Merge pull request #7319 from nextcloud/remove-svg-shadows
Remove svg shadows
2017-12-04 22:40:07 +01:00
Morris Jobke
a62cc27058
Fix syntax error
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-04 22:39:06 +01:00
Robin Appelman
046eb0c635
add retry wrapper when reading files from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 16:34:53 +01:00
Roeland Jago Douma
d2fe30d464
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:20 +01:00
Roeland Jago Douma
c8a29ec942
A failed storage is a not available storage
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:11 +01:00
Robin Appelman
c87d689253
delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:16:39 +01:00
Nextcloud bot
567757c793
[tx-robot] updated from transifex 2017-12-04 01:10:30 +00:00
Roeland Jago Douma
ca8d149e29
Merge pull request #7370 from nextcloud/fix-php-doc
Fix PHP doc for API docs
2017-12-03 20:18:01 +01:00
Morris Jobke
72bb7c3074
Fix PHP doc for API docs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-03 12:02:29 +01:00