]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoFix Spinner issues with Base DN field
Arthur Schiwon [Thu, 17 Oct 2013 18:57:19 +0000 (20:57 +0200)]
Fix Spinner issues with Base DN field

11 years agoresolve merge conflicts from rebase
Arthur Schiwon [Thu, 17 Oct 2013 17:40:59 +0000 (19:40 +0200)]
resolve merge conflicts from rebase

11 years agoLdap Wizard: also disable tabs, if the first step is not complete
Arthur Schiwon [Thu, 17 Oct 2013 16:55:02 +0000 (18:55 +0200)]
Ldap Wizard: also disable tabs, if the first step is not complete

11 years agoLDAP Wizard: make Back and Continue work
Arthur Schiwon [Thu, 17 Oct 2013 16:33:58 +0000 (18:33 +0200)]
LDAP Wizard: make Back and Continue work

11 years agoLDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port...
Arthur Schiwon [Thu, 17 Oct 2013 11:05:14 +0000 (13:05 +0200)]
LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall port detection

11 years agoLDAP Wizard: fix couple more or less nasty bugs aka polishing
Arthur Schiwon [Thu, 10 Oct 2013 17:37:12 +0000 (19:37 +0200)]
LDAP Wizard: fix couple more or less nasty bugs aka polishing

11 years agodo not instantiate LDAP Proxy if there are no active configurations
Arthur Schiwon [Thu, 10 Oct 2013 13:24:10 +0000 (15:24 +0200)]
do not instantiate LDAP Proxy if there are no active configurations

11 years agoWizard: autodetection of group-member-assoc attribute
Arthur Schiwon [Wed, 9 Oct 2013 23:21:05 +0000 (01:21 +0200)]
Wizard: autodetection of group-member-assoc attribute

11 years agoLDAP: set displayname as default attribute for user display name
Arthur Schiwon [Wed, 9 Oct 2013 21:27:20 +0000 (23:27 +0200)]
LDAP: set displayname as default attribute for user display name

11 years agoclean up
Arthur Schiwon [Wed, 9 Oct 2013 21:16:26 +0000 (23:16 +0200)]
clean up

11 years agoWizard does not need data-defaults here
Arthur Schiwon [Wed, 9 Oct 2013 21:04:06 +0000 (23:04 +0200)]
Wizard does not need data-defaults here

11 years agoLDAP Wizard: add forgotten templates
Arthur Schiwon [Wed, 9 Oct 2013 21:03:45 +0000 (23:03 +0200)]
LDAP Wizard: add forgotten templates

11 years agoLDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean up Advanc...
Arthur Schiwon [Wed, 9 Oct 2013 20:06:44 +0000 (22:06 +0200)]
LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean up Advanced settings, too. This is all done via Wizard, now.

11 years agoLdap Wizard: Group Filter configuration
Arthur Schiwon [Wed, 9 Oct 2013 20:00:36 +0000 (22:00 +0200)]
Ldap Wizard: Group Filter configuration

11 years agoLdap Wizard: Login filter UI, detection of username attribute, composing of login...
Arthur Schiwon [Tue, 8 Oct 2013 21:47:57 +0000 (23:47 +0200)]
Ldap Wizard: Login filter UI, detection of username attribute, composing of login filter

11 years agoLDAP Wizard: create user list filter, show number of user that will have access to OC
Arthur Schiwon [Tue, 8 Oct 2013 16:27:36 +0000 (18:27 +0200)]
LDAP Wizard: create user list filter, show number of user that will have access to OC

11 years agoCleanup code, sort results
Arthur Schiwon [Tue, 8 Oct 2013 09:19:55 +0000 (11:19 +0200)]
Cleanup code, sort results

11 years agoLdap Wizard: find out whether server supports memberOf in LDAP Filter and disable...
Arthur Schiwon [Mon, 7 Oct 2013 23:19:37 +0000 (01:19 +0200)]
Ldap Wizard: find out whether server supports memberOf in LDAP Filter and disable group chooser if not

11 years agocleanup and coding style
Arthur Schiwon [Mon, 7 Oct 2013 16:03:54 +0000 (18:03 +0200)]
cleanup and coding style

11 years agocleanup, doc and todo
Arthur Schiwon [Mon, 7 Oct 2013 15:56:45 +0000 (17:56 +0200)]
cleanup, doc and todo

11 years agoLDAP Wizard: add detection, load and save of LDAP groups for filter purposes
Arthur Schiwon [Fri, 4 Oct 2013 16:11:44 +0000 (18:11 +0200)]
LDAP Wizard: add detection, load and save of LDAP groups for filter purposes

11 years agoRemove debug output
Arthur Schiwon [Fri, 4 Oct 2013 15:08:53 +0000 (17:08 +0200)]
Remove debug output

11 years agocss cleanup
Arthur Schiwon [Fri, 4 Oct 2013 14:44:26 +0000 (16:44 +0200)]
css cleanup

11 years agoLDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes
Arthur Schiwon [Fri, 4 Oct 2013 14:33:37 +0000 (16:33 +0200)]
LDAP Wizard: add detection, load and save of LDAP objectClasses for filter purposes

11 years agoLDAP Wizard: autodetect base DN
Arthur Schiwon [Sun, 29 Sep 2013 21:53:14 +0000 (23:53 +0200)]
LDAP Wizard: autodetect base DN

11 years agoignore autodetect-attribute on public save method
Arthur Schiwon [Sun, 29 Sep 2013 21:51:26 +0000 (23:51 +0200)]
ignore autodetect-attribute on public save method

11 years agoSimplify WizardResult
Arthur Schiwon [Fri, 27 Sep 2013 16:41:25 +0000 (18:41 +0200)]
Simplify WizardResult

11 years agoFirst stage of new Wizard, neither feature complete nor ready
Arthur Schiwon [Fri, 27 Sep 2013 16:30:59 +0000 (18:30 +0200)]
First stage of new Wizard, neither feature complete nor ready

11 years agoLDAP: move Configuration out of Connection into class of its own. The new wizard...
Arthur Schiwon [Thu, 26 Sep 2013 20:31:57 +0000 (22:31 +0200)]
LDAP: move Configuration  out of Connection into class of its own. The new wizard requires it.

11 years agoDoc fix
Arthur Schiwon [Tue, 17 Sep 2013 17:25:15 +0000 (19:25 +0200)]
Doc fix

11 years agoMerge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero
Morris Jobke [Thu, 17 Oct 2013 15:23:20 +0000 (08:23 -0700)]
Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero

Fixed zip download button for unlimited filesize in public mode

11 years agoMerge pull request #5392 from owncloud/update-3rdparty-submodule
Morris Jobke [Thu, 17 Oct 2013 14:57:53 +0000 (07:57 -0700)]
Merge pull request #5392 from owncloud/update-3rdparty-submodule

update 3rdparty submodule

11 years agoMerge pull request #5394 from owncloud/sabre-server-location
Thomas Müller [Thu, 17 Oct 2013 14:11:50 +0000 (07:11 -0700)]
Merge pull request #5394 from owncloud/sabre-server-location

Move OC_Connector_Sabre_Server to expected location.

11 years agoMove OC_Connector_Sabre_Server to expected location.
Andreas Fischer [Thu, 17 Oct 2013 14:04:59 +0000 (16:04 +0200)]
Move OC_Connector_Sabre_Server to expected location.

11 years agoFixed zip download button for unlimited filesize in public mode
Vincent Petry [Thu, 17 Oct 2013 13:29:22 +0000 (15:29 +0200)]
Fixed zip download button for unlimited filesize in public mode

Added missing condition to check whenever allowed zip size is unlimited.

Fixes #3717

11 years agoupdate 3rdparty submodule
Thomas Müller [Thu, 17 Oct 2013 13:25:43 +0000 (15:25 +0200)]
update 3rdparty submodule

11 years agoMerge pull request #5389 from owncloud/fix_shell_exec
Morris Jobke [Thu, 17 Oct 2013 13:21:04 +0000 (06:21 -0700)]
Merge pull request #5389 from owncloud/fix_shell_exec

only call shell_exec if enabled

11 years agofix comment
Georg Ehrke [Thu, 17 Oct 2013 13:19:15 +0000 (15:19 +0200)]
fix comment

11 years agoMerge pull request #5381 from owncloud/files-sharingstateafterupload
Morris Jobke [Thu, 17 Oct 2013 12:51:12 +0000 (05:51 -0700)]
Merge pull request #5381 from owncloud/files-sharingstateafterupload

Fixed sharing status update for new/uploaded files

11 years agoAdded missing var in share.js
Vincent Petry [Thu, 17 Oct 2013 12:39:20 +0000 (14:39 +0200)]
Added missing var in share.js

11 years agoonly call shell_exec if enabled
Georg Ehrke [Thu, 17 Oct 2013 12:31:07 +0000 (14:31 +0200)]
only call shell_exec if enabled

11 years agoMerge pull request #5385 from owncloud/generate-sql-migration-master
Morris Jobke [Thu, 17 Oct 2013 11:53:18 +0000 (04:53 -0700)]
Merge pull request #5385 from owncloud/generate-sql-migration-master

new console command to generate sql migration scripts

11 years agoMerge pull request #5379 from owncloud/undefined-shipped
Frank Karlitschek [Thu, 17 Oct 2013 11:37:40 +0000 (04:37 -0700)]
Merge pull request #5379 from owncloud/undefined-shipped

fix undefined "shipped"

11 years agoFixed sharing status update for new/uploaded files
Vincent Petry [Thu, 17 Oct 2013 09:59:13 +0000 (11:59 +0200)]
Fixed sharing status update for new/uploaded files

Creating new files, folders or uploading files now have their sharing
icon updated accordingly.

For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.

Performance should improve as the sharing list is now only loaded once
per navigation session.

In OC.Share, split loadIcons into loadIcons + updateIcons.

Fixes #4977

11 years agonew console command to generate sql migration scripts
Thomas Müller [Thu, 17 Oct 2013 10:51:30 +0000 (12:51 +0200)]
new console command to generate sql migration scripts

11 years agoMerge pull request #5378 from owncloud/files-permissionsafteruploadfix
Morris Jobke [Thu, 17 Oct 2013 10:50:26 +0000 (03:50 -0700)]
Merge pull request #5378 from owncloud/files-permissionsafteruploadfix

Fixed upload permissions distinction between public and logged in upload

11 years agoMerge pull request #5376 from owncloud/fix-title-ownCloud
Raghu Nayyar [Thu, 17 Oct 2013 09:47:28 +0000 (02:47 -0700)]
Merge pull request #5376 from owncloud/fix-title-ownCloud

Updates ownCloud title to Application - ownCloud

11 years agofix undefined "shipped"
Morris Jobke [Thu, 17 Oct 2013 09:35:13 +0000 (11:35 +0200)]
fix undefined "shipped"

11 years agoMerge pull request #5237 from owncloud/coverage-on-windows-master
Thomas Müller [Thu, 17 Oct 2013 09:23:15 +0000 (02:23 -0700)]
Merge pull request #5237 from owncloud/coverage-on-windows-master

PHP Code Coverage on windows master

11 years agoMerge pull request #4949 from owncloud/improve_unknown_preview_backend
Frank Karlitschek [Thu, 17 Oct 2013 08:48:34 +0000 (01:48 -0700)]
Merge pull request #4949 from owncloud/improve_unknown_preview_backend

use svg to generate filetype icon if imagick available

11 years agoFixed upload permissions distinction between public and logged in upload
Vincent Petry [Thu, 17 Oct 2013 08:46:55 +0000 (10:46 +0200)]
Fixed upload permissions distinction between public and logged in upload

Fixes #5370

11 years agoUpdates ownCloud title to Application - ownCloud
raghunayyar [Thu, 17 Oct 2013 08:40:06 +0000 (14:10 +0530)]
Updates ownCloud title to Application - ownCloud

11 years agoMerge pull request #4935 from owncloud/webdav-depth-fix-master
Frank Karlitschek [Thu, 17 Oct 2013 08:37:38 +0000 (01:37 -0700)]
Merge pull request #4935 from owncloud/webdav-depth-fix-master

WebDAV depth infinity support - the dirty way

11 years agoMerge pull request #5375 from owncloud/fix-api-documentation
Thomas Müller [Thu, 17 Oct 2013 08:25:24 +0000 (01:25 -0700)]
Merge pull request #5375 from owncloud/fix-api-documentation

Public API documentation fixes

11 years agoPublic API documentation fixes
Morris Jobke [Wed, 16 Oct 2013 22:07:29 +0000 (00:07 +0200)]
Public API documentation fixes

refs #4883

 * http/response.php
 * config.php
 * response.php
 * files.php
 * idbconnection.php
 * app.php
 * user.php
 * template.php
 * share.php
 * db.php
 * icache.php & il10n.php

11 years agoMerge pull request #5276 from owncloud/fixing-5170-master
Morris Jobke [Wed, 16 Oct 2013 21:21:40 +0000 (14:21 -0700)]
Merge pull request #5276 from owncloud/fixing-5170-master

only text/plain is now used to generate text previews

11 years agoMerge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
Morris Jobke [Wed, 16 Oct 2013 19:52:41 +0000 (12:52 -0700)]
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix

Fixed conflict dialog in IE8

11 years agoMerge pull request #5157 from owncloud/fixing-appframework-master
Thomas Müller [Wed, 16 Oct 2013 18:45:54 +0000 (11:45 -0700)]
Merge pull request #5157 from owncloud/fixing-appframework-master

Fixing appframework for OC6

11 years agore-enable test in SecurityMiddlewareTest
Thomas Müller [Wed, 16 Oct 2013 14:33:56 +0000 (16:33 +0200)]
re-enable test in SecurityMiddlewareTest

11 years agoMerge branch 'master' into fixing-appframework-master
Thomas Müller [Wed, 16 Oct 2013 13:45:55 +0000 (15:45 +0200)]
Merge branch 'master' into fixing-appframework-master

Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php

11 years agoMerge pull request #5067 from owncloud/urlParams_fix
Thomas Müller [Wed, 16 Oct 2013 13:42:09 +0000 (06:42 -0700)]
Merge pull request #5067 from owncloud/urlParams_fix

Get urlParams registered before Request is instantiated

11 years agoaccept text/markdown as well
Thomas Müller [Wed, 16 Oct 2013 13:31:43 +0000 (15:31 +0200)]
accept text/markdown as well

11 years agoMerge branch 'master' into fixing-5170-master
Thomas Müller [Wed, 16 Oct 2013 12:48:55 +0000 (14:48 +0200)]
Merge branch 'master' into fixing-5170-master

11 years agoMerge pull request #5353 from owncloud/files-dndtodirbroken
Morris Jobke [Wed, 16 Oct 2013 11:52:35 +0000 (04:52 -0700)]
Merge pull request #5353 from owncloud/files-dndtodirbroken

Fixed drag and drop to subfolder and breadcrumb

11 years agoMerge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
Thomas Müller [Wed, 16 Oct 2013 11:23:45 +0000 (04:23 -0700)]
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend

file system is now initialized with apache authentication as well

11 years agoMerge pull request #5329 from owncloud/enc_fix_unencrypted_size
Björn Schießle [Wed, 16 Oct 2013 09:25:28 +0000 (02:25 -0700)]
Merge pull request #5329 from owncloud/enc_fix_unencrypted_size

try to fix unencrypted file size if it doesn't look plausible

11 years agorevert last changes
Bjoern Schiessle [Wed, 16 Oct 2013 09:24:56 +0000 (11:24 +0200)]
revert last changes

11 years agoMerge pull request #5354 from owncloud/enc_tests
Morris Jobke [Wed, 16 Oct 2013 09:14:35 +0000 (02:14 -0700)]
Merge pull request #5354 from owncloud/enc_tests

added simple test for getFileSize proxy

11 years ago6.0 alpha 2 v6.0.0alpha2
Frank Karlitschek [Wed, 16 Oct 2013 08:51:44 +0000 (10:51 +0200)]
6.0 alpha 2

11 years agoMerge pull request #5333 from owncloud/avater_with_encryption
Björn Schießle [Wed, 16 Oct 2013 08:34:05 +0000 (01:34 -0700)]
Merge pull request #5333 from owncloud/avater_with_encryption

avatars should also work with encryption after pr #5332 was merged

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 16 Oct 2013 04:31:48 +0000 (00:31 -0400)]
[tx-robot] updated from transifex

11 years agoadded another test, if unencrypted size and encrypted size are equal we can also...
Bjoern Schiessle [Tue, 15 Oct 2013 15:52:06 +0000 (17:52 +0200)]
added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong

11 years agofix comment
Bjoern Schiessle [Tue, 15 Oct 2013 15:36:52 +0000 (17:36 +0200)]
fix comment

11 years agoadded simple test for getFileSize proxy
Bjoern Schiessle [Tue, 15 Oct 2013 15:33:31 +0000 (17:33 +0200)]
added simple test for getFileSize proxy

11 years agoFix avatar unittest
kondou [Tue, 15 Oct 2013 15:23:47 +0000 (17:23 +0200)]
Fix avatar unittest

11 years agoMerge pull request #5334 from owncloud/files-sharing-actionsafterupload
Morris Jobke [Tue, 15 Oct 2013 15:11:17 +0000 (08:11 -0700)]
Merge pull request #5334 from owncloud/files-sharing-actionsafterupload

Files sharing actions + navigation fixes

11 years agoMerge pull request #5350 from owncloud/files-preventdeletemountpoint
Vincent Petry [Tue, 15 Oct 2013 14:24:14 +0000 (07:24 -0700)]
Merge pull request #5350 from owncloud/files-preventdeletemountpoint

Prevent renaming/deleting mount points

11 years agoFixed drag and drop upload to breadcrumb
Vincent Petry [Tue, 15 Oct 2013 14:14:23 +0000 (16:14 +0200)]
Fixed drag and drop upload to breadcrumb

11 years agoFixed drag and drop onto folders
Vincent Petry [Tue, 15 Oct 2013 13:54:16 +0000 (15:54 +0200)]
Fixed drag and drop onto folders

Fixes #5351

11 years agoPrevent renaming/deleting mount points
Vincent Petry [Tue, 15 Oct 2013 12:55:38 +0000 (14:55 +0200)]
Prevent renaming/deleting mount points

Fixed permissions returned for mount points to not include update and
delete permissions.

Fixes #5291

11 years agoMerge pull request #5295 from owncloud/show-eye-in-personal
Raghu Nayyar [Tue, 15 Oct 2013 09:59:53 +0000 (02:59 -0700)]
Merge pull request #5295 from owncloud/show-eye-in-personal

Shows The Eye permanently in the Confirm Password field in Personal Settings

11 years agoMerge branch 'master' into avater_with_encryption
Bjoern Schiessle [Tue, 15 Oct 2013 09:53:51 +0000 (11:53 +0200)]
Merge branch 'master' into avater_with_encryption

11 years agotest should work now
Bjoern Schiessle [Tue, 15 Oct 2013 09:53:32 +0000 (11:53 +0200)]
test should work now

11 years agoMerge pull request #5332 from owncloud/enc_run_proxy_only_for_files
Morris Jobke [Tue, 15 Oct 2013 09:44:14 +0000 (02:44 -0700)]
Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files

check if we are writing to user/files, otherwise skip encryption

11 years agoMerge pull request #5269 from owncloud/ocs_share_api_add_received_from
Björn Schießle [Tue, 15 Oct 2013 09:17:23 +0000 (02:17 -0700)]
Merge pull request #5269 from owncloud/ocs_share_api_add_received_from

ocs share api: add "received_from" and "received_from_displayname" field

11 years agoRemoves Bogus showpassword js. thx @PVince81
raghunayyar [Tue, 15 Oct 2013 09:11:18 +0000 (14:41 +0530)]
Removes Bogus showpassword js. thx @PVince81

11 years agoMerge pull request #5341 from owncloud/fix-logout-link-html
Vincent Petry [Tue, 15 Oct 2013 07:33:00 +0000 (00:33 -0700)]
Merge pull request #5341 from owncloud/fix-logout-link-html

Fix logout link HTML.

11 years agoShould Display PasswordToggle Eye Everywhere.
raghunayyar [Tue, 15 Oct 2013 06:06:44 +0000 (11:36 +0530)]
Should Display PasswordToggle Eye Everywhere.

11 years agofixing syntax for openssl config
Thomas Müller [Mon, 14 Oct 2013 22:44:55 +0000 (00:44 +0200)]
fixing syntax for openssl config

11 years agoon windows we supply an openssl.cnf file in order to execute the unit tests properly
Thomas Müller [Mon, 14 Oct 2013 22:29:47 +0000 (00:29 +0200)]
on windows we supply an openssl.cnf file in order to execute the unit tests properly

11 years agoany preview requiring the which command will not be used on Windows
Thomas Müller [Mon, 14 Oct 2013 22:15:45 +0000 (00:15 +0200)]
any preview requiring the which command will not be used on Windows

11 years agoMerge branch 'master' into coverage-on-windows-master
Thomas Müller [Mon, 14 Oct 2013 22:09:00 +0000 (00:09 +0200)]
Merge branch 'master' into coverage-on-windows-master

11 years agoMerge pull request #5340 from owncloud/fixing-5251-master
icewind1991 [Mon, 14 Oct 2013 21:29:36 +0000 (14:29 -0700)]
Merge pull request #5340 from owncloud/fixing-5251-master

streamCopy() should return proper structure.

11 years agoFix logout link HTML.
Andreas Fischer [Mon, 14 Oct 2013 20:30:38 +0000 (22:30 +0200)]
Fix logout link HTML.

<a id="logout" href=/projects/owncloud/core/index.php?logout=true>

11 years agostreamCopy() should return proper structure.
Thomas Müller [Mon, 14 Oct 2013 19:33:23 +0000 (21:33 +0200)]
streamCopy() should return proper structure.

Callers of streamCopy() expect an array to be returned containing count and result.

11 years agoMerge pull request #5330 from owncloud/files-removedfileactionsbkg
Vincent Petry [Mon, 14 Oct 2013 16:23:06 +0000 (09:23 -0700)]
Merge pull request #5330 from owncloud/files-removedfileactionsbkg

Removed extra bkg color on file actions when row is selected/hovered on

11 years agoDisabled ajax mode for public files view
Vincent Petry [Mon, 14 Oct 2013 15:47:38 +0000 (17:47 +0200)]
Disabled ajax mode for public files view

Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.

11 years agoavatars should also work with encryption after pr #5332 was merged
Bjoern Schiessle [Mon, 14 Oct 2013 15:30:24 +0000 (17:30 +0200)]
avatars should also work with encryption after pr #5332 was merged

11 years agoFixed file permissions after public upload
Vincent Petry [Mon, 14 Oct 2013 15:28:23 +0000 (17:28 +0200)]
Fixed file permissions after public upload

Fixes #5328

11 years agocheck if we are writing to user/files, otherwise skip encryption
Bjoern Schiessle [Mon, 14 Oct 2013 15:13:14 +0000 (17:13 +0200)]
check if we are writing to user/files, otherwise skip encryption