]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoFix #1782 1971/head
John Molakvoæ [Tue, 1 Nov 2016 17:21:14 +0000 (18:21 +0100)]
Fix #1782

Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #1887 from nextcloud/downstream-26370
Morris Jobke [Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)]
Merge pull request #1887 from nextcloud/downstream-26370

Added functions to check etag of elements - integration tests

8 years agoMerge pull request #1977 from nextcloud/adjust-badges
Joas Schilling [Wed, 2 Nov 2016 11:35:32 +0000 (12:35 +0100)]
Merge pull request #1977 from nextcloud/adjust-badges

Adjust badges

8 years agoMerge pull request #1966 from nextcloud/fix-csrf-token-generation
Roeland Jago Douma [Wed, 2 Nov 2016 11:09:30 +0000 (12:09 +0100)]
Merge pull request #1966 from nextcloud/fix-csrf-token-generation

Fix CSRF token generation / validation

8 years agoMerge pull request #1975 from nextcloud/federated-sharing-always-https-by-default
Roeland Jago Douma [Wed, 2 Nov 2016 11:09:11 +0000 (12:09 +0100)]
Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default

use https by default if no protocol is given.

8 years agoAdjust badges 1977/head
Lukas Reschke [Wed, 2 Nov 2016 10:50:14 +0000 (11:50 +0100)]
Adjust badges

- Removes the Drone badge
  - This one is lying most of the time since it isn't checking master but the latest build. Thus it fails when it effectively doesn't fail. Let's remove that since it makes us look bad.
- Add CodeCov badge
- Add CII badge

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoMerge pull request #657 from nextcloud/share-by-mail
Joas Schilling [Wed, 2 Nov 2016 10:04:33 +0000 (11:04 +0100)]
Merge pull request #657 from nextcloud/share-by-mail

New share provider: Share by mail

8 years agouse https by default if no protocol is given. Only use unsecure connection if it... 1975/head
Bjoern Schiessle [Wed, 2 Nov 2016 09:44:55 +0000 (10:44 +0100)]
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoFix CSRF token generation / validation 1966/head
Leon Klingele [Mon, 31 Oct 2016 17:22:42 +0000 (18:22 +0100)]
Fix CSRF token generation / validation

Operate on raw bytes instead of base64-encoded strings.
Issue was introduced in a977465

Signed-off-by: Leon Klingele <git@leonklingele.de>
8 years agoMerge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin
Roeland Jago Douma [Wed, 2 Nov 2016 09:06:35 +0000 (10:06 +0100)]
Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin

Color the trusted domain to alert the admin a bit more

8 years agoFix intergration tests 1887/head
Roeland Jago Douma [Thu, 27 Oct 2016 18:40:03 +0000 (20:40 +0200)]
Fix intergration tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix OCS API to be able to remove group shares from self as recipient
Roeland Jago Douma [Tue, 25 Oct 2016 08:18:42 +0000 (10:18 +0200)]
Fix OCS API to be able to remove group shares from self as recipient

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdded test case about issue 26346
Sergio Bertolin [Fri, 14 Oct 2016 08:58:44 +0000 (08:58 +0000)]
Added test case about issue 26346

8 years agoChanged description of variable
Sergio Bertolin [Fri, 14 Oct 2016 07:33:46 +0000 (07:33 +0000)]
Changed description of variable

8 years agoAdded functions to check etag of elements
Sergio Bertolin [Thu, 13 Oct 2016 13:16:30 +0000 (13:16 +0000)]
Added functions to check etag of elements

8 years agoMerge pull request #1951 from nextcloud/settingsmaxheight
Roeland Jago Douma [Wed, 2 Nov 2016 07:45:05 +0000 (08:45 +0100)]
Merge pull request #1951 from nextcloud/settingsmaxheight

restricted the height of the settings area in core/css/apps.css

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 2 Nov 2016 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoimport exception 657/head
Bjoern Schiessle [Tue, 1 Nov 2016 19:12:01 +0000 (20:12 +0100)]
import exception

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoremove unused variable
Bjoern Schiessle [Tue, 1 Nov 2016 19:11:30 +0000 (20:11 +0100)]
remove unused variable

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd new method getSharesInFolder(), see #339
Bjoern Schiessle [Tue, 1 Nov 2016 19:05:09 +0000 (20:05 +0100)]
add new method getSharesInFolder(), see #339

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd tests for the share-by-mail provider
Bjoern Schiessle [Mon, 31 Oct 2016 13:19:34 +0000 (14:19 +0100)]
add tests for the share-by-mail provider

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoalways show correct place holder, mention share by mail only if the share provider...
Bjoern Schiessle [Mon, 31 Oct 2016 10:52:00 +0000 (11:52 +0100)]
always show correct place holder, mention share by mail only if the share provider is enabled

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoenabled by default and add to shipped.json
Bjoern Schiessle [Thu, 27 Oct 2016 15:21:43 +0000 (17:21 +0200)]
enabled by default and add to shipped.json

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agounit tests updated and new added
Bjoern Schiessle [Thu, 27 Oct 2016 10:27:09 +0000 (12:27 +0200)]
unit tests updated and new added

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agofind and show share-by mail links
Bjoern Schiessle [Wed, 26 Oct 2016 10:18:39 +0000 (12:18 +0200)]
find and show share-by mail links

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agodon't show 'notify by mail' option or permissions not available for mail shares
Bjoern Schiessle [Wed, 26 Oct 2016 09:27:43 +0000 (11:27 +0200)]
don't show 'notify by mail' option or permissions not available for mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agosend mail for share-by-mail shares
Bjoern Schiessle [Wed, 26 Oct 2016 09:04:00 +0000 (11:04 +0200)]
send mail for share-by-mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoif we have a exact match, either for the federated cloud id or for the
Bjoern Schiessle [Tue, 25 Oct 2016 15:13:10 +0000 (17:13 +0200)]
if we have a exact match, either for the federated cloud id or for the
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agounified way to display remote shares and mail shares
Bjoern Schiessle [Tue, 25 Oct 2016 14:24:49 +0000 (16:24 +0200)]
unified way to display remote shares and mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoshow correct display name if we have the user in one of our address books
Bjoern Schiessle [Tue, 25 Oct 2016 14:24:24 +0000 (16:24 +0200)]
show correct display name if we have the user in one of our address books

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoimprove search for federated cloud ids and email adresses
Bjoern Schiessle [Tue, 25 Oct 2016 12:42:59 +0000 (14:42 +0200)]
improve search for federated cloud ids and email adresses

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agohandle case if no share-by-mail share provider is loaded
Bjoern Schiessle [Mon, 24 Oct 2016 15:04:40 +0000 (17:04 +0200)]
handle case if no share-by-mail share provider is loaded

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd method to check if a share provider for a given type is loaded
Bjoern Schiessle [Mon, 24 Oct 2016 15:03:36 +0000 (17:03 +0200)]
add method to check if a share provider for a given type is loaded

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoupdate permissions
Bjoern Schiessle [Wed, 5 Oct 2016 15:51:43 +0000 (17:51 +0200)]
update permissions

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoadd share by mail share provider
Bjoern Schiessle [Fri, 29 Jul 2016 13:38:31 +0000 (15:38 +0200)]
add share by mail share provider

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agointroduce share by mail, ui part
Bjoern Schiessle [Fri, 29 Jul 2016 13:37:08 +0000 (15:37 +0200)]
introduce share by mail, ui part

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoMerge pull request #339 from nextcloud/share-types-by-folder
Lukas Reschke [Tue, 1 Nov 2016 17:44:00 +0000 (18:44 +0100)]
Merge pull request #339 from nextcloud/share-types-by-folder

Add getShareTypesInFolder to optimize folder listening

8 years agoAdd defaultShareProvider & federatedshareprovider tests 339/head
Roeland Jago Douma [Tue, 1 Nov 2016 12:22:52 +0000 (13:22 +0100)]
Add defaultShareProvider & federatedshareprovider tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdd Manager unit tests
Roeland Jago Douma [Tue, 1 Nov 2016 11:35:50 +0000 (12:35 +0100)]
Add Manager unit tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix merging backend results
Roeland Jago Douma [Tue, 1 Nov 2016 11:15:14 +0000 (12:15 +0100)]
Fix merging backend results

* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 1 Nov 2016 01:06:57 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

8 years agoAdd remoteprovider getsharesinfolder function
Roeland Jago Douma [Mon, 31 Oct 2016 19:26:11 +0000 (20:26 +0100)]
Add remoteprovider getsharesinfolder function

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoStricter signature
Roeland Jago Douma [Mon, 31 Oct 2016 19:19:00 +0000 (20:19 +0100)]
Stricter signature

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoAdd getShareTypesInFolder to optimize folder listening
Robin Appelman [Sat, 18 Jun 2016 20:04:56 +0000 (22:04 +0200)]
Add getShareTypesInFolder to optimize folder listening

Signed-off-by: Robin Appelman <icewind@owncloud.com>
8 years agoColor the trusted domain to alert the admin a bit more 1964/head
Joas Schilling [Mon, 31 Oct 2016 11:22:21 +0000 (12:22 +0100)]
Color the trusted domain to alert the admin a bit more

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1961 from nextcloud/configphp_begone
Roeland Jago Douma [Mon, 31 Oct 2016 10:51:20 +0000 (11:51 +0100)]
Merge pull request #1961 from nextcloud/configphp_begone

Remove config.php for oc.js

8 years agoMerge pull request #1937 from nextcloud/ros-for-notification-message
Roeland Jago Douma [Mon, 31 Oct 2016 10:51:02 +0000 (11:51 +0100)]
Merge pull request #1937 from nextcloud/ros-for-notification-message

Allow rich object strings in messages as well

8 years agoMerge pull request #1952 from nextcloud/deprecated_backgroudjob
Lukas Reschke [Mon, 31 Oct 2016 10:30:46 +0000 (11:30 +0100)]
Merge pull request #1952 from nextcloud/deprecated_backgroudjob

Cleanup deprecated backgroudjob functions

8 years agoRemove config.php for oc.js 1961/head
Roeland Jago Douma [Mon, 31 Oct 2016 10:00:39 +0000 (11:00 +0100)]
Remove config.php for oc.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoType hints already make sure it is an array 1937/head
Joas Schilling [Fri, 28 Oct 2016 07:23:43 +0000 (09:23 +0200)]
Type hints already make sure it is an array

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoAllow rich object strings in messages as well
Joas Schilling [Thu, 27 Oct 2016 13:43:34 +0000 (15:43 +0200)]
Allow rich object strings in messages as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1935 from nextcloud/downstream-ldap-26
Lukas Reschke [Mon, 31 Oct 2016 08:27:09 +0000 (09:27 +0100)]
Merge pull request #1935 from nextcloud/downstream-ldap-26

Add prefix to the connection

8 years agoMerge pull request #1903 from nextcloud/fix-log-in-button
Lukas Reschke [Mon, 31 Oct 2016 07:51:09 +0000 (08:51 +0100)]
Merge pull request #1903 from nextcloud/fix-log-in-button

remove slight transparency of primary action button, ref #1615

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 31 Oct 2016 01:06:55 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #1955 from nextcloud/issue_#1776
Marius Blüm [Sun, 30 Oct 2016 10:27:57 +0000 (11:27 +0100)]
Merge pull request #1955 from nextcloud/issue_#1776

Issue-1776: Add unshare function to 3-dot menu.

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 30 Oct 2016 00:06:56 +0000 (00:06 +0000)]
[tx-robot] updated from transifex

8 years agorestricted the height of the settings area in core/css/apps.css to max 80% 1951/head
pgys [Sat, 29 Oct 2016 11:12:28 +0000 (13:12 +0200)]
restricted the height of the settings area in core/css/apps.css to max 80%

Signed-off-by: pgys <info@pexlab.space>
8 years agoIssue-1776: Add unshare function to 3-dot menu. 1955/head
Julia Bode [Sat, 29 Oct 2016 14:32:15 +0000 (16:32 +0200)]
Issue-1776: Add unshare function to 3-dot menu.

Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
8 years agoCleanup usages 1952/head
Roeland Jago Douma [Sat, 29 Oct 2016 12:29:50 +0000 (14:29 +0200)]
Cleanup usages

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoRemoved depreacted functions (since 6.0)
Roeland Jago Douma [Sat, 29 Oct 2016 12:26:55 +0000 (14:26 +0200)]
Removed depreacted functions (since 6.0)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n
Lukas Reschke [Sat, 29 Oct 2016 07:39:22 +0000 (09:39 +0200)]
Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n

Move away from legacy OC_L10N

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 29 Oct 2016 00:07:14 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #1949 from nextcloud/disable-codecov-comments
Christoph Wurst [Fri, 28 Oct 2016 23:04:59 +0000 (01:04 +0200)]
Merge pull request #1949 from nextcloud/disable-codecov-comments

Disable codecov comments

8 years agoDisable codecov comments 1949/head
Morris Jobke [Fri, 28 Oct 2016 22:04:30 +0000 (00:04 +0200)]
Disable codecov comments

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoUse OCP\\IL10N in tests too 1948/head
Morris Jobke [Fri, 28 Oct 2016 21:04:36 +0000 (23:04 +0200)]
Use OCP\\IL10N in tests too

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #1926 from nextcloud/fix-comment-mentions-in-activities
Morris Jobke [Fri, 28 Oct 2016 20:47:15 +0000 (22:47 +0200)]
Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities

Fix comment mentions in activities

8 years agoRemove legacy l10n
Roeland Jago Douma [Fri, 28 Oct 2016 20:09:08 +0000 (22:09 +0200)]
Remove legacy l10n

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix more tests
Roeland Jago Douma [Fri, 28 Oct 2016 20:08:32 +0000 (22:08 +0200)]
Fix more tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMove away from OC_L10N
Roeland Jago Douma [Fri, 28 Oct 2016 19:46:28 +0000 (21:46 +0200)]
Move away from OC_L10N

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix comment mentions in activities 1926/head
Joas Schilling [Wed, 26 Oct 2016 15:34:03 +0000 (17:34 +0200)]
Fix comment mentions in activities

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1888 from nextcloud/downstream-26361
Joas Schilling [Fri, 28 Oct 2016 09:42:32 +0000 (11:42 +0200)]
Merge pull request #1888 from nextcloud/downstream-26361

introduce callForSeenUsers and countSeenUsers

8 years agoProper DI of config 1888/head
Roeland Jago Douma [Fri, 28 Oct 2016 07:07:40 +0000 (09:07 +0200)]
Proper DI of config

* Fixed comments

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoUse callForSeenUsers for avatar migration
Morris Jobke [Mon, 24 Oct 2016 15:28:48 +0000 (17:28 +0200)]
Use callForSeenUsers for avatar migration

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agointroduce callForSeenUsers and countSeenUsers (#26361)
Jörn Friedrich Dreyer [Wed, 19 Oct 2016 08:03:29 +0000 (10:03 +0200)]
introduce callForSeenUsers and countSeenUsers (#26361)

* introduce callForSeenUsers and countSeenUsers

* add tests

* oracle should support not null on clob

* since 9.2.0

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 28 Oct 2016 00:07:11 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #1800 from nextcloud/nextcloud-rich-object-strings
Morris Jobke [Thu, 27 Oct 2016 13:30:58 +0000 (15:30 +0200)]
Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings

Nextcloud rich object strings

8 years agoAdd prefix to the connection 1935/head
Juan Pablo Villafáñez [Tue, 25 Oct 2016 07:19:24 +0000 (09:19 +0200)]
Add prefix to the connection

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
8 years agoMerge pull request #1933 from spacegaier/patch-1
Lukas Reschke [Thu, 27 Oct 2016 10:45:07 +0000 (12:45 +0200)]
Merge pull request #1933 from spacegaier/patch-1

Updated doc link version in default theme from 9 to 11

8 years agoUpdated doc link version in default theme from 9 to 11 1933/head
Philip Allgaier [Thu, 27 Oct 2016 08:59:17 +0000 (10:59 +0200)]
Updated doc link version in default theme from 9 to 11

8 years agoMerge pull request #1929 from nextcloud/share_email_to_OCS
Lukas Reschke [Thu, 27 Oct 2016 07:03:29 +0000 (09:03 +0200)]
Merge pull request #1929 from nextcloud/share_email_to_OCS

Remove notify recipient function

8 years agoMerge pull request #1930 from nextcloud/fix_avatars_exif
Lukas Reschke [Thu, 27 Oct 2016 06:56:56 +0000 (08:56 +0200)]
Merge pull request #1930 from nextcloud/fix_avatars_exif

Fix avatar on exif rotated images

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 27 Oct 2016 00:07:01 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

8 years agoFix avatar on exif rotated images 1930/head
Roeland Jago Douma [Wed, 26 Oct 2016 19:36:33 +0000 (21:36 +0200)]
Fix avatar on exif rotated images

Fixes #1928

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoRemove internal share mail function 1801/head 1929/head
Roeland Jago Douma [Sat, 22 Oct 2016 11:43:39 +0000 (13:43 +0200)]
Remove internal share mail function

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoRemove notify recipient option
Roeland Jago Douma [Wed, 19 Oct 2016 10:51:01 +0000 (12:51 +0200)]
Remove notify recipient option

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #1920 from nextcloud/legacy-pages-should-also-receive-the-nonce
Roeland Jago Douma [Wed, 26 Oct 2016 14:41:34 +0000 (16:41 +0200)]
Merge pull request #1920 from nextcloud/legacy-pages-should-also-receive-the-nonce

Add nonce also to legacy CSP

8 years agoMerge pull request #1925 from nextcloud/issue-1874-allow-users-to-change-their-passwo...
Joas Schilling [Wed, 26 Oct 2016 14:27:41 +0000 (16:27 +0200)]
Merge pull request #1925 from nextcloud/issue-1874-allow-users-to-change-their-passwords-again

Allow users to change their passwords again

8 years agoAllow users to change their passwords again 1925/head
Joas Schilling [Wed, 26 Oct 2016 12:04:38 +0000 (14:04 +0200)]
Allow users to change their passwords again

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions
Morris Jobke [Wed, 26 Oct 2016 12:02:49 +0000 (14:02 +0200)]
Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions

comment mentions: show displayname not uid

8 years agoMerge pull request #1923 from nextcloud/fix-template-url
Morris Jobke [Wed, 26 Oct 2016 11:58:14 +0000 (13:58 +0200)]
Merge pull request #1923 from nextcloud/fix-template-url

Fix issue template url

8 years ago… and the raw version of it 1923/head
blizzz [Wed, 26 Oct 2016 11:38:26 +0000 (13:38 +0200)]
… and the raw version of it

8 years agoFix issue template url
blizzz [Wed, 26 Oct 2016 11:36:23 +0000 (13:36 +0200)]
Fix issue template url

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
8 years agoMerge pull request #1907 from nextcloud/downstream-26164
Morris Jobke [Wed, 26 Oct 2016 11:17:35 +0000 (13:17 +0200)]
Merge pull request #1907 from nextcloud/downstream-26164

Highlight files and update storage stats at end of upload (#26164)

8 years agoMerge pull request #1921 from nextcloud/ignore-htaccess
Morris Jobke [Wed, 26 Oct 2016 11:16:50 +0000 (13:16 +0200)]
Merge pull request #1921 from nextcloud/ignore-htaccess

Ignore .htaccess So no one commits the crappy 403 and 404 anymore

8 years agoIdentify Chromium as Chrome 1920/head
Joas Schilling [Wed, 26 Oct 2016 10:07:10 +0000 (12:07 +0200)]
Identify Chromium as Chrome

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoSo no one commits the crappy 403 and 404 anymore 1921/head
Joas Schilling [Wed, 26 Oct 2016 08:47:18 +0000 (10:47 +0200)]
So no one commits the crappy 403 and 404 anymore

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1355 from nextcloud/apps_flexbox
Morris Jobke [Wed, 26 Oct 2016 08:28:02 +0000 (10:28 +0200)]
Merge pull request #1355 from nextcloud/apps_flexbox

Use flexbox on app page

8 years agoMerge pull request #1914 from nextcloud/downstream-26468
Morris Jobke [Wed, 26 Oct 2016 07:55:56 +0000 (09:55 +0200)]
Merge pull request #1914 from nextcloud/downstream-26468

Remove all unneeded set_include_path()

8 years agoAdd nonce also to legacy CSP
Lukas Reschke [Wed, 26 Oct 2016 07:41:18 +0000 (09:41 +0200)]
Add nonce also to legacy CSP

Pages that do not use the AppFramework have its CSP inherited from `\OC_Response::addSecurityHeaders`. While those are not many anymore, there are some examples such as the "Help" page.

To stay completely backwards-compatible we should also add the nonce to the legacy CSP response.

To test that open your browser console and open the help page. Without this you will get a JS error. With this you won't.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 26 Oct 2016 00:07:12 +0000 (00:07 +0000)]
[tx-robot] updated from transifex