Commit graph

14299 commits

Author SHA1 Message Date
Owen Winkler
535ed8369f Merge pull request #4894 from owncloud/fixing-4620-master
Fixing broken layout in master due to APC enabled
2013-10-01 17:51:33 -07:00
Thomas Müller
0d7c36c9f1 adding PHPDoc comment 2013-10-02 01:13:02 +02:00
Thomas Müller
3e4d56d7bb adding warning about failed apache module auth 2013-10-02 01:02:46 +02:00
Thomas Müller
4cecede13d code cleanup - remove special case for webdav in handleApacheAuth() 2013-10-02 00:55:35 +02:00
Thomas Müller
493e948146 $defaults is not necessary here - merge artifact 2013-10-02 00:34:13 +02:00
Thomas Müller
173f32e6ef Revert "use $defaults instead of $theme"
This reverts commit d5038e93db.
2013-10-02 00:32:11 +02:00
Thomas Müller
7e9e23f210 Merge branch 'master' into apache-auth-master 2013-10-02 00:21:11 +02:00
Victor Dubiniuk
5bb4330ea4 Fix autoloader regression 2013-10-02 00:58:51 +03:00
Thomas Müller
9eab8b39df Merge branch 'master' into fixing-4620-master 2013-10-01 22:57:46 +02:00
Thomas Müller
0537960dcc adding getCurrentUserId() to ApacheBackend 2013-10-01 22:56:47 +02:00
Robin Appelman
de43515cfa fix recursive delete for smb 2013-10-01 22:33:58 +02:00
Robin Appelman
29deef38b2 fix using touch to create a file for smb 2013-10-01 22:31:22 +02:00
Robin Appelman
ea566868a8 return the correct result when doing an smb rename 2013-10-01 22:29:33 +02:00
Robin Appelman
ea6115bfaa fix smb streamwrapper on non existing files 2013-10-01 22:18:03 +02:00
Thomas Tanghus
8035787cb9 Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request 2013-10-01 20:16:11 +02:00
Thomas Tanghus
a2cabd4c2a Remove getContent() from IRequest 2013-10-01 20:15:04 +02:00
Thomas Tanghus
0f13ffb773 Remove JSON request parsing from Server 2013-10-01 20:15:04 +02:00
Thomas Tanghus
7cd8088845 Add assertions for ->params and array access with json 2013-10-01 20:15:03 +02:00
Thomas Tanghus
973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus
36d1156cf8 Add interface docs to IRequest. 2013-10-01 20:13:13 +02:00
Thomas Tanghus
cd2e1d0cfe Add patch method to OC_Route 2013-10-01 20:13:13 +02:00
Thomas Tanghus
bdad7697ac Check if accessor matched request method.
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
Morris Jobke
5ade595911 Merge pull request #5039 from owncloud/lib-private-master-2
Public API OC6 - introduce lib/private
2013-10-01 09:15:24 -07:00
Thomas Müller
e2fe71b6e7 Merge branch 'master' into lib-private-master-2 2013-10-01 16:11:59 +02:00
Thomas Müller
b66e492d6e Merge pull request #5026 from owncloud/channels
put the current version and edition into a seperate file to simplify
2013-10-01 05:36:00 -07:00
Thomas Müller
d5038e93db use $defaults instead of $theme 2013-10-01 14:33:56 +02:00
Thomas Müller
d8ada370d7 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
2013-10-01 14:29:01 +02:00
Frank Karlitschek
6cda88b49d add explanation 2013-10-01 14:28:59 +02:00
Frank Karlitschek
bf0f3bf0da use a 4 digit number 2013-10-01 12:37:19 +02:00
Thomas Müller
02d6976263 Merge branch 'master' into lib-private-master-2 2013-09-30 21:29:58 +02:00
Thomas Müller
7c659eb291 use public api for session access from server container 2013-09-30 20:28:00 +02:00
Thomas Müller
bed27b603d Merge branch 'master' into channels
Conflicts:
	lib/util.php
2013-09-30 20:21:51 +02:00
Frank Karlitschek
2cf26ee0b1 put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
Conflicts:
	lib/ocsclient.php
	lib/util.php
2013-09-30 20:19:26 +02:00
Frank Karlitschek
69dd6af574 use ===
Shoudn't make a difference in this case but just in case

Conflicts:
	lib/ocsclient.php
2013-09-30 20:15:16 +02:00
Frank Karlitschek
b948c1a1b6 prepare the updater for the new update channels 2013-09-30 20:14:18 +02:00
Thomas Müller
b58a464b86 Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Thomas Müller
8e0060405d reorganize file in lib 2013-09-30 16:39:03 +02:00
Thomas Müller
9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
	lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
Thomas Tanghus
26785c9e0d Remove getContent() from IRequest 2013-09-30 16:30:36 +02:00
Thomas Tanghus
4e9a95f3e9 Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
Conflicts:
	lib/appframework/http/request.php
	tests/lib/appframework/http/RequestTest.php
2013-09-30 16:27:00 +02:00
Thomas Tanghus
b0be2c79dc Remove JSON request parsing from Server 2013-09-30 16:24:47 +02:00
Thomas Tanghus
1d2466c6d1 Add assertions for ->params and array access with json 2013-09-30 16:23:43 +02:00
Jenkins for ownCloud
a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Morris Jobke
d4fed61871 Merge pull request #5012 from owncloud/check_keyfiles_exists
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-30 06:55:56 -07:00
Thomas Tanghus
092b4e7b53 Implement PUT an PATCH support 2013-09-30 15:35:07 +02:00
Thomas Tanghus
2115db3892 Add interface docs to IRequest. 2013-09-30 15:35:07 +02:00
Thomas Tanghus
35fae7aaf8 Add patch method to OC_Route 2013-09-30 15:35:07 +02:00
Thomas Tanghus
50fc5e8792 Check if accessor matched request method.
It's easier to find errors in the code if an exception is thrown.
2013-09-30 15:35:07 +02:00
Bjoern Schiessle
67d4b77e8e revert changes in personal template 2013-09-30 15:11:01 +02:00
Bjoern Schiessle
4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00