]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Tue, 1 Oct 2013 12:33:56 +0000 (14:33 +0200)]
use $defaults instead of $theme
Thomas Müller [Tue, 1 Oct 2013 11:25:58 +0000 (13:25 +0200)]
Squashed commit of the following:
commit
ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit
982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit
da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit
8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit
fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit
469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit
d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit
aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit
69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit
5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit
dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit
091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit
bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit
667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit
7abbdb64676d667b0c69aca37becdc47e56dc7ef .
commit
7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
Thomas Müller [Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)]
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
Jenkins for ownCloud [Mon, 30 Sep 2013 14:19:22 +0000 (10:19 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 30 Sep 2013 13:55:56 +0000 (06:55 -0700)]
Merge pull request #5012 from owncloud/check_keyfiles_exists
check not only if the keyfile folder exists but also if it contains keyfiles
Thomas Müller [Mon, 30 Sep 2013 11:11:28 +0000 (04:11 -0700)]
Merge pull request #4459 from owncloud/appframework-master
Public API for OC6+ (includes AppFramework)
Thomas Müller [Mon, 30 Sep 2013 09:31:51 +0000 (02:31 -0700)]
Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master
Move aborted upload detection into it's own sabedav plugin
Thomas Müller [Mon, 30 Sep 2013 08:42:05 +0000 (10:42 +0200)]
Merge branch 'master' into appframework-master
Thomas Müller [Mon, 30 Sep 2013 08:03:07 +0000 (10:03 +0200)]
fixing PHPDoc & typo
Thomas Müller [Mon, 30 Sep 2013 07:21:37 +0000 (09:21 +0200)]
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
Thomas Müller [Mon, 30 Sep 2013 07:20:34 +0000 (00:20 -0700)]
Merge pull request #4969 from owncloud/fixing-4043-master
adding privilege check on move and rename operations
Thomas Müller [Mon, 30 Sep 2013 07:08:32 +0000 (00:08 -0700)]
Merge pull request #3563 from evgeni/curl-no-timeout
cURL does not honour default_socket_timeout
Evgeni Golov [Fri, 31 May 2013 16:21:31 +0000 (18:21 +0200)]
cURL does not honour default_socket_timeout
SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.
One has to use
curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.
Andreas Fischer [Sun, 29 Sep 2013 21:20:34 +0000 (23:20 +0200)]
Merge pull request #4966 from owncloud/text_preview_blacklist
add blacklist to txt preview backend
* owncloud/text_preview_blacklist:
rename variable in testIsTransparent
rename testTxtBlacklist to txtBlacklist
move fileView object initialization to testIsTransparent
use dataProvider for txt blacklist test
add test for txt blacklist
add test data for cal and contact preview
add blacklist to txt preview backend
Thomas Müller [Sun, 29 Sep 2013 19:49:10 +0000 (12:49 -0700)]
Merge pull request #4960 from owncloud/fixing-mirall-1014-master
handle error situation of rename proper
Thomas Müller [Sun, 29 Sep 2013 18:07:56 +0000 (20:07 +0200)]
Merge branch 'master' into appframework-master
Thomas Müller [Sun, 29 Sep 2013 16:26:47 +0000 (09:26 -0700)]
Merge pull request #5031 from zimba12/master
followup of #4032 - makes the settings-button bigger...
Alessandro Cosentino [Sun, 29 Sep 2013 05:46:23 +0000 (01:46 -0400)]
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
Jenkins for ownCloud [Sun, 29 Sep 2013 04:03:26 +0000 (00:03 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Sat, 28 Sep 2013 18:40:25 +0000 (20:40 +0200)]
initialize $middleWares
Thomas Müller [Sat, 28 Sep 2013 18:39:19 +0000 (20:39 +0200)]
Merge branch 'master' into appframework-master
Morris Jobke [Sat, 28 Sep 2013 15:52:22 +0000 (08:52 -0700)]
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
Base defaultavatar text on displayname
kondou [Sat, 28 Sep 2013 15:49:07 +0000 (17:49 +0200)]
Have uniform (wrong) indention
kondou [Sat, 28 Sep 2013 14:46:53 +0000 (16:46 +0200)]
Base defaultavatar text on displayname
Fix #4876
Morris Jobke [Sat, 28 Sep 2013 13:50:34 +0000 (06:50 -0700)]
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
phpunit.xml: Port code coverage excludes from autotest to dist.
Thomas Müller [Fri, 27 Sep 2013 15:15:26 +0000 (17:15 +0200)]
delay middleware registrations
Thomas Müller [Fri, 27 Sep 2013 15:08:48 +0000 (17:08 +0200)]
fixing error in initialization of TagManager
Georg Ehrke [Fri, 27 Sep 2013 12:55:37 +0000 (14:55 +0200)]
rename variable in testIsTransparent
Thomas Müller [Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)]
Merge branch 'master' into appframework-master
Thomas Müller [Fri, 27 Sep 2013 12:18:12 +0000 (05:18 -0700)]
Merge pull request #4207 from owncloud/search_shared_files
add initial search in shared files
Thomas Müller [Fri, 27 Sep 2013 11:41:23 +0000 (13:41 +0200)]
code cleanup
Bjoern Schiessle [Fri, 27 Sep 2013 11:34:48 +0000 (13:34 +0200)]
check not only if the keyfile folder exists but also if it contains keyfiles
Morris Jobke [Fri, 27 Sep 2013 09:34:59 +0000 (02:34 -0700)]
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
prelogin apps have to be loaded within setupBackend() otherwise required...
Georg Ehrke [Fri, 27 Sep 2013 09:33:37 +0000 (11:33 +0200)]
rename testTxtBlacklist to txtBlacklist
Georg Ehrke [Fri, 27 Sep 2013 09:01:47 +0000 (11:01 +0200)]
move fileView object initialization to testIsTransparent
Georg Ehrke [Fri, 27 Sep 2013 07:59:04 +0000 (09:59 +0200)]
use dataProvider for txt blacklist test
Jenkins for ownCloud [Fri, 27 Sep 2013 04:02:30 +0000 (00:02 -0400)]
[tx-robot] updated from transifex
Bjoern Schiessle [Thu, 26 Sep 2013 17:34:50 +0000 (19:34 +0200)]
set rememberlogin to false for the encryption app
Bjoern Schiessle [Thu, 26 Sep 2013 17:34:28 +0000 (19:34 +0200)]
check every enabled app if the remember login feature needs to be disabled
Andreas Fischer [Thu, 26 Sep 2013 17:05:47 +0000 (19:05 +0200)]
phpunit.xml: Port code coverage excludes from autotest to dist.
Morris Jobke [Thu, 26 Sep 2013 14:09:32 +0000 (07:09 -0700)]
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
run unit tests for apps as well
Thomas Müller [Thu, 26 Sep 2013 12:03:04 +0000 (14:03 +0200)]
Remove $RUNTIME_NOAPPS - setting to false was not enough
Thomas Müller [Thu, 26 Sep 2013 11:34:47 +0000 (13:34 +0200)]
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
blizzz [Thu, 26 Sep 2013 11:03:20 +0000 (04:03 -0700)]
Merge pull request #4990 from owncloud/user_fix_manager
manager checkPassword now returns User object, adjust internal user clas...
Björn Schießle [Thu, 26 Sep 2013 10:16:15 +0000 (03:16 -0700)]
Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
Thomas Müller [Thu, 26 Sep 2013 10:15:14 +0000 (03:15 -0700)]
Merge pull request #4991 from owncloud/enc_fix_warning
check if key exists before reading it
Thomas Müller [Thu, 26 Sep 2013 10:02:06 +0000 (12:02 +0200)]
run unit tests for apps as well
Thomas Müller [Thu, 26 Sep 2013 08:50:15 +0000 (10:50 +0200)]
adding unit tests for ObjectTree::move()
Thomas Müller [Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)]
Merge pull request #4892 from owncloud/vcategories_public
OC_VCategories => OC\Tags. Public interface and getter in server container
Bjoern Schiessle [Wed, 25 Sep 2013 17:23:07 +0000 (19:23 +0200)]
fix check if app is enabled
Arthur Schiwon [Wed, 25 Sep 2013 17:15:27 +0000 (19:15 +0200)]
Missing Test for the previous commit
Morris Jobke [Wed, 25 Sep 2013 17:11:52 +0000 (10:11 -0700)]
Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
Bjoern Schiessle [Wed, 25 Sep 2013 15:44:05 +0000 (17:44 +0200)]
check if key exists before reading it
Thomas Müller [Wed, 25 Sep 2013 15:43:25 +0000 (17:43 +0200)]
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
Thomas Müller [Wed, 25 Sep 2013 15:41:16 +0000 (17:41 +0200)]
expect unlinkto be called
Thomas Müller [Wed, 25 Sep 2013 15:34:28 +0000 (17:34 +0200)]
adding unit tests
Thomas Müller [Wed, 25 Sep 2013 15:28:45 +0000 (17:28 +0200)]
remove unneccessary code
kondou [Wed, 25 Sep 2013 15:19:38 +0000 (17:19 +0200)]
Shorten optional text-argument processing
Thomas Müller [Wed, 25 Sep 2013 15:17:29 +0000 (17:17 +0200)]
$path already contains the full path to the file
Thomas Müller [Wed, 25 Sep 2013 15:00:20 +0000 (17:00 +0200)]
fixing copyright and add class documentation
Thomas Müller [Wed, 25 Sep 2013 14:46:49 +0000 (07:46 -0700)]
Merge pull request #4989 from owncloud/coverage-for-all-master
collect coverage for all databases again - ci.owncloud.org has more RAM ...
Arthur Schiwon [Wed, 25 Sep 2013 13:03:22 +0000 (15:03 +0200)]
manager checkPassword now returns User object, adjust internal user class accordingly.
Thomas Müller [Wed, 25 Sep 2013 12:41:03 +0000 (14:41 +0200)]
collect coverage for all databases again - ci.owncloud.org has more RAM available
Thomas Müller [Wed, 25 Sep 2013 12:28:42 +0000 (05:28 -0700)]
Merge pull request #4968 from owncloud/user_checkpwd
User: move checkPassword from User to Manager to not break API
kondou [Wed, 25 Sep 2013 10:57:41 +0000 (12:57 +0200)]
Make it possible to have a different color than the username for placeholder
Thomas Müller [Wed, 25 Sep 2013 09:05:59 +0000 (11:05 +0200)]
stripos return value check
Thomas Müller [Wed, 25 Sep 2013 09:05:24 +0000 (11:05 +0200)]
class API decommissioning part 1
Thomas Müller [Wed, 25 Sep 2013 08:30:48 +0000 (10:30 +0200)]
AppFramework:
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
Georg Ehrke [Wed, 25 Sep 2013 08:20:40 +0000 (10:20 +0200)]
add test for txt blacklist
Thomas Müller [Wed, 25 Sep 2013 07:52:12 +0000 (09:52 +0200)]
Merge branch 'master' into appframework-master
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
Jenkins for ownCloud [Tue, 24 Sep 2013 16:59:48 +0000 (12:59 -0400)]
[tx-robot] updated from transifex
Bjoern Schiessle [Tue, 24 Sep 2013 16:01:34 +0000 (18:01 +0200)]
introduce OC_Util::rememberLoginAllowed()
Thomas Tanghus [Tue, 24 Sep 2013 15:10:01 +0000 (17:10 +0200)]
Add factory class for the server container.
Arthur Schiwon [Tue, 24 Sep 2013 15:10:01 +0000 (17:10 +0200)]
Adjust Tests and satisfy them
Thomas Müller [Tue, 24 Sep 2013 13:58:47 +0000 (06:58 -0700)]
Merge pull request #4898 from owncloud/server_folder_methods
Server folder methods
Arthur Schiwon [Tue, 24 Sep 2013 12:12:44 +0000 (14:12 +0200)]
Fix doc
Arthur Schiwon [Tue, 24 Sep 2013 12:11:47 +0000 (14:11 +0200)]
Fix return value from User object to User ID
Thomas Müller [Tue, 24 Sep 2013 11:54:18 +0000 (13:54 +0200)]
duplicate code :sigh: - will fix this in a second pr
Thomas Müller [Tue, 24 Sep 2013 11:53:32 +0000 (13:53 +0200)]
adding file_exists check just to be on the save side
Arthur Schiwon [Tue, 24 Sep 2013 11:51:33 +0000 (13:51 +0200)]
=== not ==
Arthur Schiwon [Mon, 16 Sep 2013 12:15:35 +0000 (14:15 +0200)]
User: move checkPassword from User to Manager to not break API
Christopher [Tue, 24 Sep 2013 11:45:13 +0000 (04:45 -0700)]
Merge pull request #4963 from cyberb/patch-1
fixing typo
Georg Ehrke [Tue, 24 Sep 2013 11:26:51 +0000 (13:26 +0200)]
add test data for cal and contact preview
Thomas Müller [Tue, 24 Sep 2013 11:26:12 +0000 (13:26 +0200)]
adding privilege check on move and rename operations
Bjoern Schiessle [Tue, 24 Sep 2013 11:08:55 +0000 (13:08 +0200)]
don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password
Georg Ehrke [Tue, 24 Sep 2013 09:00:08 +0000 (11:00 +0200)]
add blacklist to txt preview backend
Thomas Müller [Tue, 24 Sep 2013 08:37:58 +0000 (10:37 +0200)]
adding PHPDoc comments to getBackend
ensure getChildren() is called on an instance of Share_Backend_Collection
Thomas Müller [Tue, 24 Sep 2013 08:02:50 +0000 (01:02 -0700)]
Merge pull request #4930 from owncloud/fix-apps-settings
Fix the apps enabling/disabling in settings
Thomas Müller [Tue, 24 Sep 2013 07:50:33 +0000 (00:50 -0700)]
Merge pull request #4917 from owncloud/scan-clear-permissions
clear permissions cache when scanning a file
Boris Rybalkin [Tue, 24 Sep 2013 01:08:58 +0000 (21:08 -0400)]
fixing typo
Typo in comment "feature" => "future"
Andreas Fischer [Mon, 23 Sep 2013 22:59:23 +0000 (00:59 +0200)]
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
Robin Appelman [Thu, 19 Sep 2013 19:37:52 +0000 (21:37 +0200)]
clear permissions cache when scanning a file
Thomas Tanghus [Mon, 23 Sep 2013 22:12:23 +0000 (00:12 +0200)]
Remove duplicate method definitions
Thomas Tanghus [Mon, 23 Sep 2013 22:09:21 +0000 (00:09 +0200)]
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
Conflicts:
lib/public/iservercontainer.php
lib/server.php
Thomas Tanghus [Wed, 18 Sep 2013 12:25:12 +0000 (14:25 +0200)]
Don't try to be clever
Thomas Tanghus [Wed, 18 Sep 2013 10:34:10 +0000 (12:34 +0200)]
Add getUserFolder/getAppFolder to Server.
Thomas Tanghus [Mon, 23 Sep 2013 21:48:28 +0000 (23:48 +0200)]
Fix conflict
Thomas Tanghus [Mon, 23 Sep 2013 13:52:50 +0000 (15:52 +0200)]
Moar tests.
Thomas Tanghus [Mon, 23 Sep 2013 13:52:06 +0000 (15:52 +0200)]
Use fetchOne() instead of numRows() when doing a COUNT(*).
Thomas Tanghus [Mon, 23 Sep 2013 11:29:21 +0000 (13:29 +0200)]
Forgot to return false if add() didn't add anything.