]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoMerge branch 'master' of https://github.com/nextcloud/server 520/head
root [Fri, 22 Jul 2016 08:47:27 +0000 (16:47 +0800)]
Merge branch 'master' of https://github.com/nextcloud/server

8 years agoNew LDAPProvider for user_ldap
root [Fri, 22 Jul 2016 08:46:29 +0000 (16:46 +0800)]
New LDAPProvider for user_ldap

8 years agoMerge pull request #500 from nextcloud/bump_version
Joas Schilling [Fri, 22 Jul 2016 08:03:42 +0000 (10:03 +0200)]
Merge pull request #500 from nextcloud/bump_version

Bump version

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 22 Jul 2016 00:10:05 +0000 (00:10 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #505 from nextcloud/fix-license-script
Morris Jobke [Thu, 21 Jul 2016 21:48:31 +0000 (23:48 +0200)]
Merge pull request #505 from nextcloud/fix-license-script

Fix the license script

8 years agoMerge pull request #496 from nextcloud/fix-config-generation
Morris Jobke [Thu, 21 Jul 2016 21:37:22 +0000 (23:37 +0200)]
Merge pull request #496 from nextcloud/fix-config-generation

Make the changes from doc fix persistant

8 years agoMerge pull request #507 from nextcloud/run-le-script
Morris Jobke [Thu, 21 Jul 2016 21:27:15 +0000 (23:27 +0200)]
Merge pull request #507 from nextcloud/run-le-script

Update emails and license headers with latest changes

8 years agoMerge pull request #374 from lpszBuffer/master
William Bargent [Thu, 21 Jul 2016 17:55:58 +0000 (18:55 +0100)]
Merge pull request #374 from lpszBuffer/master

Alters 'No Internet Connection' error message. #181

8 years agoMerge pull request #480 from nextcloud/fix_ocs_response_format
Lukas Reschke [Thu, 21 Jul 2016 17:52:17 +0000 (19:52 +0200)]
Merge pull request #480 from nextcloud/fix_ocs_response_format

AppFramework default response for OCS is xml

8 years agoUpdate with robin 507/head
Joas Schilling [Thu, 21 Jul 2016 16:13:36 +0000 (18:13 +0200)]
Update with robin

8 years agoFix others
Joas Schilling [Thu, 21 Jul 2016 15:07:57 +0000 (17:07 +0200)]
Fix others

8 years agoFix apps/
Joas Schilling [Thu, 21 Jul 2016 14:49:16 +0000 (16:49 +0200)]
Fix apps/

8 years agoonly search the license header for @copyright statements 505/head
Bjoern Schiessle [Thu, 21 Jul 2016 16:01:31 +0000 (18:01 +0200)]
only search the license header for @copyright statements

8 years agoFix the license script
Joas Schilling [Thu, 21 Jul 2016 15:08:43 +0000 (17:08 +0200)]
Fix the license script

8 years agoMerge pull request #506 from nextcloud/update-mailmap
Joas Schilling [Thu, 21 Jul 2016 15:43:33 +0000 (17:43 +0200)]
Merge pull request #506 from nextcloud/update-mailmap

Fix more mailmap entries

8 years agoFix more mailmap entries 506/head
Joas Schilling [Thu, 21 Jul 2016 15:32:03 +0000 (17:32 +0200)]
Fix more mailmap entries

8 years agoMerge pull request #501 from nextcloud/mailmap
Björn Schießle [Thu, 21 Jul 2016 14:38:55 +0000 (16:38 +0200)]
Merge pull request #501 from nextcloud/mailmap

Fix e-mail in mailmap

8 years agoIncrease app versions 500/head
Joas Schilling [Thu, 21 Jul 2016 13:50:30 +0000 (15:50 +0200)]
Increase app versions

8 years agoFix e-mail in mailmap 501/head
Roeland Jago Douma [Thu, 21 Jul 2016 12:48:26 +0000 (14:48 +0200)]
Fix e-mail in mailmap

8 years agoBump version
Roeland Jago Douma [Thu, 21 Jul 2016 12:44:52 +0000 (14:44 +0200)]
Bump version

8 years agoChange the app name 496/head
Joas Schilling [Thu, 21 Jul 2016 10:57:05 +0000 (12:57 +0200)]
Change the app name

8 years agoMake the changes from https://github.com/nextcloud/documentation/commit/6ccd2c5678b85...
Joas Schilling [Thu, 21 Jul 2016 10:26:48 +0000 (12:26 +0200)]
Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant

8 years agoMerge pull request #477 from nextcloud/fix-layout-public-upload
Morris Jobke [Thu, 21 Jul 2016 07:28:35 +0000 (09:28 +0200)]
Merge pull request #477 from nextcloud/fix-layout-public-upload

move closing div to the right place

8 years agoMerge pull request #484 from nextcloud/reenable-help-section
Morris Jobke [Thu, 21 Jul 2016 07:19:11 +0000 (09:19 +0200)]
Merge pull request #484 from nextcloud/reenable-help-section

[master] Reenable help section

8 years agoMerge pull request #486 from nextcloud/master-link-proper
Morris Jobke [Thu, 21 Jul 2016 07:17:53 +0000 (09:17 +0200)]
Merge pull request #486 from nextcloud/master-link-proper

[master] Properly link to nextcloud

8 years agoMerge pull request #488 from nextcloud/brand-to-nextcloud
Morris Jobke [Thu, 21 Jul 2016 07:16:56 +0000 (09:16 +0200)]
Merge pull request #488 from nextcloud/brand-to-nextcloud

[master] Use proper branding

8 years agoAdd proper links 484/head
Lukas Reschke [Thu, 21 Jul 2016 00:10:28 +0000 (02:10 +0200)]
Add proper links

8 years agoRevert "Remove "Help" link from personal sidebar"
Lukas Reschke [Thu, 21 Jul 2016 00:08:56 +0000 (02:08 +0200)]
Revert "Remove "Help" link from personal sidebar"

This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779.

8 years ago[master] Properly link to nextcloud 486/head
Lukas Reschke [Thu, 21 Jul 2016 00:15:14 +0000 (02:15 +0200)]
[master] Properly link to nextcloud

8 years agoUse proper branding 488/head
Lukas Reschke [Thu, 21 Jul 2016 00:20:29 +0000 (02:20 +0200)]
Use proper branding

Stable9 has this already

8 years agoMerge branch 'master' of https://github.com/nextcloud/server
Lukas Reschke [Thu, 21 Jul 2016 00:24:06 +0000 (02:24 +0200)]
Merge branch 'master' of https://github.com/nextcloud/server

8 years agoFix typo
Lukas Reschke [Thu, 21 Jul 2016 00:23:42 +0000 (02:23 +0200)]
Fix typo

8 years agoAlters 'No Internet Connection' error message. #181 374/head
Derek [Mon, 11 Jul 2016 23:24:57 +0000 (17:24 -0600)]
Alters 'No Internet Connection' error message. #181

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 21 Jul 2016 00:09:07 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoLink to proper clients
Lukas Reschke [Wed, 20 Jul 2016 23:56:47 +0000 (01:56 +0200)]
Link to proper clients

8 years agoPort https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c...
Lukas Reschke [Wed, 20 Jul 2016 23:43:32 +0000 (01:43 +0200)]
Port https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c6df to master

8 years agoAdd ownCloud cert
Lukas Reschke [Wed, 20 Jul 2016 23:34:35 +0000 (01:34 +0200)]
Add ownCloud cert

8 years agoUse proper certificates
Lukas Reschke [Wed, 20 Jul 2016 23:32:59 +0000 (01:32 +0200)]
Use proper certificates

Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9

8 years agoMerge pull request #483 from nextcloud/use-proper-documentation-links
Lukas Reschke [Wed, 20 Jul 2016 22:47:27 +0000 (00:47 +0200)]
Merge pull request #483 from nextcloud/use-proper-documentation-links

Use proper documentation links

8 years agoUse proper documentation links 483/head
Lukas Reschke [Wed, 20 Jul 2016 22:36:52 +0000 (00:36 +0200)]
Use proper documentation links

Since it is just faking the 10 we need to hardcode this here...

8 years ago10.0 beta it is
Lukas Reschke [Wed, 20 Jul 2016 22:32:43 +0000 (00:32 +0200)]
10.0 beta it is

8 years agoMerge pull request #479 from nextcloud/add-bruteforce-throttler
Lukas Reschke [Wed, 20 Jul 2016 22:31:02 +0000 (00:31 +0200)]
Merge pull request #479 from nextcloud/add-bruteforce-throttler

Implement brute force protection

8 years agoMitigate race condition 479/head
Lukas Reschke [Wed, 20 Jul 2016 21:09:27 +0000 (23:09 +0200)]
Mitigate race condition

8 years agoJSON encode the values
Lukas Reschke [Wed, 20 Jul 2016 20:47:33 +0000 (22:47 +0200)]
JSON encode the values

8 years agoImplement brute force protection
Lukas Reschke [Wed, 20 Jul 2016 16:36:15 +0000 (18:36 +0200)]
Implement brute force protection

Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)

8 years agoAppFramework do not get default response 480/head
Roeland Jago Douma [Wed, 20 Jul 2016 19:30:39 +0000 (21:30 +0200)]
AppFramework do not get default response

The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.

This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.

8 years agoMerge pull request #476 from nextcloud/port-same-site-cookies
Lukas Reschke [Wed, 20 Jul 2016 19:35:02 +0000 (21:35 +0200)]
Merge pull request #476 from nextcloud/port-same-site-cookies

[master] Port Same-Site Cookies to master

8 years agoMerge pull request #466 from nextcloud/escape-special-characters
Lukas Reschke [Wed, 20 Jul 2016 19:24:19 +0000 (21:24 +0200)]
Merge pull request #466 from nextcloud/escape-special-characters

Escape special characters (#25429)

8 years agoMerge pull request #475 from nextcloud/ocs-middleware
Roeland Douma [Wed, 20 Jul 2016 19:04:25 +0000 (21:04 +0200)]
Merge pull request #475 from nextcloud/ocs-middleware

Add OCS Middleware

8 years agoMerge pull request #461 from nextcloud/session-styling
Morris Jobke [Wed, 20 Jul 2016 18:57:06 +0000 (20:57 +0200)]
Merge pull request #461 from nextcloud/session-styling

Minor sessions/app password improvements

8 years agoMerge pull request #471 from nextcloud/storage-fopenspecialchars
Morris Jobke [Wed, 20 Jul 2016 18:56:59 +0000 (20:56 +0200)]
Merge pull request #471 from nextcloud/storage-fopenspecialchars

Added storage tests for fopen with special chars

8 years agoMerge pull request #390 from nextcloud/occ-user
Roeland Douma [Wed, 20 Jul 2016 18:36:33 +0000 (20:36 +0200)]
Merge pull request #390 from nextcloud/occ-user

More occ user management commands

8 years agoMerge pull request #467 from nextcloud/use-clipboard-api
Roeland Douma [Wed, 20 Jul 2016 18:11:08 +0000 (20:11 +0200)]
Merge pull request #467 from nextcloud/use-clipboard-api

Use clipboard api

8 years agoMerge pull request #464 from nextcloud/master-change-load-order
Roeland Douma [Wed, 20 Jul 2016 18:08:22 +0000 (20:08 +0200)]
Merge pull request #464 from nextcloud/master-change-load-order

[master] Change load order of auth backends so that we can throw an exception …

8 years agoMerge pull request #468 from nextcloud/stringid-fix
Roeland Douma [Wed, 20 Jul 2016 18:06:46 +0000 (20:06 +0200)]
Merge pull request #468 from nextcloud/stringid-fix

Cast share id to string (#25402)

8 years agoDeprecate \OCP\API 475/head
Roeland Jago Douma [Wed, 20 Jul 2016 14:45:29 +0000 (16:45 +0200)]
Deprecate \OCP\API

8 years agoAdd unit tests
Roeland Jago Douma [Wed, 20 Jul 2016 14:43:11 +0000 (16:43 +0200)]
Add unit tests

8 years agoAdd OCSMiddleware to catch OCS exceptions
Roeland Jago Douma [Wed, 20 Jul 2016 07:43:02 +0000 (09:43 +0200)]
Add OCSMiddleware to catch OCS exceptions

* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException

8 years ago[master] Port Same-Site Cookies to master 476/head
Lukas Reschke [Wed, 20 Jul 2016 15:37:30 +0000 (17:37 +0200)]
[master] Port Same-Site Cookies to master

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

8 years agoMerge pull request #473 from nextcloud/ux-improvement-share-dialog
Morris Jobke [Wed, 20 Jul 2016 16:34:55 +0000 (18:34 +0200)]
Merge pull request #473 from nextcloud/ux-improvement-share-dialog

only show additional edit permissions for folders

8 years agomove closing div to the right place 477/head
Bjoern Schiessle [Wed, 20 Jul 2016 16:34:32 +0000 (18:34 +0200)]
move closing div to the right place

8 years agoMerge pull request #462 from nextcloud/master-explode
Morris Jobke [Wed, 20 Jul 2016 16:31:11 +0000 (18:31 +0200)]
Merge pull request #462 from nextcloud/master-explode

[master] Use explode() instead of split()

8 years agoMerge pull request #470 from nextcloud/sftp-renameoverwritedir
Morris Jobke [Wed, 20 Jul 2016 16:31:06 +0000 (18:31 +0200)]
Merge pull request #470 from nextcloud/sftp-renameoverwritedir

Fix overwriting folders on rename with SFTP

8 years agoMerge pull request #472 from nextcloud/show-app-name-in-errormsg
Björn Schießle [Wed, 20 Jul 2016 16:20:49 +0000 (18:20 +0200)]
Merge pull request #472 from nextcloud/show-app-name-in-errormsg

Show app name in error message if app could not be loaded. (#25441)

8 years agoMerge pull request #402 from nextcloud/smb-notifications
Morris Jobke [Wed, 20 Jul 2016 14:19:21 +0000 (16:19 +0200)]
Merge pull request #402 from nextcloud/smb-notifications

smb update notifications

8 years agosort tokens 461/head
Robin Appelman [Wed, 20 Jul 2016 13:49:01 +0000 (15:49 +0200)]
sort tokens

8 years agoonly show additional edit permissions for folders 473/head
Bjoern Schiessle [Wed, 20 Jul 2016 13:24:51 +0000 (15:24 +0200)]
only show additional edit permissions for folders

8 years agoShow app name in error message if app could not be loaded. (#25441) 472/head
Klaas Freitag [Fri, 15 Jul 2016 20:36:42 +0000 (22:36 +0200)]
Show app name in error message if app could not be loaded. (#25441)

8 years agoAdded storage tests for fopen with special chars 471/head
Vincent Petry [Mon, 4 Jul 2016 15:49:44 +0000 (17:49 +0200)]
Added storage tests for fopen with special chars

This makes it possible to test special chars with unit tests.
There is already a test for directories but there was none for file
names.

8 years agoFix overwriting folders on rename with SFTP 470/head
Vincent Petry [Fri, 1 Jul 2016 15:24:57 +0000 (17:24 +0200)]
Fix overwriting folders on rename with SFTP

This aligns the behavior with other storages and also fixes the failing
unit test testRenameOverWriteDirectory

8 years agoCast share id to string (#25402) 468/head
Vincent Petry [Mon, 11 Jul 2016 08:27:47 +0000 (10:27 +0200)]
Cast share id to string (#25402)

8 years agoUse an icon to set the email instead of a button with string 467/head
Thomas Müller [Fri, 8 Jul 2016 13:23:38 +0000 (15:23 +0200)]
Use an icon to set the email instead of a button with string

8 years agoAdd clipboard button to public share link
Thomas Müller [Fri, 8 Jul 2016 12:30:32 +0000 (14:30 +0200)]
Add clipboard button to public share link

8 years agoEscape special characters (#25429) 466/head
Aaron Wood [Wed, 20 Jul 2016 12:20:45 +0000 (08:20 -0400)]
Escape special characters (#25429)

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Escape LIKE parameter

* Use correct method in the AbstractMapping class

* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches

* Don't escape hardcoded wildcard

8 years agoChange load order of auth backends so that we can throw an exception in OCA\DAV\Conne... 464/head
Thomas Müller [Thu, 14 Jul 2016 14:19:31 +0000 (16:19 +0200)]
Change load order of auth backends so that we can throw an exception in OCA\DAV\Connector\Sabre\Auth - fixes #25362 (#25476)

8 years ago[master] Use explode() instead of split() 462/head
Lukas Reschke [Wed, 20 Jul 2016 12:36:39 +0000 (14:36 +0200)]
[master] Use explode() instead of split()

Sync from https://github.com/owncloud/core/pull/25488

8 years agoMerge pull request #460 from nextcloud/issue-459-html-decoded-error-message-when...
Lukas Reschke [Wed, 20 Jul 2016 12:31:41 +0000 (14:31 +0200)]
Merge pull request #460 from nextcloud/issue-459-html-decoded-error-message-when-uploading-folder

Fix the HTML encoding when uploading a folder in FF when using french…

8 years agoright allign last activity
Robin Appelman [Wed, 20 Jul 2016 12:26:03 +0000 (14:26 +0200)]
right allign last activity

8 years agofix apppassword table with only a few entries being streched
Robin Appelman [Wed, 20 Jul 2016 12:25:23 +0000 (14:25 +0200)]
fix apppassword table with only a few entries being streched

8 years agoChange "recent activity" to "last activity"
Robin Appelman [Wed, 20 Jul 2016 12:25:03 +0000 (14:25 +0200)]
Change "recent activity" to "last activity"

8 years agoimprove matching safari user agent
Robin Appelman [Wed, 20 Jul 2016 12:13:23 +0000 (14:13 +0200)]
improve matching safari user agent

8 years agoFix the HTML encoding when uploading a folder in FF when using french l10n 460/head
Joas Schilling [Wed, 20 Jul 2016 11:03:27 +0000 (13:03 +0200)]
Fix the HTML encoding when uploading a folder in FF when using french l10n

8 years agoMerge pull request #458 from nextcloud/remove-ee-apps-from-shipped.json
Joas Schilling [Wed, 20 Jul 2016 10:18:40 +0000 (12:18 +0200)]
Merge pull request #458 from nextcloud/remove-ee-apps-from-shipped.json

Remove pre-fork EE apps from shipped.json

8 years agoRemove pre-fork EE apps from shipped.json 458/head
Joas Schilling [Wed, 20 Jul 2016 09:19:55 +0000 (11:19 +0200)]
Remove pre-fork EE apps from shipped.json

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 20 Jul 2016 00:09:13 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #448 from nextcloud/master-guzzle
Roeland Douma [Tue, 19 Jul 2016 19:45:52 +0000 (21:45 +0200)]
Merge pull request #448 from nextcloud/master-guzzle

[master] Update third-party reference

8 years agoMerge pull request #452 from nextcloud/session-passwords-design
Morris Jobke [Tue, 19 Jul 2016 18:57:54 +0000 (20:57 +0200)]
Merge pull request #452 from nextcloud/session-passwords-design

Adjust wording and layout of Sessions and App passwords personal settings

8 years ago[master] Update third-party reference 448/head
Lukas Reschke [Tue, 19 Jul 2016 15:08:00 +0000 (17:08 +0200)]
[master] Update third-party reference

For https://github.com/nextcloud/3rdparty/pull/7

8 years agoMerge pull request #451 from nextcloud/github-link
Lukas Reschke [Tue, 19 Jul 2016 18:46:23 +0000 (20:46 +0200)]
Merge pull request #451 from nextcloud/github-link

fix Github link in Personal and Admin settings Version note

8 years agoMerge pull request #446 from nextcloud/cron-radio-buttons-color
Morris Jobke [Tue, 19 Jul 2016 15:54:16 +0000 (17:54 +0200)]
Merge pull request #446 from nextcloud/cron-radio-buttons-color

Use the themed radio buttons for cron selection

8 years agoMerge pull request #441 from nextcloud/fix-maintenance-mode
Björn Schießle [Tue, 19 Jul 2016 14:59:24 +0000 (16:59 +0200)]
Merge pull request #441 from nextcloud/fix-maintenance-mode

Fix maintenance mode

8 years agoUse the themed radio buttons for cron selection 446/head
Joas Schilling [Tue, 19 Jul 2016 14:41:47 +0000 (16:41 +0200)]
Use the themed radio buttons for cron selection

8 years agoMerge pull request #438 from nextcloud/sessions-list-format
Morris Jobke [Tue, 19 Jul 2016 11:50:32 +0000 (13:50 +0200)]
Merge pull request #438 from nextcloud/sessions-list-format

format current and sync client sessions in Personal

8 years agoMerge pull request #400 from nextcloud/ocs_appframework
Roeland Douma [Tue, 19 Jul 2016 10:21:14 +0000 (12:21 +0200)]
Merge pull request #400 from nextcloud/ocs_appframework

OCS routes use AppFramework

8 years agoset max width for sessions tables so it doesn’t go crazy on large screens 452/head
Jan-Christoph Borchardt [Tue, 19 Jul 2016 09:42:57 +0000 (11:42 +0200)]
set max width for sessions tables so it doesn’t go crazy on large screens

8 years agoadjust layout of Sessions and App passwords sections
Jan-Christoph Borchardt [Tue, 19 Jul 2016 09:37:46 +0000 (11:37 +0200)]
adjust layout of Sessions and App passwords sections

8 years agosimplify wording of Sessions and App passwords sections
Jan-Christoph Borchardt [Tue, 19 Jul 2016 09:37:20 +0000 (11:37 +0200)]
simplify wording of Sessions and App passwords sections

8 years agoMerge pull request #436 from nextcloud/public-regex-to-match-our-clients
Morris Jobke [Tue, 19 Jul 2016 09:35:10 +0000 (11:35 +0200)]
Merge pull request #436 from nextcloud/public-regex-to-match-our-clients

Copy the regexes to the public interface

8 years agoadd fancy formating for most browsers 438/head
Robin Appelman [Mon, 18 Jul 2016 20:48:13 +0000 (22:48 +0200)]
add fancy formating for most browsers

8 years agofix Github link in Personal and Admin settings Version note 451/head
Jan-Christoph Borchardt [Tue, 19 Jul 2016 09:15:46 +0000 (11:15 +0200)]
fix Github link in Personal and Admin settings Version note