Commit Graph

16886 Commits

Author SHA1 Message Date
Morris Jobke cdb1894422
Merge pull request #7774 from nextcloud/smb-2.0.3-12
[12] update icewind/smb to 2.0.3
2018-01-10 15:58:26 +01:00
Robin Appelman d37e2d4507
update icewind/smb to 2.0.3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-10 12:18:35 +01:00
Julius Härtl 2cc2f31f30
Fix SCSS processing when undoing theming values
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-10 10:25:13 +01:00
Nextcloud bot 02543c3650
[tx-robot] updated from transifex 2018-01-10 01:11:34 +00:00
Robin Appelman 4ec4a7df93
add option to use legacy v2 auth with s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-09 18:21:47 +01:00
Morris Jobke b089199141
Merge pull request #7708 from nextcloud/stable12-7599
[stable12] don't show recurring msg when pages result was turned off
2018-01-09 11:23:36 +01:00
Morris Jobke 25ba9cbe71
Merge pull request #7684 from nextcloud/backport-ie-fix-invert
[stable12] Fix inverted app icons on IE11
2018-01-09 11:22:54 +01:00
Morris Jobke 2f9d59535d
Merge pull request #7674 from nextcloud/12_7644
[stable12] Do no run SyncJob in cron
2018-01-09 11:14:16 +01:00
Morris Jobke bbaa765d51
Merge pull request #7666 from nextcloud/stable12-7527-fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen
[stable12] Fix drag shadow not visible when dragging a file on a narrow screen
2018-01-09 11:12:15 +01:00
Morris Jobke 2df3864878
Merge pull request #7742 from nextcloud/stable12-7716-hide-favourite-icon-in-details-view-if-favourite-action-is-not-available
[stable12] Hide favourite icon in details view if favourite action is not available
2018-01-09 11:08:53 +01:00
Nextcloud bot e059e1d9d5
[tx-robot] updated from transifex 2018-01-09 01:11:29 +00:00
Roeland Jago Douma 1f875eca3c
Merge pull request #7694 from nextcloud/stable12-7611
[stable12] Don't attempt to translate login names to uids when uids are provided
2018-01-08 21:10:11 +01:00
Daniel Calviño Sánchez 436ffaecb4 Hide favourite icon in details view if favourite action is not available
When the favourite icon in the details view is clicked the "Favorite"
action is triggered. However, if the action name given to
"triggerAction" is not found then the "Download" action is triggered
instead. As the "Favorite" action is not available in some file lists
(like "Recents") the "Download" action was executed instead in those
cases, which was a strange behaviour. Now the favourite icon is
hidden if its action is not available.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-08 17:44:55 +01:00
Nextcloud bot e23491dc42
[tx-robot] updated from transifex 2018-01-08 01:11:31 +00:00
Roeland Jago Douma 116e4e415e
Merge pull request #7717 from nextcloud/stable12-7662
[stable12] throw ServerNotAvailableException when LDAP is caught shutting down
2018-01-07 11:40:18 +01:00
Nextcloud bot ea70bac9fb
[tx-robot] updated from transifex 2018-01-07 01:11:25 +00:00
Nextcloud bot 27a4a8247c
[tx-robot] updated from transifex 2018-01-06 01:11:22 +00:00
Arthur Schiwon 37c0352249
throw ServerNotAvailableException when LDAP is caught shutting down
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 20:36:30 +01:00
Morris Jobke 28d77efe80
Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite
[Stable12] fix scss webroot and url rewrite
2018-01-05 17:29:08 +01:00
Julius Härtl 7bc63f6135
Fix faulty path in theming scss generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 08:17:39 +01:00
Nextcloud bot a3933b99fe
[tx-robot] updated from transifex 2018-01-05 01:11:32 +00:00
Arthur Schiwon 0941781d1e
don't show recurring msg when pages result was turned off
and only as debug level otherwise.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:29:22 +01:00
Arthur Schiwon 32597f8966
test adoption for stable12
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:10:10 +01:00
Nextcloud bot 233fd16049
[tx-robot] updated from transifex 2018-01-04 09:48:45 +00:00
Julius Härtl b96278f855
Remove css invert since we are using svg filters for now
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:24:35 +01:00
Roeland Jago Douma ed5f66f11a
Do no run SyncJob in cron
Fixes #7184

The SyncJob can be very resource intensive. Since it requests all users
on the system to create the system addressbook. In order to do this it
creates a vcard for every user and updates the addressbook.

There is no need for this job since the proper signals are emitted and
handled in the carddav backend to update the addressbook live.

Worst comes to worst there is always the occ command to bring the
address book in sync again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-03 10:58:16 +01:00
Daniel Calviño Sánchez 4d194b41f9 Fix drag shadow not visible when dragging a file on a narrow screen
When a file from the file list is dragged a drag shadow (a copy of the
file row that follows the cursor position) is created. The drag shadow
element is created as a direct child of the body element, so it needs a
higher "z-index" than the one used for the file list to be visible.

In narrow screens the "#app-content" uses a "z-index" of 1000 in order
to be visible over the "#navigation-bar" when they overlap, so the
"z-index" of the drag shadow must be at least 1000 to be visible over
the file list.

Instead of updating the hardcoded "z-index" it was removed and replaced
by CSS rules for ".dragshadow" elements to ease theming.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-02 16:12:47 +01:00
Morris Jobke 9ed0f50c25
Merge pull request #7567 from nextcloud/stable-12_fix7428
Respect sharing options when searching for Sharees
2017-12-20 14:18:33 +01:00
Arthur Schiwon e788ae0cf6
check userExists later, saves lookups for appData_INSTANCEID userids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-19 14:13:37 +01:00
Tobia De Koninck 7f18a8d19f Don't show users which e-mail address match if they belong to a group we may not share with
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-19 08:43:08 +01:00
Morris Jobke 6859e5a22a
Merge pull request #7558 from nextcloud/12-7427
[stable12] Fix email buttons for white theme
2017-12-18 21:19:51 +01:00
Morris Jobke e726d191f1
Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 17:03:01 +01:00
Bjoern Schiessle 1a4eab744e
fix dav unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:49 +01:00
Roeland Jago Douma dfed58e947
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 21:14:33 +01:00
Daniel Calviño Sánchez 26cf16d67f
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-11 16:49:39 +01:00
Nextcloud bot e4bf23ce7b
[tx-robot] updated from transifex 2017-12-11 01:10:34 +00:00
Nextcloud bot 0ff717c600
[tx-robot] updated from transifex 2017-12-10 01:10:38 +00:00
Nextcloud bot 0c272f2121
[tx-robot] updated from transifex 2017-12-09 01:10:36 +00:00
Roeland Jago Douma ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12
[12]add retry wrapper when reading files from swift
2017-12-08 09:26:41 +01:00
Morris Jobke c9318ddd1b
Merge pull request #7407 from nextcloud/12_7348
[stable12] Check if owner of share exists
2017-12-08 09:22:07 +01:00
Morris Jobke 5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12
[12]Use the correct root for shared jail when the source storage is also a jail
2017-12-08 09:03:03 +01:00
Nextcloud bot 53fa7fb3c6
[tx-robot] updated from transifex 2017-12-08 01:10:26 +00:00
Nextcloud bot 8d89ec3c30
[tx-robot] updated from transifex 2017-12-07 01:10:49 +00:00
Robin Appelman 0519ca5893
add retry wrapper when reading files from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-06 15:43:00 +01:00
Roeland Jago Douma aedc59c636
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:49 +01:00
Roeland Jago Douma 7e6dd02441
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-06 09:15:43 +01:00
Nextcloud bot f3b9b213eb
[tx-robot] updated from transifex 2017-12-06 01:10:37 +00:00
Nextcloud bot e04dd40516
[tx-robot] updated from transifex 2017-12-05 01:10:33 +00:00
Robin Appelman 4144580167
delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
Morris Jobke b1b02d3b3a
Merge pull request #7322 from nextcloud/12-6303
[stable12] Set primary action button color to same as theming color
2017-12-04 11:12:51 +01:00
Nextcloud bot 8054f862a3
[tx-robot] updated from transifex 2017-12-04 01:10:42 +00:00
Nextcloud bot e87c35837f
[tx-robot] updated from transifex 2017-12-03 01:10:35 +00:00
Nextcloud bot 26f8c3adfa
[tx-robot] updated from transifex 2017-12-02 01:10:44 +00:00
Nextcloud bot 3ee749d37f
[tx-robot] updated from transifex 2017-12-01 01:10:32 +00:00
Nextcloud bot 8656462edb
[tx-robot] updated from transifex 2017-11-30 01:13:31 +00:00
Nextcloud bot 0ba10fa5f9
[tx-robot] updated from transifex 2017-11-29 01:10:26 +00:00
Robin Appelman 6d8de960c9
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-28 13:55:42 +01:00
Jan-Christoph Borchardt 1a18b48037
Set primary action button color to same as theming color
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-28 13:50:57 +01:00
Nextcloud bot 036eae6956
[tx-robot] updated from transifex 2017-11-28 01:10:05 +00:00
Nextcloud bot 298b0d67d8
[tx-robot] updated from transifex 2017-11-27 01:10:03 +00:00
Nextcloud bot a6b3fcae8f
[tx-robot] updated from transifex 2017-11-25 01:10:10 +00:00
Nextcloud bot e94ba32255
[tx-robot] updated from transifex 2017-11-24 01:10:06 +00:00
Nextcloud bot fd46475f6e
[tx-robot] updated from transifex 2017-11-23 01:09:59 +00:00
Nextcloud bot 6b189ba1ee
[tx-robot] updated from transifex 2017-11-21 01:10:20 +00:00
Nextcloud bot 9583910104
[tx-robot] updated from transifex 2017-11-20 01:09:53 +00:00
Nextcloud bot 54dcd70dae
[tx-robot] updated from transifex 2017-11-19 01:10:04 +00:00
Nextcloud bot ccf4f87441
[tx-robot] updated from transifex 2017-11-18 01:10:56 +00:00
Nextcloud bot 9942c39e64
[tx-robot] updated from transifex 2017-11-17 01:10:03 +00:00
Nextcloud bot fec4e3947e
[tx-robot] updated from transifex 2017-11-16 01:10:03 +00:00
Nextcloud bot 2d8d248d28
[tx-robot] updated from transifex 2017-11-15 01:10:00 +00:00
Nextcloud bot 82e4d9b9cc
[tx-robot] updated from transifex 2017-11-14 01:09:59 +00:00
Nextcloud bot b1ac0b6198
[tx-robot] updated from transifex 2017-11-13 01:10:31 +00:00
Nextcloud bot faabc3594d
[tx-robot] updated from transifex 2017-11-12 01:10:15 +00:00
Nextcloud bot 097e8a4994
[tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
Nextcloud bot 5e14b64c55
[tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Nextcloud bot 656ea773e1
[tx-robot] updated from transifex 2017-11-09 09:12:53 +00:00
Morris Jobke c91515cfed
Merge pull request #6847 from nextcloud/filelist-confict-path-12
[12] still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:34:24 +01:00
Nextcloud bot 69e61b2892
[tx-robot] updated from transifex 2017-11-09 01:09:28 +00:00
Nextcloud bot 98b012d545
[tx-robot] updated from transifex 2017-11-08 01:09:33 +00:00
Lukas Reschke 4d117a5e23
Merge pull request #7096 from nextcloud/backport-stable12-7042
[stable12] ensure uid for calendar objects is unique
2017-11-07 21:58:02 +01:00
Robin Appelman fe6b4d432b
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:11 +01:00
Robin Appelman e51acfc717
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:07 +01:00
Morris Jobke 70e20727e5
Merge pull request #6699 from nextcloud/backport-6522-stable12
[stable12] fix LDAP User deletion (cleanup), fixes #3365
2017-11-07 14:45:06 +01:00
Georg Ehrke 3059191444
ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
Nextcloud bot 0756fc0893
[tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Nextcloud bot e873b1a3d1
[tx-robot] updated from transifex 2017-11-06 01:09:19 +00:00
Nextcloud bot 0b25217ba6
[tx-robot] updated from transifex 2017-11-05 01:09:07 +00:00
Nextcloud bot 43341833fd
[tx-robot] updated from transifex 2017-11-03 01:09:18 +00:00
Nextcloud bot 8b1417a269
[tx-robot] updated from transifex 2017-11-02 01:11:03 +00:00
Nextcloud bot 52b31a09ef
[tx-robot] updated from transifex 2017-11-01 01:08:55 +00:00
Nextcloud bot 00ffed5a19
[tx-robot] updated from transifex 2017-10-31 01:08:41 +00:00
Morris Jobke 0ce718796e
Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed
#6307 fix page title not changed (stable12)
2017-10-30 12:58:17 +01:00
Nextcloud bot 76ede89b6b
[tx-robot] updated from transifex 2017-10-30 01:08:44 +00:00
Nextcloud bot e20c4c6a71
[tx-robot] updated from transifex 2017-10-29 00:08:41 +00:00
Nextcloud bot 09a0048f77
[tx-robot] updated from transifex 2017-10-28 00:08:41 +00:00
Bernd Stellwag 8eb47de969 bugfix: set/change page title when switching to file tags
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
Bernd Stellwag bf3f86f1ff bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
Nextcloud bot 85f612c819
[tx-robot] updated from transifex 2017-10-27 00:08:39 +00:00
Nextcloud bot f7ac152a6c
[tx-robot] updated from transifex 2017-10-26 00:08:49 +00:00
Morris Jobke 7ec5689d0e Merge pull request #6935 from nextcloud/12-5780
Backport of translation string fixes
2017-10-25 14:42:46 +02:00
Morris Jobke aab0c3f18e Merge pull request #6946 from nextcloud/12-6574
[stable12] Fix undefined offset warning when using '/' as external storage root
2017-10-25 14:33:20 +02:00
Joas Schilling aef69efe2e Merge pull request #6942 from nextcloud/12-6826
[stable12] Fix class name in exception logger plugin
2017-10-25 11:51:24 +02:00
Roeland Jago Douma 27e8352ef1 Merge pull request #6945 from nextcloud/12-6633
[stable12] Don't add a LIKE condition when it's not needed
2017-10-25 08:53:37 +02:00
Nextcloud bot 5bd0bde89d
[tx-robot] updated from transifex 2017-10-25 00:08:56 +00:00
Robin Appelman f301b12c7b
Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-25 01:45:25 +02:00
Thomas Citharel 8c56f93124
Don't add a LIKE condition when it's not needed
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-10-25 01:42:51 +02:00
Joas Schilling 89d4e1f2ab
Use ::class to avoid errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:59 +02:00
Joas Schilling 572f246b78
Fix class name, regression from 44cf67accd
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:55 +02:00
Morris Jobke d3916b2170
Add space between ellipsis and word
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 00:11:05 +02:00
rakekniven 59fc88650c
Update file-upload.js
Fixed tiny translation issues. Removed space before ellipsis.
2017-10-24 17:34:49 +02:00
Morris Jobke 293a3d578f
Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:34:31 +02:00
Nextcloud bot 895336a3f3
[tx-robot] updated from transifex 2017-10-24 00:08:57 +00:00
Morris Jobke ad66244bdf Merge pull request #6910 from nextcloud/backport-6677-s12
[stable12]  don't reset quota
2017-10-23 07:46:49 -07:00
Arthur Schiwon 791fa6905f
and add missing whitespaces to log outout
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:32 +02:00
Juan Pablo Villafáñez b8afb84b18
Adjust unittest
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:27 +02:00
Juan Pablo Villafáñez 18c35a7ab0
Keep the current quota if no suitable quota is found
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:19 +02:00
Morris Jobke 5c53b162ed
Do not log WebDAV maintenance mode exception
Log the maintenance mode exception only in debug level. Fixes #6124

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 11:24:07 +02:00
Nextcloud bot e70135bcbf
[tx-robot] updated from transifex 2017-10-23 00:08:49 +00:00
Nextcloud bot bc19a8b193
[tx-robot] updated from transifex 2017-10-22 00:08:45 +00:00
Nextcloud bot 1c488aae8a
[tx-robot] updated from transifex 2017-10-21 00:08:36 +00:00
Nextcloud bot 5d2c6233a9
[tx-robot] updated from transifex 2017-10-20 00:08:44 +00:00
Nextcloud bot e8c217ed4f
[tx-robot] updated from transifex 2017-10-19 00:08:38 +00:00
Nextcloud bot 8b0842f020
[tx-robot] updated from transifex 2017-10-18 00:08:33 +00:00
Nextcloud bot ea269db6d6
[tx-robot] updated from transifex 2017-10-17 00:08:33 +00:00
Nextcloud bot e6000abdd6
[tx-robot] updated from transifex 2017-10-16 00:08:36 +00:00
Nextcloud bot 95bd9d4c64
[tx-robot] updated from transifex 2017-10-14 02:29:15 +00:00
Nextcloud bot 7762130869
[tx-robot] updated from transifex 2017-10-13 00:08:37 +00:00
Nextcloud bot c14beb8ee5
[tx-robot] updated from transifex 2017-10-10 00:08:41 +00:00
Robin Appelman df2fa2fce2 Merge pull request #6737 from nextcloud/aws-sdk-12
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
Nextcloud bot 35641b54a0
[tx-robot] updated from transifex 2017-10-09 00:08:42 +00:00
Nextcloud bot 7a583c400e
[tx-robot] updated from transifex 2017-10-08 00:08:32 +00:00
Nextcloud bot adea68e218
[tx-robot] updated from transifex 2017-10-07 00:08:40 +00:00
Nextcloud bot 037376b4ce
[tx-robot] updated from transifex 2017-10-06 00:08:40 +00:00
Nextcloud bot ceec594cc0
[tx-robot] updated from transifex 2017-10-05 00:08:34 +00:00
Nextcloud bot 1c30c72909
[tx-robot] updated from transifex 2017-10-04 00:08:37 +00:00
Robin Appelman 82a3a8be06
fix undefined constants
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:28 +02:00
Robin Appelman d97f66454c
disable part files for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:16 +02:00
Robin Appelman 83ef030ea6
add stat cache for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:12 +02:00
Robin Appelman e42b950521
more efficient is_dir
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:09 +02:00
Robin Appelman a0848ba202
more efficient permissions for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:05 +02:00
Robin Appelman f45a7a43df
more efficient write only fopen
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:01 +02:00
Robin Appelman 474c8aff29
reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:10:57 +02:00
Robin Appelman f62e0a33f3
update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:09:59 +02:00
Robin Appelman 14d94abf06
remove non composer aws sdk
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:04:20 +02:00
Nextcloud bot 4a21eb1c7d
[tx-robot] updated from transifex 2017-10-03 00:08:30 +00:00
Nextcloud bot 77931505d3
[tx-robot] updated from transifex 2017-10-02 00:08:33 +00:00
Nextcloud bot 05fe73ef5d
[tx-robot] updated from transifex 2017-10-01 00:08:35 +00:00
Nextcloud bot 489fc55e1d
[tx-robot] updated from transifex 2017-09-30 00:08:35 +00:00
Arthur Schiwon 38f84b369c
Backport of #6522
fix LDAP User deletion (cleanup)

discovered a bug in the integration test which lead to following a
different code path and giving a false-positive  success feedback.

Also listens now to the evendispatcher instead of old hook system

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-29 14:36:48 +02:00
Nextcloud bot cae4a1956b
[tx-robot] updated from transifex 2017-09-29 00:08:31 +00:00
Robin Appelman ac31b67f42
navigate to the root directory when showing the main filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-28 16:37:47 +02:00
Nextcloud bot df00dc89d1
[tx-robot] updated from transifex 2017-09-28 00:08:46 +00:00
Morris Jobke f6ccc1e0a1 Merge pull request #6554 from nextcloud/stable12-contacts_menu_privacy
[Stable12] contacts menu privacy
2017-09-27 15:32:29 +02:00
Nextcloud bot af923601b9
[tx-robot] updated from transifex 2017-09-27 00:08:33 +00:00
Nextcloud bot 0f39ea5830
[tx-robot] updated from transifex 2017-09-26 00:08:36 +00:00
Nextcloud bot 06ca365ccd
[tx-robot] updated from transifex 2017-09-25 00:08:12 +00:00
Nextcloud bot 29e4c10517
[tx-robot] updated from transifex 2017-09-23 00:08:06 +00:00
Nextcloud bot c1aa80afe8
[tx-robot] updated from transifex 2017-09-22 00:08:32 +00:00
Nextcloud bot cb212712f6
[tx-robot] updated from transifex 2017-09-21 00:08:36 +00:00
Roeland Jago Douma 9945d2f039 Merge pull request #6509 from nextcloud/backport-5689
[stable12] LDAP: simplify returning the homePath and fixing #4117
2017-09-20 20:11:30 +02:00
Morris Jobke ac0cd59a20 Merge pull request #6502 from nextcloud/backport-6453-stable12
[stable12] Fix initializing paged search under some circumstances
2017-09-20 16:07:28 +02:00
Morris Jobke 7d4fda5c85 Merge pull request #6524 from nextcloud/12-6506
[stable12] Fix sharer name overlap with filename
2017-09-20 16:06:09 +02:00
Morris Jobke aa586331ea Merge pull request #6525 from nextcloud/12-6499
[stable12] Allow to close sidebar for text files
2017-09-20 16:05:59 +02:00
Morris Jobke 6a52cda551 Merge pull request #6547 from nextcloud/backport-6545-stable12
[stable12] throw 101 when an empty group string is provided
2017-09-20 16:05:41 +02:00
Joas Schilling 3c449c88be Merge pull request #6527 from nextcloud/fix_quota_new_endpoint_12
[stable12] Fix quota new endpoint 12
2017-09-20 09:19:06 +02:00
Nextcloud bot 2bac01daad
[tx-robot] updated from transifex 2017-09-20 00:08:36 +00:00
Joas Schilling 4ca0223f37
Use the wrapper to get the parameters which was added in #6369
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:06:22 +02:00
Nextcloud bot db56ea3e70
[tx-robot] updated from transifex 2017-09-19 00:08:39 +00:00
Lukas Reschke 96e3e0788a
Revert "Do not list system users in contacts menu if sharing autocompletion is disabled"
This reverts commit 56a9084dd2.
2017-09-18 17:27:57 +02:00
Arthur Schiwon 713ce42fdf
throw 101 when an empty group string is provided
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 13:10:23 +02:00
Nextcloud bot c854665b0c
[tx-robot] updated from transifex 2017-09-18 00:08:41 +00:00
Nextcloud bot bc88484e7f
[tx-robot] updated from transifex 2017-09-17 00:08:34 +00:00
Nextcloud bot 18a258c531
[tx-robot] updated from transifex 2017-09-16 00:08:34 +00:00
Roeland Jago Douma 76cd70aed7
Fix quota calculation on new dav upload endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 20:21:37 +02:00
Morris Jobke efec52ebeb
Allow to close sidebar for text files
* the close button was overlapped by the text preview and you could not close the sidebar then

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-15 17:00:14 +02:00
Jan-Christoph Borchardt f987347b83
Correctly ellipsize file names, fix #6498
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-15 16:53:01 +02:00
Jan-Christoph Borchardt 64dd1f6833
Ellipsize sharer name, ref #6498
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-15 16:52:52 +02:00
Nextcloud bot 99916a9bda
[tx-robot] updated from transifex 2017-09-15 00:08:17 +00:00
Arthur Schiwon 90ebeae512
listen to deletion hooks for proper handling, adjust and add tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 17:04:12 +02:00
Arthur Schiwon 5933c0c55f
simplify returning the homePath and fixing #4117
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 17:04:01 +02:00
Arthur Schiwon 9d5fd7cd92
adapted integration tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:23 +02:00
Arthur Schiwon 9fb8f1fcd3
fix counting found results in search op
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:16 +02:00
Arthur Schiwon 51e4b49ee9
improve and extend paging integration test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:10 +02:00
Arthur Schiwon 30bf1c158d
replace hard-coded attribute with the corresponding settings option
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:04 +02:00
Arthur Schiwon de8626694f
fix limit-flaw in search on paged results
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:13:49 +02:00
Nextcloud bot a7f3fadd37
[tx-robot] updated from transifex 2017-09-14 00:08:21 +00:00
Nextcloud bot 51c110dd66
[tx-robot] updated from transifex 2017-09-13 00:08:21 +00:00
Morris Jobke c1690da20b Merge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav
[stable12] not to backquote LIMIT on CalDavBackend.php
2017-09-12 09:43:24 +02:00
Morris Jobke 5981027f82 Merge pull request #6359 from nextcloud/12-6082
[stable12] Use separate element color in theming
2017-09-12 09:41:10 +02:00
Nextcloud bot c58fdad3de
[tx-robot] updated from transifex 2017-09-12 00:08:34 +00:00
nhirokinet 2eaee586c7
not to backquote LIMIT on CalDavBackend.php 2017-09-11 11:21:43 +02:00
Joas Schilling 206c4da149
Allow translations of the comments activity in the emails too
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:05:06 +02:00
Nextcloud bot 985cbc6b33
[tx-robot] updated from transifex 2017-09-10 00:08:33 +00:00
Nextcloud bot ac96dc80de
[tx-robot] updated from transifex 2017-09-08 00:08:25 +00:00
Nextcloud bot 9071f60605
[tx-robot] updated from transifex 2017-09-07 00:08:32 +00:00
Lukas Reschke e1e248aeb8 Merge pull request #6357 from nextcloud/swift-tmpfiles-12
[12] Remove tmpFiles Array in Swift.php
2017-09-06 17:17:36 +02:00
Nextcloud bot ba71df12cc
[tx-robot] updated from transifex 2017-09-06 00:08:30 +00:00
Joas Schilling 6e7c37cbd3
Merge setMetaData into constructor
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:09 +02:00
Morris Jobke ec00e4b001
Implement metadata for email templates of remaining emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 16:03:40 +02:00
Julius Härtl 9bcf90adc8
Cleanup theming styles to fit the new login page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:59:46 +02:00
Julius Härtl ed11c0d6e2
Fix tests for primary element color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:59:40 +02:00
Julius Härtl 0f2f19c65f
Use separate element color in theming
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:50:33 +02:00
Christopher Bartz 222ec97f5f
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-09-04 14:54:13 +02:00
blizzz ebadf2f21d Merge pull request #6355 from nextcloud/6221-12
[stable12] Correctly format OCS response with favorites
2017-09-04 12:52:44 +02:00
Morris Jobke 274b72f223 Merge pull request #6333 from nextcloud/new-dav-event-stable12
[stable12] add a new dav event to allow apps to register their own sabredav plugins
2017-09-04 11:57:22 +02:00
Roeland Jago Douma 38548a7006
Correctly format OCS response with favorites
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-04 11:49:19 +02:00
Nextcloud bot fe2f9ac7ce
[tx-robot] updated from transifex 2017-09-02 00:08:39 +00:00
Bjoern Schiessle 38a60e44db
also allow to register additional plugins if the old endpoint is used
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-01 12:07:05 +02:00
Bjoern Schiessle 8e1d33369b
add a new dav event to allow apps to register their own sabredav plugins
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-01 12:06:55 +02:00
Nextcloud bot a8f4b1ee52
[tx-robot] updated from transifex 2017-09-01 00:08:36 +00:00
Nextcloud bot 0ba7914d0c
[tx-robot] updated from transifex 2017-08-31 00:08:40 +00:00
Morris Jobke 6704e89c5a Merge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invitations_for_past_events
[stable12] dont send invitations for past events
2017-08-30 21:01:32 +02:00
Nextcloud bot c13a06b7a5
[tx-robot] updated from transifex 2017-08-30 00:08:36 +00:00
Morris Jobke 0433b31d74 Merge pull request #6300 from nextcloud/add-share-with
[stable12] Add shareWith to email template metadata
2017-08-29 17:56:42 +02:00
Morris Jobke 7fd3068184
Add shareWith to email template metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:05:12 +02:00
Morris Jobke eb1a8a1934 Merge pull request #6278 from nextcloud/stable12-6182-fixes-in-files-drop-js
[stable12] Fixes in files_drop.js
2017-08-29 14:49:05 +02:00
Björn Schießle 1f7ea1f295 Merge pull request #6284 from nextcloud/add-new-propfind-stable12
add propfind to detect encryption status
2017-08-29 10:48:30 +02:00
Nextcloud bot a6ea872b1f
[tx-robot] updated from transifex 2017-08-29 00:08:37 +00:00
Morris Jobke 6f9c3ab8a6
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:47:51 +02:00
Morris Jobke d0bb5c298d
Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:33:43 +02:00
Joas Schilling 7df1ddcf2c
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:35 +02:00
Bjoern Schiessle 9128786d09
add propfind to detect encryption status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-28 14:03:21 +02:00
Nextcloud bot eb71c1288d
[tx-robot] updated from transifex 2017-08-28 00:08:33 +00:00
Daniel Calviño Sánchez 575f0c8421 Do not iterate over the files
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:44 +02:00
Daniel Calviño Sánchez 03c6c5bd93 Replace fileName variable with data.files[0].name
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez b68bad45dc Update the whole file item instead of only its contents
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez 8a1850f6b1 Remove "errorThrown" parameter
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Roeland Jago Douma ad283e40b4 Merge pull request #6270 from nextcloud/6252-12
[stable12] Don't try the actual file upload if the checks already error out
2017-08-26 18:32:03 +02:00
Roeland Jago Douma 0ec858f7e9 Merge pull request #6269 from nextcloud/6251-12
[stable12] Don't fetch the translation from core but from files
2017-08-26 16:26:40 +02:00
Roeland Jago Douma 99b102e15d
Don't try the actual file upload if the checks already error out
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:34:29 +02:00
Roeland Jago Douma 7338f7aa21
Don't fetch the translation from core but from files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:33:34 +02:00
Robin Appelman 6f06426bd4 update icewind/smb to 2.0.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 12:14:43 +02:00
Nextcloud bot 2c6bc236cb
[tx-robot] updated from transifex 2017-08-26 00:08:36 +00:00
Nextcloud bot 992c91e288
[tx-robot] updated from transifex 2017-08-25 00:09:08 +00:00
Morris Jobke 4c2f194589 Merge pull request #6114 from nextcloud/stable12_5852
[stable12] Delete trash using node API to trigger preview deletion
2017-08-24 02:59:44 +02:00
Morris Jobke 5fab554bd2 Merge pull request #6108 from nextcloud/backport-6080-12
[stable12] Add buttom border for header
2017-08-24 02:58:03 +02:00
Nextcloud bot 9baf03d28c
[tx-robot] updated from transifex 2017-08-24 00:09:00 +00:00
Roeland Jago Douma 81acf70bca Merge pull request #6240 from nextcloud/12-6239
[stable12] Show "Uploading..." in web UI for long uploads
2017-08-23 19:16:50 +02:00
Roeland Jago Douma 9b3e70f554 Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error
[stable12] Catch exceptions on error of cloud id resolution
2017-08-23 15:59:33 +02:00
Morris Jobke 47f87bbf8c
Show "Uploading..." in web UI for long uploads
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:53:48 +02:00
Nextcloud bot 8f20b4566a
[tx-robot] updated from transifex 2017-08-23 00:09:04 +00:00
Nextcloud bot 8e8af07e79
[tx-robot] updated from transifex 2017-08-22 00:08:29 +00:00
Nextcloud bot de8fe9cbd9
[tx-robot] updated from transifex 2017-08-21 00:08:22 +00:00
Nextcloud bot 6ea56593a7
[tx-robot] updated from transifex 2017-08-20 00:08:24 +00:00
Nextcloud bot 366c73a185
[tx-robot] updated from transifex 2017-08-19 00:08:36 +00:00
Nextcloud bot 7e0c00b576
[tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Nextcloud bot 948d6742ce
[tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Morris Jobke 3326118bdc Merge pull request #6150 from nextcloud/backport-6128-primary-font-color-in-capabilities
[stable12] Add the primary font color to the capabilities as well
2017-08-16 21:51:57 +02:00
Joas Schilling bd80121fc6
Catch exceptions on error of cloud id resolution
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 13:57:30 +02:00
Joas Schilling 5474e298a1
Add the primary font color to the capabilities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 11:51:15 +02:00
Joas Schilling fa8e202e65 Merge pull request #6112 from nextcloud/backport-5920-12
[stable12] Top bar buttons in share view are wrong positioned
2017-08-16 11:12:53 +02:00
Nextcloud bot 7913d33de9
[tx-robot] updated from transifex 2017-08-16 00:08:42 +00:00
Roeland Jago Douma 32b69cd40b
Delete trash using node API to trigger preview deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-15 08:52:13 +02:00
Nextcloud bot cd2d5b0b27
[tx-robot] updated from transifex 2017-08-15 00:08:25 +00:00
Marin Treselj eaa00ea2c8 Change id to class in the main share template
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:00 +02:00
Morris Jobke cafce87a78 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 18:00:36 +02:00
Robin Appelman e3166a601d
Filter magic dot object when swift directory
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-14 15:40:25 +02:00
Nextcloud bot 99cef14c31
[tx-robot] updated from transifex 2017-08-14 00:08:31 +00:00
Nextcloud bot 4a140398a9
[tx-robot] updated from transifex 2017-08-13 00:08:23 +00:00
Nextcloud bot ee73ddd8a9
[tx-robot] updated from transifex 2017-08-12 00:08:28 +00:00
Nextcloud bot aa51202d98
[tx-robot] updated from transifex 2017-08-11 00:08:30 +00:00
Daniel Calviño Sánchez 0b1dab14ca Fix preview of theming
Pull request #5584 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 13:45:31 +02:00
Daniel Calviño Sánchez 364b1b4a20 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 13:45:31 +02:00
Daniel Calviño Sánchez 5b0d7056e8 Provide "server.css" URL in ThemingController response
Pull request #5584 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 13:44:49 +02:00
Daniel Calviño Sánchez e883061f58 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 13:42:42 +02:00
Daniel Calviño Sánchez 8d93a0db8a 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 13:42:42 +02:00
Nextcloud bot 79f4b8566b
[tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Nextcloud bot 72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke c78a209e72 Merge pull request #5979 from nextcloud/12-5738
[stable12] Improve spelling in LDAP
2017-08-08 19:23:12 +02:00
Morris Jobke 39d1428ab3 Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
[stable12] Fix vertical alignment of loading icon and status message in Theming app
2017-08-08 18:42:31 +02:00
Morris Jobke 3f8e3fbb6b Merge pull request #5946 from nextcloud/12-5897
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
Morris Jobke 2abc49968e Merge pull request #5914 from nextcloud/12-5913
[stable12] Fix anchor name for federated sharing settings
2017-08-08 10:41:47 +02:00
Morris Jobke bcea6a041f Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction
[stable12] Use same lightness calculation as the SCSS compiler for theming
2017-08-08 10:40:37 +02:00
Nextcloud bot 75d5989a8b
[tx-robot] updated from transifex 2017-08-08 00:08:19 +00:00
Daniel Calviño Sánchez c91e39a4ca Fix code style
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:06 +02:00
Daniel Calviño Sánchez bb96c79bc7 Remove superfluous selector part
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez 6fe6c0545e Align vertically loading icon and status message
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez 21ad25465d Do not use the same rules for loading icon than for upload icon
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case; in general the loading icon is
used in a totally different way than the upload icon and thus it should
not share its CSS rules.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:58:05 +02:00
Daniel Calviño Sánchez 4dd8c4b538 Remove ignored rules
The removed rules were either always overriden by other rules or never
used due to not matching any element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:43:57 +02:00
Nextcloud bot 06a9357a49
[tx-robot] updated from transifex 2017-08-06 00:08:33 +00:00
Nextcloud bot b521ef1bf0
[tx-robot] updated from transifex 2017-08-05 00:08:19 +00:00
Julius Härtl e0ce8a7640
Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 15:39:56 +02:00
Lukas Reschke 3474d73cae Revert "[stable12] theming lightness correction" 2017-08-04 15:38:56 +02:00
Allan Nordhøy ac977dd3a1 Improve spelling in LDAP
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-04 12:17:04 +02:00
Julius Härtl 796f0f9333
Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 12:13:33 +02:00
Nextcloud bot 91b6d903f7
[tx-robot] updated from transifex 2017-08-04 00:08:27 +00:00
Nextcloud bot 690ef25928
[tx-robot] updated from transifex 2017-08-03 00:08:15 +00:00
Morris Jobke cf16087585 Disable default activity email for incoming shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00
Nextcloud bot ecc82fc1e6
[tx-robot] updated from transifex 2017-08-02 00:08:21 +00:00
Nextcloud bot 9f346fecf1
[tx-robot] updated from transifex 2017-08-01 00:08:35 +00:00
Nextcloud bot b3e2f57f98
[tx-robot] updated from transifex 2017-07-31 00:08:12 +00:00
Nextcloud bot a6499afb5b
[tx-robot] updated from transifex 2017-07-30 00:08:13 +00:00
Nextcloud bot 820a74e71b
[tx-robot] updated from transifex 2017-07-29 00:08:40 +00:00
Morris Jobke 635dc7e08c Fix anchor name for federated sharing settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 08:23:06 +02:00
Nextcloud bot ee4804b1da
[tx-robot] updated from transifex 2017-07-28 00:08:14 +00:00
Nextcloud bot 569892d3c0
[tx-robot] updated from transifex 2017-07-27 00:08:13 +00:00
Nextcloud bot 2902677ccf
[tx-robot] updated from transifex 2017-07-26 00:08:14 +00:00
Nextcloud bot 79522f4078
[tx-robot] updated from transifex 2017-07-25 00:08:13 +00:00
Nextcloud bot 65dba8a558
[tx-robot] updated from transifex 2017-07-24 00:08:13 +00:00
Georg Ehrke 7b113bb18a
Sabre/VObject returns DateTimeImmutable, not a simple DateTime
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-07-23 09:36:35 +02:00
Georg Ehrke 702d13cc79
don't send invitation emails for past events
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-07-23 09:36:24 +02:00
Nextcloud bot 12590bf3d8
[tx-robot] updated from transifex 2017-07-23 00:08:07 +00:00
Nextcloud bot f91d6624cd
[tx-robot] updated from transifex 2017-07-22 00:08:16 +00:00
Roeland Jago Douma 73b293fa6a Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12
[12] still remove the federated share even if we cant notify the remote
2017-07-21 12:46:31 +02:00
Roeland Jago Douma d338869257 Merge pull request #5805 from nextcloud/fix-public-links-stable12
[stable12] fix preview for public links
2017-07-21 11:02:02 +02:00
Nextcloud bot 9fe53e2649
[tx-robot] updated from transifex 2017-07-21 00:08:16 +00:00
Björn Schießle c9624d2695 Merge pull request #5630 from nextcloud/add-recovery-key-on-public-upload-stable12
[stable12] Add recovery key on public upload
2017-07-20 14:27:57 +02:00
Roeland Jago Douma 07ebc7b1c3 Merge pull request #5759 from nextcloud/backport-translations-stuff-12
[stable12] Backport translation fixes
2017-07-20 14:25:11 +02:00
Bjoern Schiessle fff804c39e
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle f7a2b96507
Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle 2634f77741
fix preview for public links
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:31:31 +02:00
Nextcloud bot 9cbdca60d2
[tx-robot] updated from transifex 2017-07-20 00:08:13 +00:00
Morris Jobke ff9c5072f0 Add Android and iOS URLs to theming app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:57:38 +02:00
Roeland Jago Douma 235f4d614a Allow overwriting of IOS theming values
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 10:57:25 +02:00
Nextcloud bot fad8b275f1
[tx-robot] updated from transifex 2017-07-19 00:08:32 +00:00
Allan Nordhøy f29d8bda3e - your
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
2017-07-18 09:12:31 +02:00
Allan Nordhøy 8bc18a1b4d sent, an invitation, - successful 2017-07-18 09:12:24 +02:00
Allan Nordhøy ee3c7fc8cb log out, : Bigversal 2017-07-18 09:12:07 +02:00
Allan Nordhøy 9eb5eebfad : Bigversal and LDAP 2017-07-18 09:11:56 +02:00
Allan Nordhøy 79e9f0a15b command-line, Consider narrowing 2017-07-18 09:11:45 +02:00
Allan Nordhøy 40eeaf4bb8 Spelling: Shortening and binding 2017-07-18 09:11:30 +02:00
Nextcloud bot 041e327a6c
[tx-robot] updated from transifex 2017-07-18 00:08:12 +00:00
Robin Appelman e49b8959c4
still remove the federated share even if we cant notify the remote
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:21:22 +02:00
Nextcloud bot 3fefa01709
[tx-robot] updated from transifex 2017-07-17 00:08:12 +00:00
Nextcloud bot 0463ef7e3b
[tx-robot] updated from transifex 2017-07-15 00:09:06 +00:00
Nextcloud bot 281e5eb8bc
[tx-robot] updated from transifex 2017-07-14 00:08:47 +00:00
Morris Jobke 701a865db7 Merge pull request #5692 from nextcloud/upload-hidden-filelist-12
[12] properly block file upload to non-active filelist
2017-07-13 11:47:46 +02:00
Nextcloud bot a9b38c025f
[tx-robot] updated from transifex 2017-07-13 00:08:42 +00:00
Robin Appelman 9e675dd8b1
fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:14 +02:00
Robin Appelman d05f67b2f3
properly block file upload to non-active filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:10 +02:00
Roeland Jago Douma 38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Roeland Jago Douma 405d3ccbd7 Merge pull request #5463 from nextcloud/shared-cache-during-init-12
[12] dont die if we try to access the shared cache while setting up the shared storage
2017-07-12 11:18:49 +02:00
Nextcloud bot 05b03c173e
[tx-robot] updated from transifex 2017-07-12 00:08:54 +00:00
Maxence Lange 02baa45898 wrong call
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Maxence Lange 7464996c56 verify that circles is installed
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Robin Appelman 2f7d0bbb18
Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Lukas Reschke ce59546344 Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-unreadable-items
[stable12] Allow dir-listing also when one child is blocked by access control
2017-07-11 16:08:43 +02:00
Morris Jobke e768426b11 Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-on-multi-select-dropdowns
[stable12] Fix unselecting items on multi select dropdowns
2017-07-11 15:34:30 +02:00
Daniel Calviño Sánchez 3a660a1b89 Enable the toggleSelect extension in multi-select dropdowns
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Morris Jobke ad7e6cfc9c Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activity-emails
[stable12] Fix remote share activity emails
2017-07-11 12:21:30 +02:00
Morris Jobke 8fdd9dbb04 Merge pull request #5667 from nextcloud/5649-stable12
[stable12] fix alignment of radio button and its label in encryption settings
2017-07-11 11:31:41 +02:00
Roger Szabo ff286cd131 Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:38:30 +08:00
Joas Schilling 1ed251c6a9
Fix owner cloud id in unshare activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:45 +02:00
Joas Schilling 509bc4f1eb
Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:32 +02:00
Arthur Schiwon 0a71c1ccd3
fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-10 11:02:16 +02:00
Roger Szabo 500d2a0e2e pass missing function parameter
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:17:05 +08:00
Roger Szabo b725738870 css for button adjustment for nc12
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:55 +08:00
Roger Szabo 3e7a49e009 set needsPasswordReset flag correctly
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:42 +08:00
Roger Szabo 28933322a2 suppress superflous php error on rejected password change
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:12 +08:00
Nextcloud bot 28a37f04dc
[tx-robot] updated from transifex 2017-07-10 00:08:51 +00:00