]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoClose session fast when doing a test to prevent blocking the next 595/head
Juan Pablo Villafáñez [Thu, 23 Jun 2016 12:47:20 +0000 (14:47 +0200)]
Close session fast when doing a test to prevent blocking the next
requests

8 years agoMerge pull request #565 from nextcloud/workflowengine
Joas Schilling [Wed, 27 Jul 2016 08:07:20 +0000 (10:07 +0200)]
Merge pull request #565 from nextcloud/workflowengine

Add workflowengine

8 years agoMerge pull request #566 from nextcloud/setup-port
Morris Jobke [Wed, 27 Jul 2016 08:02:39 +0000 (10:02 +0200)]
Merge pull request #566 from nextcloud/setup-port

revert to old setup connection logic

8 years agofix enabled apps tests 565/head
Morris Jobke [Wed, 27 Jul 2016 06:36:03 +0000 (08:36 +0200)]
fix enabled apps tests

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

8 years agoMerge pull request #349 from nextcloud/ldab-groupOfUniqueNames
blizzz [Tue, 26 Jul 2016 21:32:47 +0000 (23:32 +0200)]
Merge pull request #349 from nextcloud/ldab-groupOfUniqueNames

add groupOfUniqueNames as valid group object class

8 years agoAdd app icons for Comments and Tags (#579)
Jan-Christoph Borchardt [Tue, 26 Jul 2016 17:42:54 +0000 (19:42 +0200)]
Add app icons for Comments and Tags (#579)

* add icon for Comments app

* add icon for Tags app

8 years agofix unit tests
Morris Jobke [Tue, 26 Jul 2016 14:43:46 +0000 (16:43 +0200)]
fix unit tests

8 years agoAdd app to provisioning output
Joas Schilling [Tue, 26 Jul 2016 14:39:04 +0000 (16:39 +0200)]
Add app to provisioning output

8 years agoMerge pull request #563 from nextcloud/log-internet-connection-exception
Morris Jobke [Tue, 26 Jul 2016 14:22:43 +0000 (16:22 +0200)]
Merge pull request #563 from nextcloud/log-internet-connection-exception

Log exception that is thrown by internet connection check

8 years agoMove template to workflowengine app
Morris Jobke [Tue, 26 Jul 2016 12:31:16 +0000 (14:31 +0200)]
Move template to workflowengine app

8 years agoMerge pull request #567 from nextcloud/wb-admin-log-buttons
Joas Schilling [Tue, 26 Jul 2016 12:17:22 +0000 (14:17 +0200)]
Merge pull request #567 from nextcloud/wb-admin-log-buttons

Orders Admin Log Button

8 years agocreate an operation based on the correct model
Morris Jobke [Tue, 26 Jul 2016 10:03:16 +0000 (12:03 +0200)]
create an operation based on the correct model

8 years agorevert to old setup connection logic 566/head
Robin Appelman [Tue, 26 Jul 2016 09:44:15 +0000 (11:44 +0200)]
revert to old setup connection logic

8 years agoOrders Admin Log Button 567/head
root [Tue, 26 Jul 2016 09:27:48 +0000 (09:27 +0000)]
Orders Admin Log Button

8 years agoAdd workflowengine
Morris Jobke [Tue, 26 Jul 2016 09:16:34 +0000 (11:16 +0200)]
Add workflowengine

8 years agoMerge pull request #525 from nextcloud/fix-theme-logo-position
Joas Schilling [Tue, 26 Jul 2016 08:46:13 +0000 (10:46 +0200)]
Merge pull request #525 from nextcloud/fix-theme-logo-position

Fix theme logo position and shape

8 years agoLog exception that is thrown by internet connection check 563/head
Morris Jobke [Tue, 26 Jul 2016 08:03:31 +0000 (10:03 +0200)]
Log exception that is thrown by internet connection check

8 years agoMerge pull request #557 from nextcloud/fix-css-scope-files-external
Morris Jobke [Tue, 26 Jul 2016 06:58:38 +0000 (08:58 +0200)]
Merge pull request #557 from nextcloud/fix-css-scope-files-external

Add proper scope to files external CSS

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 26 Jul 2016 00:09:19 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoTheming: Fix preview and center alignment of logo 525/head
Julius Haertl [Mon, 25 Jul 2016 16:54:13 +0000 (18:54 +0200)]
Theming: Fix preview and center alignment of logo

8 years agoAdd proper scope to files external CSS 557/head
Morris Jobke [Mon, 25 Jul 2016 15:08:33 +0000 (17:08 +0200)]
Add proper scope to files external CSS

* for select2

8 years agoMerge pull request #292 from nextcloud/recent-files
William Bargent [Mon, 25 Jul 2016 14:25:02 +0000 (15:25 +0100)]
Merge pull request #292 from nextcloud/recent-files

Add "Recent" file listing

8 years agoMerge pull request #509 from nextcloud/appframework_magic_allow_default_vars
Morris Jobke [Mon, 25 Jul 2016 11:18:53 +0000 (13:18 +0200)]
Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars

AppFramework add default values (ApiController) as parameters

8 years agoMerge pull request #550 from nextcloud/ldap-integration-test-autoloader
Morris Jobke [Mon, 25 Jul 2016 10:54:50 +0000 (12:54 +0200)]
Merge pull request #550 from nextcloud/ldap-integration-test-autoloader

fix autoloading in LPAP integration tests, resolves #544

8 years agoMerge pull request #523 from Faldon/master
Joas Schilling [Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)]
Merge pull request #523 from Faldon/master

Renamed file logging

8 years agoMerge pull request #547 from nextcloud/fix-restore-all-files
Joas Schilling [Mon, 25 Jul 2016 09:38:05 +0000 (11:38 +0200)]
Merge pull request #547 from nextcloud/fix-restore-all-files

Fix error message while restoring all files

8 years agofix autoloading in LPAP integration tests, resolves #544 550/head
Arthur Schiwon [Mon, 25 Jul 2016 08:58:03 +0000 (10:58 +0200)]
fix autoloading in LPAP integration tests, resolves #544

8 years agofix test 292/head
Robin Appelman [Mon, 25 Jul 2016 08:41:53 +0000 (10:41 +0200)]
fix test

8 years agoFix error message while restoring all files 547/head
Morris Jobke [Mon, 25 Jul 2016 07:24:32 +0000 (09:24 +0200)]
Fix error message while restoring all files

* use $_POST['files'] only of ssinlge files are restored
* fixes #528

8 years agoMerge pull request #530 from nextcloud/fix-theme-loading
Morris Jobke [Mon, 25 Jul 2016 06:37:13 +0000 (08:37 +0200)]
Merge pull request #530 from nextcloud/fix-theme-loading

Make sure we try to autoload the class

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

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 24 Jul 2016 00:09:10 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #533 from nextcloud/oparoz-ns-server-contributing.md
Roeland Douma [Sat, 23 Jul 2016 13:53:22 +0000 (15:53 +0200)]
Merge pull request #533 from nextcloud/oparoz-ns-server-contributing.md

change core to server

8 years agoMerge pull request #534 from nextcloud/twofactor-isset
Joas Schilling [Sat, 23 Jul 2016 13:49:28 +0000 (15:49 +0200)]
Merge pull request #534 from nextcloud/twofactor-isset

Check if an app provide two-factor-auth providers before we try to use them

8 years agoCheck if an app provide two-factor-auth providers before we try to use them 534/head
Robin Appelman [Sat, 23 Jul 2016 11:26:57 +0000 (13:26 +0200)]
Check if an app provide two-factor-auth providers before we try to use them

8 years agochange core to server 533/head
Olivier Paroz [Sat, 23 Jul 2016 08:50:00 +0000 (10:50 +0200)]
change core to server

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 23 Jul 2016 00:09:06 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoMake sure we try to autoload the class 530/head
Joas Schilling [Fri, 22 Jul 2016 14:49:33 +0000 (16:49 +0200)]
Make sure we try to autoload the class

8 years agoFix search box overlapping on mobile (#450)
Jan-Christoph Borchardt [Fri, 22 Jul 2016 13:38:37 +0000 (15:38 +0200)]
Fix search box overlapping on mobile (#450)

* fix searchbox overlapping on mobile

* also adjust log in background color in theme

* Fix unit tests

8 years agoblock user sorting in recent files
Robin Appelman [Fri, 22 Jul 2016 12:19:04 +0000 (14:19 +0200)]
block user sorting in recent files

8 years agouse limit instead of since when listing recent files
Robin Appelman [Fri, 22 Jul 2016 11:58:53 +0000 (13:58 +0200)]
use limit instead of since when listing recent files

8 years agofix test
Robin Appelman [Mon, 11 Jul 2016 10:58:43 +0000 (12:58 +0200)]
fix test

8 years agoAdd recent file listing
Robin Appelman [Fri, 22 Jul 2016 13:20:51 +0000 (15:20 +0200)]
Add recent file listing

8 years agoMerge pull request #524 from nextcloud/ocs_appframework_status_code
Lukas Reschke [Fri, 22 Jul 2016 13:15:20 +0000 (15:15 +0200)]
Merge pull request #524 from nextcloud/ocs_appframework_status_code

Set proper status code in OCS AppFramework Middleware

8 years agoAdjust tests
Lukas Reschke [Fri, 22 Jul 2016 12:58:30 +0000 (14:58 +0200)]
Adjust tests

8 years agoMerge pull request #526 from nextcloud/bumb-app-requirements
Joas Schilling [Fri, 22 Jul 2016 12:51:06 +0000 (14:51 +0200)]
Merge pull request #526 from nextcloud/bumb-app-requirements

bumb compatible app versions for core apps

8 years agoadd recent files api endpoint
Robin Appelman [Fri, 22 Jul 2016 12:48:51 +0000 (14:48 +0200)]
add recent files api endpoint

8 years agoMerge pull request #522 from nextcloud/ocs_correct_login_exception
Roeland Douma [Fri, 22 Jul 2016 12:47:53 +0000 (14:47 +0200)]
Merge pull request #522 from nextcloud/ocs_correct_login_exception

OCS correctly handle login exception

8 years agoRenamed test classes for file logging tests. 523/head
Thomas Pulzer [Fri, 22 Jul 2016 12:47:50 +0000 (14:47 +0200)]
Renamed test classes for file logging tests.

8 years agoAlso increase the min version 526/head
Joas Schilling [Fri, 22 Jul 2016 12:46:52 +0000 (14:46 +0200)]
Also increase the min version

8 years agoChanged code style and made use of '===' comparison.
Thomas Pulzer [Fri, 22 Jul 2016 12:45:33 +0000 (14:45 +0200)]
Changed code style and made use of '===' comparison.

8 years agoadd recent files to node api
Robin Appelman [Fri, 22 Jul 2016 12:37:37 +0000 (14:37 +0200)]
add recent files to node api

8 years agoReverted the default syslog tag to avoid breaking existing systems.
Thomas Pulzer [Fri, 22 Jul 2016 12:38:44 +0000 (14:38 +0200)]
Reverted the default syslog tag to avoid breaking existing systems.

8 years agoFix storage id with storage jail
Robin Appelman [Fri, 22 Jul 2016 12:34:59 +0000 (14:34 +0200)]
Fix storage id with storage jail

8 years agoUpdate header.css
Jos Poortvliet [Fri, 22 Jul 2016 12:23:00 +0000 (14:23 +0200)]
Update header.css

make the logo look good on the login page

8 years agoFix intergration tests 522/head
Roeland Jago Douma [Fri, 22 Jul 2016 06:27:16 +0000 (08:27 +0200)]
Fix intergration tests

8 years agobumb compatible app versions for core apps
Robin Appelman [Fri, 22 Jul 2016 11:04:23 +0000 (13:04 +0200)]
bumb compatible app versions for core apps

8 years agoAdd tests 524/head
Roeland Jago Douma [Fri, 22 Jul 2016 10:25:50 +0000 (12:25 +0200)]
Add tests

8 years agoSet proper status code in OCS AppFramework Middleware
Roeland Jago Douma [Fri, 22 Jul 2016 10:14:54 +0000 (12:14 +0200)]
Set proper status code in OCS AppFramework Middleware

8 years agoUpdate themingcontroller.php
Jos Poortvliet [Fri, 22 Jul 2016 10:25:58 +0000 (12:25 +0200)]
Update themingcontroller.php

8 years agoChanged logtype to file instead of owncloud.
Thomas Pulzer [Fri, 22 Jul 2016 09:44:19 +0000 (11:44 +0200)]
Changed logtype to file instead of owncloud.

- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
  Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
  Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'

- Adjusted tests for the new file log.

Closes #490.

8 years agoCatch LoginException
Roeland Jago Douma [Thu, 21 Jul 2016 20:47:20 +0000 (22:47 +0200)]
Catch LoginException

8 years agoMerge pull request #517 from nextcloud/fix-typo
Joas Schilling [Fri, 22 Jul 2016 09:41:20 +0000 (11:41 +0200)]
Merge pull request #517 from nextcloud/fix-typo

Fix typo in docs

8 years agoInject parameters 509/head
Roeland Jago Douma [Fri, 22 Jul 2016 08:11:53 +0000 (10:11 +0200)]
Inject parameters

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 agoUse app name from stable9 517/head
Joas Schilling [Fri, 22 Jul 2016 07:55:46 +0000 (09:55 +0200)]
Use app name from stable9

8 years agoFix typo
Joas Schilling [Fri, 22 Jul 2016 07:55:38 +0000 (09:55 +0200)]
Fix typo

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