Commit Graph

16447 Commits

Author SHA1 Message Date
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
Morris Jobke 2ec616323b Merge pull request #4918 from nextcloud/theming-capabilities-plain-background
OCS Return color when theming uses no background image
2017-05-17 10:42:41 -05:00
Julius Härtl 81847c01b0
Return color when theming uses no background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 13:16:44 +02:00
Julius Härtl 639168ede4
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:16:59 +02:00
Julius Härtl d3865b6096
Use appdata logo when generating icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:14:37 +02:00
Julius Härtl edb5502b9d
Add proper Content-Type to icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
Julius Härtl 1157f413c9
Fallback to default favicon
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
Nextcloud bot 443cbdc739
[tx-robot] updated from transifex 2017-05-17 00:08:09 +00:00
Jan-Christoph Borchardt b7a9ec0002 Use more verbose text for upload menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:06:05 +02:00
Jan-Christoph Borchardt ecf3deb01c Increase width of clickable area in file row to open file/folder
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:04:43 +02:00
Jan-Christoph Borchardt c180ad1caa Remove primary class from public link download button 2017-05-16 20:47:52 +02:00
Christoph Wurst 1161139ebb Merge pull request #4900 from nextcloud/fix-search-mime-icons
Use proper mime icons for search results
2017-05-16 20:04:33 +02:00
Lukas Reschke 15f7fe022b Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user
Make it clear that you can now click on usernames
2017-05-16 16:29:09 +02:00
Julius Härtl da281822b6
Use proper mime icons for search results
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-16 14:30:49 +02:00
Roeland Jago Douma fd74428cdb Merge pull request #4865 from nextcloud/improve-two-factor-buttons
Improve layout of buttons for two factor auth
2017-05-16 13:11:55 +02:00
Morris Jobke e920e20284 Merge pull request #4425 from nextcloud/oci
Primary key is too long for oracle
2017-05-15 23:55:50 -05:00
Nextcloud bot 7d1f362aa0
[tx-robot] updated from transifex 2017-05-16 00:08:08 +00:00
Joas Schilling d89d96203a Rename the index so the name is unique until the old table is deleted
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Joas Schilling 74a6a6c839 Add a update step that copies all the backup codes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Joas Schilling 2dc79efb32 Rename the table to a valid name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Morris Jobke 91dfff5db4 Revert "fix permissions of mountpoints - take 2" 2017-05-15 12:43:25 -05:00
Morris Jobke ad0d0b0916 Merge pull request #4685 from nextcloud/fix_4683
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
Morris Jobke 30443ac177 Improve layout of buttons for two factor auth
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 11:45:15 -05:00
Morris Jobke 3f201ec7f3 Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion
Remove more personal info on user deletion
2017-05-15 11:03:33 -05:00
Robin Appelman 9b750c08ac
update comment to code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
Roeland Jago Douma cef2110263
Revert "fix objectstore rename"
This reverts commit 5334a3dc33.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-15 13:59:18 +02:00
Joas Schilling cd79eb1b2c
Remove 2FA backup codes on user deletion
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 13:31:30 +02:00
Nextcloud bot 9ad57cabc8
[tx-robot] updated from transifex 2017-05-15 00:08:14 +00:00
Nextcloud bot b1bd9ff0b9
[tx-robot] updated from transifex 2017-05-14 00:07:54 +00:00
Nextcloud bot 6e3a914f4a
[tx-robot] updated from transifex 2017-05-13 00:08:00 +00:00
Morris Jobke 2289ccd0ec Merge pull request #4829 from nextcloud/theming-preview-click
Clicking on theming preview triggers fileupload dialog
2017-05-12 10:22:20 -05:00
Joas Schilling 37d333c3b5
Don't open the dialog for logo and background
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:48:51 +02:00
Joas Schilling 51757716ec
Fix the share type of guest shares when migrating from ownCloud
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Joas Schilling 643b4a4ec4
Move the file sharing app to migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Morris Jobke c2350f237e Clicking on theming preview triggers fileupload dialog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:49:36 -05:00
Nextcloud bot 645f0aa96f
[tx-robot] updated from transifex 2017-05-12 00:07:46 +00:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Morris Jobke 167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes
Use automatic injection for appdata folders
2017-05-10 17:31:05 -05:00
Morris Jobke affa8d07ca Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn
Add fallback to jQuery.fn.globalEval
2017-05-10 11:37:06 -05:00
Lukas Reschke 93994b1320
Eval script elemtents in HTML body response
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-10 13:03:15 +02:00
Joas Schilling 5c20d2ca8c
Use the configured lookup server
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
Joas Schilling 266a1e88fa
Define method shouldRun
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
Joas Schilling a8bb4a1898
Use automatic DI injection for UpdateLookupServer
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:44:02 +02:00
Nextcloud bot fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Lukas Reschke ec69980154 Merge pull request #4772 from nextcloud/fix-theming-background-preview
Fix theming preview for background image
2017-05-10 00:31:55 +02:00
Morris Jobke b2c96d0c23 Stop if user folder is not available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 11:26:08 -05:00
Julius Härtl fb204de7f6
Fix theming preview for background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-09 18:21:41 +02:00
Roeland Jago Douma 04a5c34cac Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment
Fix mentioned user not clickable after posting or editing a comment
2017-05-09 14:23:29 +02:00
Roeland Jago Douma 07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload
Proper exception for upload of .htaccess file via WebDAV
2017-05-09 10:35:38 +02:00
Christoph Wurst 56a9084dd2
Do not list system users in contacts menu if sharing autocompletion is disabled
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-09 08:45:36 +02:00
Nextcloud bot 37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot 43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke f8044cbbce Proper exception for upload of .htaccess file via WebDAV
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 20:03:41 -05:00
Nextcloud bot f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Nextcloud bot 9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Daniel Calviño Sánchez 0db3a413b3 Fix mentioned user not clickable after posting or editing a comment
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.

Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).

Fixes #4555

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
Daniel Calviño Sánchez 002018d8ad Add missing unit tests for comments with mentions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
Morris Jobke fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages
don't mention the owner of a file in case of a re-share by mail.
2017-05-08 13:32:04 -05:00
Morris Jobke 2d707fdfb5 Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch
fix PROPPATCH requests to read-only shared calendars
2017-05-08 12:42:30 -05:00
Bjoern Schiessle adb60ae965
don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-08 19:20:31 +02:00
Morris Jobke df6ce6b385 Merge pull request #4675 from nextcloud/fix_4651
Create a photo cache to speedup the contactsmenu
2017-05-08 12:20:27 -05:00
Robin Appelman 36d0c3da69 Merge pull request #4733 from nextcloud/fix-browser-dav-root
fix error when browsing the dav root
2017-05-08 18:04:13 +02:00
Lukas Reschke 099234cf12
Add function to request SVG or regular fallback image
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
Robin Appelman 9d8936c5bf
fix error when browsing the dav root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-08 14:34:36 +02:00
Roeland Jago Douma dea6edb066
Fix init
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 12:40:00 +02:00
Lukas Reschke 278637feb5 Merge pull request #4556 from nextcloud/downstream-ldap-78
LDAP: only use proxy classes as backend
2017-05-08 12:29:38 +02:00
Georg Ehrke 255442f281
fix PROPPATCH requests to read-only shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-08 12:09:15 +02:00
Roeland Jago Douma 92408390b0
Fix ImageExportPluginTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 747990b03a
No more XSS
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 3ab53d000f
Clear cache on vcard change/delete
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 34d97aa51c
Request proper size for contacts menu
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma dd430c2fd7
Cache the carddav photo endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 303c0dd6a8
Always dispatch Carddav events
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:47 +02:00
Julius Härtl 2801f5139b
Adjust login button color and remove border
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
Julius Härtl 510f7cf1b6
Fix tests for theming backgroundColor
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
Julius Haertl 4199a56912
Theming app: Add plain background color option
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-05-08 10:16:29 +02:00
Jan-Christoph Borchardt 010b9c4609 Fix name of external storages
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-08 00:33:45 -05:00
Nextcloud bot 6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00