Commit Graph

16524 Commits

Author SHA1 Message Date
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
Nextcloud bot 0324993342
[tx-robot] updated from transifex 2017-07-09 00:08:41 +00:00
Nextcloud bot f80159f52a
[tx-robot] updated from transifex 2017-07-08 00:08:37 +00:00
Morris Jobke a5182ab7c1 Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
[stable12] Use PNG icons for activity emails and ios client
2017-07-07 14:04:01 +02:00
Björn Schießle 8ad1123d5d Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
[stable12] Use the share_folder config for remote shares
2017-07-07 11:54:11 +02:00
Joas Schilling a6bae8ac44
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:54 +02:00
Joas Schilling 87e69b5510
Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:44 +02:00
Nextcloud bot a1f3f1783e
[tx-robot] updated from transifex 2017-07-07 00:08:35 +00:00
Joas Schilling 596380a62f Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam
[stable12] Don't try to generate logs for chunking paths
2017-07-06 08:43:39 +02:00
Nextcloud bot f2ac9c6582
[tx-robot] updated from transifex 2017-07-06 00:08:53 +00:00
Joas Schilling 79f6773ef9
Don't log passwords on dav exceptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:10:38 +02:00
Jos Poortvliet 68b6c3fca8 Update admin.php
add a note on our staged roll-out.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-05 11:40:26 +02:00
Nextcloud bot 3db7bd196d
[tx-robot] updated from transifex 2017-07-05 00:08:36 +00:00
Morris Jobke 29fdffb1af Merge pull request #5525 from nextcloud/stable12-5517
[stable12] Enhance the logging if the part file can not be renamed
2017-07-04 19:36:08 +02:00
Morris Jobke 2459eb80a7 Improve logging of trash bin inconsistencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-04 11:14:59 +02:00
Morris Jobke 0d7d00d681 Merge pull request #5583 from nextcloud/stable12-5450
[stable12] Fix more icon in apps menu on bright backgrounds
2017-07-04 11:01:12 +02:00
Nextcloud bot 2711dbb445
[tx-robot] updated from transifex 2017-07-03 00:08:31 +00:00
Julius Härtl 9c1cfbe154
Fix more icon in apps menu on bright backgrounds
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:02:51 +02:00
Nextcloud bot f02575db94
[tx-robot] updated from transifex 2017-07-02 00:08:23 +00:00
Nextcloud bot 4b6e5efd7e
[tx-robot] updated from transifex 2017-07-01 00:08:38 +00:00
Nextcloud bot c892043dc9
[tx-robot] updated from transifex 2017-06-30 00:08:35 +00:00
Nextcloud bot af6e02976a
[tx-robot] updated from transifex 2017-06-29 00:08:35 +00:00
Nextcloud bot 2767165d7f
[tx-robot] updated from transifex 2017-06-28 00:08:28 +00:00
Nextcloud bot d13010ed2b
[tx-robot] updated from transifex 2017-06-27 00:08:26 +00:00
Nextcloud bot 31422c9c6e
[tx-robot] updated from transifex 2017-06-26 00:08:40 +00:00
Nextcloud bot 5e22b33096
[tx-robot] updated from transifex 2017-06-25 00:08:27 +00:00
Nextcloud bot 33bc17564c
[tx-robot] updated from transifex 2017-06-24 00:08:39 +00:00
Morris Jobke 8a0a09eb90 Enhance the logging if the part file can not be renamed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-23 16:07:21 -05:00
Joas Schilling aafb45456f
Add unit tests for the new code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:55:57 +02:00
Joas Schilling 4d18757a85
Allow to force a language and set it via the ocs api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:54:39 +02:00
Nextcloud bot 99d04b1917
[tx-robot] updated from transifex 2017-06-21 00:08:24 +00:00
Nextcloud bot 0277400618
[tx-robot] updated from transifex 2017-06-20 00:08:51 +00:00
Robin Appelman cbabc568db
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 14:00:52 +02:00
Robin Appelman e76081e858
Revert "dont die if we try to access the shared cache while setting up the shared storage"
Revent accidental push

This reverts commit ed89034047.
2017-06-19 14:00:27 +02:00
Robin Appelman 64864bf654
dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 13:58:30 +02:00
Joas Schilling b94a7a0ba3
Use the share_folder config for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-19 10:21:56 +02:00
Nextcloud bot deaa8b6885
[tx-robot] updated from transifex 2017-06-19 00:08:29 +00:00
Morris Jobke c3b58918f1 Merge pull request #5442 from Bekcpear/stable12
Fix upload remaining time and uploadrate value
2017-06-17 18:32:47 -05:00
Nextcloud bot 0e608188d2
[tx-robot] updated from transifex 2017-06-17 00:08:36 +00:00
Yaojin Qian d41d48bd43
Fix upload remaining time and uploadrate value
1. The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.

2. The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.

Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 22:03:28 +08:00
Joas Schilling 0c522aa040
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:47:56 +02:00
Joas Schilling 295a0c982c
Allow dir-listing also when one child is blocked by access control
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:47:46 +02:00
Joas Schilling 9c2c42c7cc
Don't try to generate logs for chunking paths
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:42:07 +02:00
Nextcloud bot 3cb59ac602
[tx-robot] updated from transifex 2017-06-16 00:08:53 +00:00
Joas Schilling cdd4a75c17
Backport of #5384 to stable12
Allow to find local users by their email address

Signed-off-by: Joas Schilling <coding@schilljs.com>

Make sure to only add system users once

Signed-off-by: Joas Schilling <coding@schilljs.com>

Add unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-15 19:23:31 +02:00
Lukas Reschke c93cad74f9 Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12
[stable12] Ldap attempt reconnect stable12
2017-06-15 13:29:42 +02:00
Morris Jobke aeb80e0f57 Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares
[stable12] allow users to send PropPatch request when calendar is group-shared with them
2017-06-14 23:11:18 -05:00
Morris Jobke c20faa1c98 Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue
[stable12] urldecode group principals in Cal- and CardDAV backend
2017-06-14 23:10:19 -05:00
Nextcloud bot 1965889fc8
[tx-robot] updated from transifex 2017-06-15 00:08:52 +00:00
Morris Jobke b911033e7a Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12
[stable12] Make file name input tooltip error text change
2017-06-14 11:29:03 -05:00
Morris Jobke 385317a344 Merge pull request #5401 from nextcloud/translate-oauth2
Translate OAuth2 in stable12
2017-06-14 11:22:56 -05:00
Joas Schilling d07a661c94 Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email
[stable12] Prevent sending second WWW-Authenticate header
2017-06-14 14:24:01 +02:00
Joas Schilling 50ee4fba11
Translate OAuth2 in stable12
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 11:50:58 +02:00
Nextcloud bot 426a4c11d6
[tx-robot] updated from transifex 2017-06-14 00:08:49 +00:00
Morris Jobke 1d2c1cf579 Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar
[stable12] allow PropPatch requests to contact_birthdays
2017-06-13 18:11:54 -05:00
Morris Jobke d4eb5cfecb Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars
[stable12] Fix username and avatar for external users
2017-06-13 17:56:39 -05:00
Morris Jobke 4fec6dbf87 Merge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-when-share-view-is-opened
[stable12] Fix tag label removed when share view is opened
2017-06-13 17:32:55 -05:00
Morris Jobke 9e402df41d Merge pull request #5388 from nextcloud/stable12-5378
[stable12] no themed icon when dragging folder
2017-06-13 17:23:02 -05:00
Morris Jobke db83fb7e76 Merge pull request #5389 from nextcloud/stable12-5305
[stable12] Add quota to the files view
2017-06-13 17:22:39 -05:00
Morris Jobke 28f6104bc8 Do not show icon for quota bar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 12:28:23 -05:00
Joas Schilling f6d0b92c59 Remove unused element
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:20 -05:00
Morris Jobke ef184c0b21 Put the quota bar to the bottom
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 12:28:16 -05:00
Joas Schilling 3ca3edd994 Adjust the unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:13 -05:00
Joas Schilling 41f107fd37 Remove the colored corners
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:09 -05:00
Joas Schilling c691b6d299 Add an event so apps can add hidden fields to the files page
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:03 -05:00
Joas Schilling 901eca84b0 Only set the active item when there is one (not the case for quota)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:59 -05:00
Joas Schilling b1ddc57e08 Content will come from the external app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:55 -05:00
Joas Schilling 27b2102d6c Remove useless translation and make it better on unlimited
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:51 -05:00
Jan-Christoph Borchardt fe8450fcc9 Style quota entry in files view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-13 12:27:47 -05:00
Joas Schilling f1da30cc1e Add quota to the files view
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:43 -05:00
Patrik Kernstock a292a4b778 Fix #5349, no themed icon when dragging folder
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-13 12:22:57 -05:00
Lukas Reschke 913758dc28
Prevent sending second WWW-Authenticate header
Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard.

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

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 18:52:30 +02:00
Bjoern Schiessle 751bc180cc
fix 'add to your nextcloud' input field, this is not an email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:00 +02:00
Daniel Calviño Sánchez c9bc521532 Extract toggle visibility of a SystemTagsInfoView to its own view
The SystemTagsInfoViewToggleView is a basic view that renders a label
that, when clicked, toggles the visibility of an associated
SystemTagsInfoView.

In order to keep the view parent agnostic its attachment and detachment
to/from the MainfFileInfoView is done in the FilesPlugin.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez 5985ecb66d Add visibility related methods
SystemTagsInfoView now provides public methods related to its visibility
in preparation to be used by external objects.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez 365d7918b2 Fix toggle element being removed when MainFileInfoView is rendered again
The toggle element was added to the MainFileInfoView element when
SystemTagsInfoView was rendered. However, if the MainFileInfoView was
rendered again after that the toggle element was removed. Therefore,
instead of adding it when SystemTagsInfoView is rendered, the toggle
element has to be added when MainFileInfoView triggers its "post-render"
event.

Note, however, that when MainFileInfoView is rendered all the events are
removed from its child elements. As the toggle uses a "click" event
either the event has to be added back or the element has to be detached
before the MainFileInfoView is rendered.

Fixes #4944

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez 2384703cf6 Trigger pre and post render events in MainFileInfoDetailsView
The post-render event makes possible to modify the
MainFileInfoDetailsView element once it has been rendered, which is
needed by OCA.SystemTags.FilesPlugin to add the "Tags" label to the file
details, while the pre-render event makes possible to detach added
elements if needed before the MainFileInfoDetailsView is rendered again,
as that removes the events from the child DOM elements even if they
belong to other views.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez 706106408c Make possible to know the registered detail views in a details view
In some cases, an app may need to act on a detail view registered by
another app or the core, for example, to add extra elements to the
element of the detail view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
Joas Schilling f6264ad6c4 Merge pull request #5303 from nextcloud/fix_5047-nc12
[stable12] use the email address configured in Nextcloud as sender instead of the users email address
2017-06-13 12:19:56 +02:00
Nextcloud bot e0d8b17b20
[tx-robot] updated from transifex 2017-06-13 00:08:32 +00:00
Lukas Reschke 86b4ebc457 Merge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12
[stable12] add missing parent::setUp that broke any other dav app test
2017-06-12 23:09:35 +02:00
Lukas Reschke e475229204 Merge pull request #5320 from nextcloud/5122-stable12
[stable12] Fix ldap integration tests
2017-06-12 22:10:08 +02:00
Georg Ehrke dba4935f24
urldecode group principals in Cal- and CardDAV backend
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-12 21:02:21 +02:00
Georg Ehrke 2cf8da830c
add missing parent::setUp that broke any other dav app test
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-12 20:34:18 +02:00
Nextcloud bot acda3a2403
[tx-robot] updated from transifex 2017-06-12 00:08:21 +00:00
Nextcloud bot ea39d4feec
[tx-robot] updated from transifex 2017-06-11 00:08:31 +00:00
Arthur Schiwon b1820fa170
Backport of #5122 to stable12
add missing INotificationManager when creating User backend, LDAP
UserManager

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

Make IDE happy

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

add convenience script to run all tests at once

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-09 16:30:56 +02:00
Nextcloud bot 6434305333
[tx-robot] updated from transifex 2017-06-09 00:08:34 +00:00
Bjoern Schiessle 86646a24d5
use the email address configured in Nextcloud as sender instead of the users email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-08 11:49:10 +02:00
Georg Ehrke 32674afd95
allow users to send PropPatch request when calendar is group-shared with them
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 09:29:07 +02:00
Georg Ehrke 01b6a3da86
allow PropPatch requests to contact_birthdays
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 08:05:46 +02:00
Nextcloud bot d00c5886aa
[tx-robot] updated from transifex 2017-06-08 00:08:37 +00:00
Nextcloud bot 85418640b3
[tx-robot] updated from transifex 2017-06-07 00:09:14 +00:00
Joas Schilling ce34db22d7 Don't allow the user to set fields they can't see
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:28 -05:00
Nextcloud bot 7ff205cf94
[tx-robot] updated from transifex 2017-06-06 00:08:55 +00:00
Nextcloud bot 413221bfe1
[tx-robot] updated from transifex 2017-06-05 00:08:38 +00:00
Nextcloud bot cf3988e248
[tx-robot] updated from transifex 2017-06-04 00:08:39 +00:00
Nextcloud bot 5d6345ea4b
[tx-robot] updated from transifex 2017-06-03 00:09:12 +00:00
Bjoern Schiessle 6e7ff24474
add new config switched for the global scale architecture
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-02 11:00:08 +02:00
Nextcloud bot 577ea59968
[tx-robot] updated from transifex 2017-06-02 00:08:40 +00:00
Nextcloud bot db22c42e78
[tx-robot] updated from transifex 2017-06-01 00:08:48 +00:00
Nextcloud bot 99117349df
[tx-robot] updated from transifex 2017-05-31 00:08:57 +00:00
Nextcloud bot 6ae58b6dcb
[tx-robot] updated from transifex 2017-05-30 00:08:54 +00:00
Arthur Schiwon 2567a350f4
fix paging
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:32 +02:00
Arthur Schiwon d017e3602b
make sure used ldap connection resource is always up to date
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:27 +02:00
bline 41a2686fc6
moved to something a little less invasive. back to passing CR around.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:23 +02:00
bline 76ab41732a
special case for controlPagedResultResponse. It would be nice if there was a generic way to pass by reference with call_user_func_array..
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:07 +02:00
Nextcloud bot 2d8ec64ee5
[tx-robot] updated from transifex 2017-05-29 00:08:44 +00:00
Nextcloud bot df3efa4984
[tx-robot] updated from transifex 2017-05-28 00:08:24 +00:00
Nextcloud bot 2e223cd1dc
[tx-robot] updated from transifex 2017-05-27 00:08:42 +00:00
Nextcloud bot 0ed02da5dd
[tx-robot] updated from transifex 2017-05-26 00:08:26 +00:00
Nextcloud bot 13d1c95db1
[tx-robot] updated from transifex 2017-05-25 00:08:13 +00:00
Nextcloud bot 9055109243
[tx-robot] updated from transifex 2017-05-24 00:08:31 +00:00
Robin Appelman 1e06e92bb0
use the correct param type when getting external storages for groups
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-23 16:49:59 +02:00
Roeland Jago Douma 7593fa3464 Merge pull request #5005 from nextcloud/bugfix-stable12/fix_replacing_4mbunicode_for_calendar_properties_table
[stable12] fix replacing of 4MB Unicode Chars in cal props table
2017-05-23 13:43:56 +02:00
Joas Schilling ebf6c628ed
Fix username and avatar for external users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-23 12:04:18 +02:00
Nextcloud bot 6e005e0ffa
[tx-robot] updated from transifex 2017-05-23 00:08:39 +00:00
Phil Davis ed61c437cd
Make new file file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-22 13:03:32 +05:45
Phil Davis db0b3bf42a
Make rename file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-22 13:02:51 +05:45
Joas Schilling 21b6af3e1e
Add missing version requirement to OAuth2 app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 09:01:34 +02:00
Nextcloud bot 9325003a72
[tx-robot] updated from transifex 2017-05-22 00:08:32 +00:00
Georg Ehrke f75b56fc5d
fix replacing of 4MB Unicode Chars in cal props table
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-21 13:27:16 +02:00
Nextcloud bot fa47ed7979
[tx-robot] updated from transifex 2017-05-21 00:08:35 +00:00
Daniel Hansson 8817c65120 fix for sharing stable12
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 17:15:14 +02:00
Nextcloud bot df61c9e283
[tx-robot] updated from transifex 2017-05-20 00:08:37 +00:00
Julius Härtl c190dfbe53
Scale logo only for custom ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 21:01:41 +02:00
Jan-Christoph Borchardt 053dffb169
Fix logo being too big on log in page, fix #4585
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-19 21:01:34 +02:00
Nextcloud bot e14bd212f7
[tx-robot] updated from transifex 2017-05-19 00:08:36 +00:00
Lukas Reschke 7976927628 Merge pull request #4894 from nextcloud/generic-security-activities
Change 2FA activities to more generic security activities
2017-05-19 00:50:44 +02:00
Lukas Reschke 0eb4970ec8 Merge pull request #4704 from nextcloud/add-oauth-code-flow-support
Add oauth code flow support
2017-05-18 23:30:44 +02:00
Lukas Reschke c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons
Fallback to default favicon
2017-05-18 23:30:02 +02:00
Christoph Wurst 258c8720dd
Fix backup codes activity type
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 58683f11ac
Publish 2fa backup codes activities to the right stream
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 1632bb4557
Move activities test code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 0928b5f621
Change 2FA activities to more generic security activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Lukas Reschke f4189699e7
Function accepts only integers
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:59:22 +02:00
Lukas Reschke 639ba526d0
Adjust realm from SabreDAV to Nextcloud
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:38:55 +02:00
Lukas Reschke f93db724d7
Make legacy DAV backend use the BearerAuth backend as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:19:39 +02:00
Lukas Reschke ba7b6bd973
Delete token after usage in test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:05 +02:00
Lukas Reschke fa6ec47a5c
Add indexes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:04 +02:00
Lukas Reschke df3909a7c3
Use Bearer backend for SabreDAV
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke 691646bdae
Add tests for OAuth2 app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke d90eba3f85
Fix style issues pointed out in review
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke b07a0f51ba
Add OAuth state to session
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke 88afd8b224
Cleanup code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke 9d91ebf8e0
Add XSD definitions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle 1eb7f4956b
delete auth token when client gets deleted
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle bb19b37097
hide client secret by default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle 1a8965b488
handle case if no valid client identifier is given
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:06 +02:00
Lukas Reschke 4b4d3bb1c2
It's a bearer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 1470ec95ca
Fetch signle row
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 4d96cd3df7
Change to POST
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke c5ad3c9213
Increase length of encrypted token in database
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke 0a2b57c93f
Get a single row
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke a5ddd65c10
Use query builder
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Lukas Reschke 5f71805c35
Add basic implementation for OAuth 2.0 Authorization Code Flow
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Björn Schießle 879e11e7d1 Merge pull request #4812 from nextcloud/move-sharing-to-migration
Move the file sharing app to migration
2017-05-18 18:24:43 +02:00
Joas Schilling fad02fe00c
Add the column so we keep the value from before the update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 14:45:26 +02:00
Julius Härtl 489131333a
Inject FileAccessHelper for proper testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-18 10:45:42 +02:00
Nextcloud bot d41fd7471c
[tx-robot] updated from transifex 2017-05-18 00:07:48 +00:00
Lukas Reschke aa9b465af7 Merge pull request #4921 from nextcloud/filerow-clickability
Increase width of clickable area in file row to open file/folder
2017-05-17 22:15:46 +02:00
Nextcloud bot 11e04e394d
[tx-robot] updated from transifex 2017-05-17 15:56:32 +00:00
Morris Jobke c2d8fe6336 Merge pull request #4922 from nextcloud/verbose-uploadmenu-text
Use more verbose text for upload menu
2017-05-17 10:48:52 -05:00