Commit Graph

16286 Commits (3353dbfab42e646201b625e97c1d27bb75ef554d)

Author SHA1 Message Date
Nextcloud bot 65dba8a558
[tx-robot] updated from transifex 2017-07-24 00:08:13 +07:00
Nextcloud bot 12590bf3d8
[tx-robot] updated from transifex 2017-07-23 00:08:07 +07:00
Nextcloud bot f91d6624cd
[tx-robot] updated from transifex 2017-07-22 00:08:16 +07: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 +07: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 +07:00
Nextcloud bot 9fe53e2649
[tx-robot] updated from transifex 2017-07-21 00:08:16 +07: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 +07: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 +07: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 +07: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 +07: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 +07:00
Nextcloud bot 9cbdca60d2
[tx-robot] updated from transifex 2017-07-20 00:08:13 +07: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 +07: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 +07:00
Nextcloud bot fad8b275f1
[tx-robot] updated from transifex 2017-07-19 00:08:32 +07: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 +07:00
Allan Nordhøy 8bc18a1b4d sent, an invitation, - successful 2017-07-18 09:12:24 +07:00
Allan Nordhøy ee3c7fc8cb log out, : Bigversal 2017-07-18 09:12:07 +07:00
Allan Nordhøy 9eb5eebfad : Bigversal and LDAP 2017-07-18 09:11:56 +07:00
Allan Nordhøy 79e9f0a15b command-line, Consider narrowing 2017-07-18 09:11:45 +07:00
Allan Nordhøy 40eeaf4bb8 Spelling: Shortening and binding 2017-07-18 09:11:30 +07:00
Nextcloud bot 041e327a6c
[tx-robot] updated from transifex 2017-07-18 00:08:12 +07: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 +07:00
Nextcloud bot 3fefa01709
[tx-robot] updated from transifex 2017-07-17 00:08:12 +07:00
Nextcloud bot 0463ef7e3b
[tx-robot] updated from transifex 2017-07-15 00:09:06 +07:00
Nextcloud bot 281e5eb8bc
[tx-robot] updated from transifex 2017-07-14 00:08:47 +07: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 +07:00
Nextcloud bot a9b38c025f
[tx-robot] updated from transifex 2017-07-13 00:08:42 +07:00
Robin Appelman 9e675dd8b1
fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:14 +07: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 +07: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 +07: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 +07:00
Nextcloud bot 05b03c173e
[tx-robot] updated from transifex 2017-07-12 00:08:54 +07:00
Maxence Lange 02baa45898 wrong call
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +07:00
Maxence Lange 7464996c56 verify that circles is installed
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +07:00
Robin Appelman 2f7d0bbb18
Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +07: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 +07: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 +07: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 +07: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 +07: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 +07:00
Roger Szabo ff286cd131 Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:38:30 +07: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 +07: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 +07: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 +07:00
Roger Szabo 500d2a0e2e pass missing function parameter
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:17:05 +07: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 +07:00
Roger Szabo 3e7a49e009 set needsPasswordReset flag correctly
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:42 +07: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 +07:00
Nextcloud bot 28a37f04dc
[tx-robot] updated from transifex 2017-07-10 00:08:51 +07:00