6802e2b59a
Principal search: Take sharing settings into account
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
f543039858
exclude shared calendars from freeBusy
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
787e3d51b4
Fix functions to search for principals in the backend.
...
Add a "searchPrincipals" function to the NC principal backend.
Fix the "findByUri" function to respect the prefixPath.
Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
2017-12-11 16:04:55 +01:00
80b27fdb93
Merge pull request #7342 from nextcloud/fix_carddav_converter
...
CardDAV convertor check should not be to wide
2017-12-11 16:03:07 +01:00
7fdc4b5262
Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-user
...
ensure that users are cached when they are retrieved
2017-12-11 15:39:24 +01:00
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
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
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
cce4c285db
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
40633c5e54
CardDAV convertor check should not be to wide
...
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 11:58:02 +01:00
8ed728c1a2
[tx-robot] updated from transifex
2017-12-11 01:10:20 +00:00
a684f033bd
[tx-robot] updated from transifex
2017-12-10 01:10:25 +00:00
855acc727b
[tx-robot] updated from transifex
2017-12-09 01:10:24 +00:00
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
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
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
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
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
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
ef2b0969dd
[tx-robot] updated from transifex
2017-12-08 01:10:13 +00:00
27f14eee26
don't cache user, if no internal user id was retrieved/assigned
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-07 22:47:32 +01:00
991190b994
ensure that users are cached when they are retrieved
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-07 17:49:33 +01:00
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
7d529c081a
[tx-robot] updated from transifex
2017-12-07 01:10:37 +00:00
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
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
de8fefeb18
Merge pull request #7395 from nextcloud/remove-unused
...
Remove unused variables
2017-12-06 13:09:01 +01:00
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
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
9505c56447
[tx-robot] updated from transifex
2017-12-06 01:10:23 +00:00
a73f86912f
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-05 09:58:15 +01:00
f25d55c972
[tx-robot] updated from transifex
2017-12-05 01:10:20 +00:00
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
d2fe30d464
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:20 +01:00
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
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
567757c793
[tx-robot] updated from transifex
2017-12-04 01:10:30 +00:00
bd1e357eef
[tx-robot] updated from transifex
2017-12-03 01:10:22 +00:00
cec236f0af
[tx-robot] updated from transifex
2017-12-02 01:10:32 +00:00
65d7468bf3
check userExists later, saves lookups for appData_INSTANCEID userids
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:47:56 +01:00
ffc627e18e
[tx-robot] updated from transifex
2017-12-01 01:10:20 +00:00
c43f64d56b
Add unit tests for posting comments with enter key
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-30 19:30:27 +01:00
d03fcbca77
Set text only in the message div of the new comment form
...
When finding ".message" elements on "view.$el" the message area for the
new comment form and all the comments were matched. Now the selector was
restricted to match only the message area for the new comment form.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-30 19:29:19 +01:00
49ec86a81f
[tx-robot] updated from transifex
2017-11-30 01:13:19 +00:00
d24b6866b1
Actually set the status so we don't cause another exception
...
* And add tests so I don't mess up again
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 16:37:54 +01:00
a9eb0d4a40
Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_server
...
Do not log Exception if a connection error occured
2017-11-29 16:03:23 +01:00
f03aa0480a
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
...
Fix silent conflicts due to merging #7256 after #7251
2017-11-29 15:38:24 +01:00
79554a29e0
Do not log Exception if a connection error occured
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 13:06:32 +01:00
095eba0aa3
[tx-robot] updated from transifex
2017-11-29 01:10:12 +00:00
cfd1e04588
Update login filter when user filter was newly generated
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-28 12:41:36 +01:00
0c45778219
Fix silent conflicts due to merging #7256 after #7251
...
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251 , and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 02:35:39 +01:00
a0ce2c1204
[tx-robot] updated from transifex
2017-11-28 01:09:52 +00:00
2a7b1bae10
Reject X-OC-MTime header if given as a string with hexadecimal notation
...
In PHP 7.X hexadecimal notation support was removed from "is_numeric",
so "sanitizeMtime" directly rejected those values; in PHP 5.X, on the
other hand, "sanitizeMtime" returned 0 when a string with hexadecimal
notation was given (as it was the behaviour of "intval"). To provide a
consistent behaviour between PHP versions, and given that it does not
make much sense to send X-OC-MTime in hexadecimal notation, now
X-OC-MTime is always rejected if given as a string with hexadecimal
notation.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 01:08:52 +01:00
ffe034abb0
Don't use runInSeparateProcess
...
Directly calling "header" in the PHPUnit process causes the "Cannot
modify header information - headers already sent by" error to be thrown.
Instead of running the test in a separate process, which is slower, this
commit wraps the call to "header" in a method that can be mocked in the
tests.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:45 +01:00
a5e4c2ea11
Add tests for X-OC-MTime header handling
...
This commit is based on the commits from pull request 28066 (included in
018d45cad97e0) from ownCloud by Artur Neumann and Phil Davis.
Unit tests are currently run only on systems that support negative
mtimes, so no special handling of negative values was included in the
tests to keep the test code more manageable.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:45 +01:00
2af3d8a9b2
Make possible to provide a specific HTTP request object to File
...
This will be used in a following commit to test how the X-OC-MTime
header is handled.
This commit is based on the "make File::put() more testable" commit
(included in 018d45cad97e0) from ownCloud by Artur Neumann.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:41 +01:00
01e346b2ae
Ensure that X-OC-MTime header is an integer also with chunked uploads
...
This commit extends the changes introduced in pull request #3793 also to
chunked uploads.
The "sanitizeMTime" method name is the same used in the equivalent pull
request to this one from ownCloud (28066).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:37:51 +01:00
3f7267e0e9
Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error
...
catch errors when parsing calendar data for calendar query requests
2017-11-27 17:50:37 +01:00
573551253e
Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken
...
Log InvalidSyncToken on DAV in debug level
2017-11-27 17:27:41 +01:00
5cc8ea8feb
Merge pull request #7307 from nextcloud/do-not-log-not-implemented-dav
...
Log NotImplementedException on DAV in debug level
2017-11-27 17:25:56 +01:00
ea117bac31
catch errors when parsing calendar data for calendar query requests
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-27 17:14:18 +01:00
f700cd14fa
Merge pull request #7222 from nextcloud/fix-filerow-avatars
...
Fix filerow avatars
2017-11-27 16:46:11 +01:00
88905c6293
Log InvalidSyncToken on DAV in debug level
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:37:11 +01:00
26a5fff423
Log NotImplementedException on DAV in debug level
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:17:01 +01:00
e428ef9d75
Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments
...
Fix cursor for avatar and user names in comments
2017-11-27 15:14:40 +01:00
cfae590ac9
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent
...
Fix input field not disabled while a comment is being sent
2017-11-27 13:40:03 +01:00
e02229e412
Merge pull request #7246 from william-p/Add_html5_audioplayer_public
...
Add HTML5 audio player in public view
2017-11-27 12:32:21 +01:00
7bb42438fa
Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment
...
Fix working icon position when sending or deleting a comment
2017-11-27 12:19:21 +01:00
c5446ebd9a
Merge pull request #7251 from nextcloud/contact-menu-position-fix
...
Fixed contact menu position on comments
2017-11-27 12:14:30 +01:00
d15ca9ffaf
Replace with non-deprecated JS call
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 11:53:24 +01:00
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps
...
Cache fetched apps in update check
2017-11-27 11:48:59 +01:00
05039f1f71
Rename "LDAP" to "LDAP/AD-integration"
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-11-27 09:49:28 +01:00
4af12dcab1
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:44 +01:00
011e05574f
that has since been deleted, ID to node
...
You were mentioned in a group chat by a user that has since been deleted
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:39 +01:00
645fc993c2
[tx-robot] updated from transifex
2017-11-27 01:09:51 +00:00
ea4414f9bc
Disable contacts menu for mentions to current user in comment messages
...
The contacts menu is not shown for avatars and user names in the author
row if they represent the current user. For consistency, and because the
contacts menu provides no value when shown for the current user, this
commit also disables the contacts menu for mentions to the current user.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:10:53 +01:00
8eb19a278c
Disable contacts menu for mentioned users in comments being composed
...
The contacts menu does not provide too much value for users mentioned in
a message being composed, so it is now disabled in this case.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:05:54 +01:00
107952ff00
Fix cursor for author row and avatars in comments
...
When it was on an author row the cursor was shown as a pointer, even if
clicking on the author row itself does nothing. On the other hand,
avatars used the default cursor, even if clicking on them either shows
the contacts menu (in the case of the author row, only when the avatar
is for a different user than the current one) or inserts a mention (for
avatars shown in the list of suggested mentions), depending on the case.
Now, the author row uses the default cursor, and avatars (and their
associated user name) use a pointer cursor if clicking on them will
trigger an action (either showing the contacts menu or inserting a
mention).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-26 23:56:03 +01:00
df61d43529
Make isUpdateAvailable non-static
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:01:02 +01:00
63d98574e9
[tx-robot] updated from transifex
2017-11-25 01:09:56 +00:00
9bb2bb7870
Show delete working icon at the same position as the delete icon
...
When a comment was being deleted the submit working icon was shown. Now
the submit working icon is kept hidden in that case and a specific
delete working icon, which is shown at the same position as the delete
icon, is used instead.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:31:37 +01:00
6e9c0b9085
Show submit working icon at the same position as the submit confirm icon
...
The submit confirm icon is shown as the background image of an
absolutely positioned input element, so the CSS rules for the submit
working icon were modified to match those of the submit confirm icon.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:30:58 +01:00
892d2630fe
Merge pull request #7275 from nextcloud/disable-elements-while-a-comment-is-being-deleted
...
Disable elements while a comment is being deleted
2017-11-24 16:14:53 +01:00
5e6d4ad27c
Disable elements while a comment is being deleted
...
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 13:17:55 +01:00
dc1d13a18d
[tx-robot] updated from transifex
2017-11-24 01:09:53 +00:00
5a9c99e6ac
recycle SharedFileInfo values in fileInfo
...
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 17:51:56 +01:00
bbe00079cc
Fix input field not disabled while a comment is being sent
...
Since the change of the text area to a content editable div the input
field was no longer disabled while a new comment was being sent. It was
caused by still trying to disable the div using the "disabled" property,
which works only on real input fields; when using a content editable div
the way to disable it is by setting "contenteditable" to "false".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 14:34:09 +01:00
077381c7b3
rip out obsolete recipientsDisplayName
...
also needs tests adjustements, and this also brings in natural sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
9d95391ff1
adjust tests and apply sorting
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
4247936dd6
Fix avatars in file rows of incoming shares
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
dcfd7bf7ff
fix avatars in file rows of outgoing shares
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:09 +01:00
5591ea6e8b
Fixed alignment of items in comments
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 12:26:22 +01:00
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root
...
Use the correct root for shared jail when the source storage is also a jail
2017-11-23 12:03:36 +01:00
60a73bab1c
Submit comments with Enter and use Shift+Enter for new lines
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 03:27:16 +01:00
4eb9c0142d
Fix contacts menu vertical position for comment authors
...
The contacts menu was being shown as "inline-block", which caused the
top of the menu to be aligned to the top of the author row.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 02:12:09 +01:00
b6a39b7927
[tx-robot] updated from transifex
2017-11-23 01:09:47 +00:00
beac223fa6
Add HTML5 audio player in public view
...
Signed-off-by: William Pain <pain.william@gmail.com>
2017-11-22 16:07:17 +01:00
7f36c2090a
Make close icon fill more space
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 15:33:23 +01:00
a8ec62dcc2
[tx-robot] updated from transifex
2017-11-21 01:10:07 +00:00
7bc28f14de
show e2e folder icon on encrypted folders
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 21:00:26 +01:00
37d8d3d858
Add data attribute to file list rows telling if the file is encrypted
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-20 21:00:04 +01:00
670ac48eb7
adjust permissions in web view for encrypted folders
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 18:24:50 +01:00
f347e2e4a6
Merge pull request #7047 from nextcloud/add-support-for-files-with-no-permissions
...
Add support for files with no permissions
2017-11-20 16:15:52 +01:00
96b15cec83
[tx-robot] updated from transifex
2017-11-20 01:09:40 +00:00
dd5373795f
[tx-robot] updated from transifex
2017-11-19 01:09:52 +00:00
39ec541b23
[tx-robot] updated from transifex
2017-11-18 01:10:43 +00:00
059be95d6c
Merge pull request #7163 from nextcloud/force-breaks-on-extremely-long-words-in-comments
...
Force breaks on extremely long words in comments
2017-11-17 19:02:36 +01:00
5d85af79b6
Force breaks on extremely long words
...
If not broken extremely long words overflow their container.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-17 15:10:50 +01:00
eeb0cfdaf5
Merge pull request #7152 from nextcloud/bugfix/noid/adjust_calendarobject_size_after_applying_class
...
remove cached size from shared calendar objects
2017-11-17 08:28:34 +01:00
6c2c129fce
[tx-robot] updated from transifex
2017-11-17 01:09:51 +00:00
20868e17e8
Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinements
...
refine invitation email
2017-11-16 21:11:44 +01:00
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api
...
Calendar API for apps
2017-11-16 21:10:35 +01:00
b073b13d9f
refine invitation email
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-16 13:54:19 +01:00
dd83055198
Merge pull request #7188 from nextcloud/fix-broken-svg-2
...
Re-optimize places and files icons
2017-11-16 09:34:27 +01:00
b2e9cb6a00
[tx-robot] updated from transifex
2017-11-16 01:09:50 +00:00
2d069339cc
Re-optimize places and files icons
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-15 14:27:16 +01:00
7310c698de
Merge pull request #7173 from nextcloud/bugfix/noid/show_username_in_invitationsemails
...
Show organizer's name in From field of invitation email
2017-11-15 14:25:45 +01:00
c5afb25714
[tx-robot] updated from transifex
2017-11-15 01:09:47 +00:00
072652b2af
show name of organizer in from name of invitation email
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-14 21:23:27 +01:00
a3f86b99e9
Merge pull request #7165 from nextcloud/smb-2.0.3
...
update icewind/smb to 2.0.3
2017-11-14 17:46:04 +01:00
346dbfa1ee
Merge pull request #7130 from nextcloud/fix-broken-svg
...
Optimize SVG icons
2017-11-14 15:51:09 +01:00
418e49d816
update icewind/smb to 2.0.3
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-14 14:14:30 +01:00
a6d8948937
Merge pull request #5749 from nextcloud/ldap-primary-buttons
...
LDAP Wizard: primary-style buttons
2017-11-14 14:03:27 +01:00
1c5586adab
Fix tooltip placement in Shared files list
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-14 11:55:44 +01:00
28e8a1c4b0
[tx-robot] updated from transifex
2017-11-14 01:09:46 +00:00
57eb046836
Use primary class also for ui-button elements
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 16:33:21 +01:00
5603d9a5ea
hackishly add primary css class adaption for jquery ui
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-13 16:33:17 +01:00
e23921c7b1
Merge pull request #7123 from nextcloud/external-storage-user-mount-checkbox
...
Fix "allow user mount" checkbox for external storage
2017-11-13 14:52:21 +01:00
dfc91a253c
Parse Sabre Exception in OC.Files.Client and file-upload
...
In case of error, instead of a generic error message, an upload will
display whichever message is returned in the Sabre Exception, if
applicable.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-13 12:19:14 +01:00
ff2d4432d8
Merge pull request #7051 from nextcloud/breadcrumbs-refactor
...
Breadcrumbs refactor
2017-11-13 12:19:05 +01:00
8c2dbeb13a
Added more tests and only test jsunit on drone (for testing only)
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-13 10:51:31 +01:00
7a812aa0e1
Theming: bump version to retrigger icon generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
d70e9059a5
Theming: Fix tests for favicon containing multiple sizes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
31b9fc9eac
Theming: Generate favicon sizes to avoid resizing issues done by the browser
...
fixes #5193
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-11-13 10:18:47 +01:00
8e61ad8847
Merge pull request #6678 from nextcloud/downstream-ldap-configurable-user-update
...
LDAP: configurable user update interval
2017-11-13 08:14:52 +01:00
f376659933
[tx-robot] updated from transifex
2017-11-13 01:10:11 +00:00
19b77039d7
remove cached size from shared calendar objects
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-12 17:30:22 +01:00
b4f5b38713
Add menu tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-12 05:20:06 +01:00
8e3861563b
[tx-robot] updated from transifex
2017-11-12 01:10:00 +00:00
2b51d84b98
generate birthday calendars in a background job after admin enabled them
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 16:17:18 +01:00
a87d986041
create a user's birthday calendar right after they requested it
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 11:28:34 +01:00
4d5ed1372a
update autoloaders
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
ef6f41a16c
respect admin / user choice about birthday calendars in corresponding hooks
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
d59b3392ab
disallow users to create calendars with reserved names
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
1c106a66b1
adapt occ 'dav:sync-birthday-calendar command
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
5068d56fb0
add CalDAV interface that allows users to re-enable their birthday calendar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:50 +01:00
6ca4abfc0b
[tx-robot] updated from transifex
2017-11-11 01:10:09 +00:00
dc34622008
remember when a user deleted their contact birthdays calendar
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-10 23:05:04 +01:00
d536e4e3b8
Fixed indentation
...
Fixed indentation of this pr
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
fbd8c5db4f
Fixed typo from last commit
...
Fixed typo in getAppValue mocket method from last commit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
ea0ad82e56
Update testUpdateNoRefresh
...
Mocked getAppValue to deliver a value of 1800 when updateAttributesInterval is requested by needsRefresh.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:15 +01:00
45dfc11137
tryfix needsRefresh unit tests
...
Forced updateAttributesInterval from getAppValue to int
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
039f6c9636
Fixed Typo in user.php
...
Fixed a typo for the app config prameter updateAttributesInterval
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
0b290c0904
Update User.php
...
Makes the time between needsRefresh configurable via app config option updateAttribuesInterval.
Default is still 86400 secons which is one day.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:36 +01:00
56fd462718
Use the correct root for shared jail when the source storage is also a jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-10 17:03:27 +01:00
1a2f9fe678
Merge pull request #7056 from nextcloud/oc-28415-enable-chunking-in-authenticated-web-upload
...
[oc] Enable chunking for bigger files in authenticated web upload
2017-11-10 15:35:58 +01:00
4d5490c339
second batch of fixed and re-optimized icons
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-10 15:21:44 +01:00
d3e7dd1992
Merge pull request #7057 from nextcloud/ldap-sync-split
...
Bring LDAP user attribute updates ("sync") to the background
2017-11-10 15:02:26 +01:00
f40e56f0e6
Fix menu declaration and width calculation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-10 08:23:24 +01:00
ede6499de4
[tx-robot] updated from transifex
2017-11-10 01:09:43 +00:00
8b22bfea4f
Add admin checkbox to disable birthday calendars
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 17:12:06 +01:00
7784672cc0
add option to filter CalendarAPI by componenttype
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
dd13aecc88
update dav autoloaders after adding calendar api
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
fa416e031b
integrate Dav app with Calendar API
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
0baa7ce911
Fix "allow user mount" checkbox for external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-09 14:49:21 +01:00
c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint
...
Theming: add hint about favicon generation
2017-11-09 12:16:55 +01:00
419759e68b
resolve DI
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
3ba8b337a4
fix unit tests after rebase
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
8113f26eed
add Sync test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
fc6b3902af
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
59c05d5447
move LDAP user attributes "sync" to background (except for ajax jobs)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:56 +01:00
ef3cd32916
don't skip updating when ajax is set as background job mode
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:04 +01:00
c6f1af9896
move ldap user sync to background (WIP)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:09:59 +01:00
2a1e9ad046
Removed console log
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 11:04:30 +01:00
723a25a315
[tx-robot] updated from transifex
2017-11-09 09:12:41 +00:00
479966dce8
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:03:31 +01:00
e0aaca1726
Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-selected-file-does-not-match
...
Hide summary file actions when a selected file does not match
2017-11-09 09:45:55 +01:00
6b3975c23a
Merge pull request #6846 from nextcloud/filelist-confict-path
...
still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:33:59 +01:00
2bfa1ce5c3
Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
...
Ldap agent credentials save
2017-11-09 09:26:51 +01:00
aa525d89e8
[tx-robot] updated from transifex
2017-11-09 01:09:13 +00:00
b1b8c99193
Theming: add hint about favicon generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 23:31:18 +01:00
85355e98e6
Fixed tests and width calculation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 20:12:38 +01:00
aea30e0004
Scrutinizer fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:12:56 +01:00
584272962a
Improve drag & drop and fix some background issue if d&d on narrow windows
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:03:32 +01:00
8c915baa34
Merge pull request #6788 from staabm/master
...
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
b001060556
Fixed remaining tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:11:33 +01:00
f25cb7d156
Menu hidden by default
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:05:01 +01:00
694a96d938
Fixed some more test and loop fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 17:54:38 +01:00
41210c8cf1
Add droppable ability to menu and icon switch. Fix colour
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:56:58 +01:00
267b673ccb
Updated tests according to new system
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:04:10 +01:00
176ad7670f
Fix to-be-shown algorithm
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 14:04:34 +01:00
c6103dc9b7
Popover icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:10:30 +01:00
396154d7e4
Fixed click in menu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
9d3af829f2
Fixed breadcrumb action feedback and optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
33bac270db
Do not hide root
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
03d074ebe8
Popover filling system updated
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
1786784d12
Popover init
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
6ee75e16af
Fixed computation and removed unwanted scripts
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
9616074f58
Fix controls width
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
9bb28bab30
Flex to controls
...
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
Georg Ehrke
Christoph Seitz
blizzz
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
Nextcloud bot
Daniel Calviño Sánchez
Lukas Reschke
Abijeet
Tobias Kaminsky
Robin Appelman
Thomas Müller
Marius Blüm
Allan Nordhøy
John Molakvoæ (skjnldsv)
William Pain
Marin Treselj
Bjoern Schiessle
Jan-Christoph Borchardt
Julius Härtl
Vincent Petry
John Molakvoæ
sidey79