summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5219 from owncloud/catch_wrong_timezoneBjörn Schießle2013-10-091-2/+6
|\ | | | | catch unknown timezone and fall-back to UTC
| * changed default time format to ISO8601Bjoern Schiessle2013-10-091-1/+1
| |
| * catch unknown timezone and fall-back to UTCBjoern Schiessle2013-10-081-1/+5
| |
* | Merge pull request #5032 from owncloud/fixing-5006-masterAndreas Fischer2013-10-081-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. * owncloud/fixing-5006-master: Use strict comparison === instead of ==. Adjust return value tests for checkPassword() to what OC_User_Example says. Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. Use parent:: in Test_User_Database::getUser(). Test_User_Backend::getUser() does not return an array, it returns a string. Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
| * | Use strict comparison === instead of ==.Andreas Fischer2013-10-081-1/+1
| | |
| * | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.Andreas Fischer2013-10-081-2/+2
| |/ | | | | | | The user id has to be returned.
* | Merge pull request #5188 from owncloud/master-delete-userThomas Müller2013-10-081-0/+4
|\ \ | |/ |/| User::delete should return bool
| * User::delete should return boolVictor Dubiniuk2013-10-071-0/+4
| |
* | Merge pull request #5173 from owncloud/set_timezone_for_logBjörn Schießle2013-10-081-3/+5
|\ \ | | | | | | let admin specify timezone for log file entries
| * | let admin specify timezone for log file entriesBjoern Schiessle2013-10-071-3/+5
| | |
* | | Merge pull request #5146 from guruz/cache_enabled_apps_listFrank Karlitschek2013-10-081-3/+10
|\ \ \ | | | | | | | | OC_App: Cache list of enabled apps
| * | | OC_App: Cache list of enabled appsMarkus Goetz2013-10-051-3/+10
| | | | | | | | | | | | | | | | | | | | In my test here 1 SELECT instead of 5 (when doing a DAV request, probably similar for other requests)
* | | | Merge pull request #5194 from owncloud/fixing-5172-masterThomas Müller2013-10-081-0/+3
|\ \ \ \ | | | | | | | | | | adding check isDeletable() on $sourcePath
| * | | | adding check isDeletable() on $sourcePathThomas Müller2013-10-081-0/+3
| | | | |
* | | | | Merge pull request #5193 from owncloud/fix_5126_2Björn Schießle2013-10-082-2/+27
|\ \ \ \ \ | | | | | | | | | | | | fix upload to /Shared
| * | | | | part file needs to have .part extensionBjoern Schiessle2013-10-081-1/+1
| | | | | |
| * | | | | updating a existing large file creates new file chunks. Therefore ↵Bjoern Schiessle2013-10-081-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
| * | | | | If a existing file in Shared/ with update permissions gets updated we need ↵Bjoern Schiessle2013-10-081-0/+11
| |/ / / / | | | | | | | | | | | | | | | to write the .part file to a different place because we can't create new files in the Shared folder
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-081-0/+1
|/ / / /
* | | | Merge pull request #5181 from owncloud/fixing-chunked-upload-masterMorris Jobke2013-10-071-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fixing broken chunked upload due to #4974
| * | | the path for reassembling was created the wrong wayThomas Müller2013-10-071-2/+2
| | | |
* | | | Merge pull request #4796 from owncloud/config-no-catchBart Visscher2013-10-071-10/+2
|\ \ \ \ | | | | | | | | | | Remove the exception catch in OC_Config, this should be handled by a higher layer
| * | | | Remove the exception catch, this should be handled by a higher layerBart Visscher2013-10-071-10/+2
| | | | | | | | | | | | | | | | | | | | And is when using index.php as entry point
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-071-0/+8
| |/ / / |/| | |
* | | | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-074-3/+163
|\ \ \ \ | |_|_|/ |/| | | OC6 Apache Authentication
| * | | Move backend finding into its own method.Andreas Fischer2013-10-071-16/+26
| | | |
| * | | move call to print_unescaped() to templateThomas Müller2013-10-071-1/+1
| | | |
| * | | Also replace ApacheBackend with Authentication\IApacheBackend in user.Andreas Fischer2013-10-021-4/+4
| | | |
| * | | fixing various PHPDoc commentsThomas Müller2013-10-022-6/+12
| | | |
| * | | fixing namespace of ApacheBackend - now know as ↵Thomas Müller2013-10-021-5/+5
| | | | | | | | | | | | | | | | OCP\Authentication\IApacheBackend
| * | | remove obsolete function login()Thomas Müller2013-10-021-8/+0
| | | |
| * | | adding PHPDoc commentThomas Müller2013-10-021-1/+3
| | | |
| * | | code cleanup - remove special case for webdav in handleApacheAuth()Thomas Müller2013-10-023-20/+23
| | | |
| * | | Merge branch 'master' into apache-auth-masterThomas Müller2013-10-02312-12/+56
| |\ \ \
| * | | | adding getCurrentUserId() to ApacheBackendThomas Müller2013-10-012-6/+11
| | | | |
| * | | | Squashed commit of the following:Thomas Müller2013-10-014-1/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #5162 from owncloud/fixing-l10n-master-2Morris Jobke2013-10-0786-3387/+0
|\ \ \ \ \ | | | | | | | | | | | | Fixing l10n master 2
| * | | | | move l10n factory into privateThomas Müller2013-10-071-0/+0
| | | | | |
| * | | | | remove outdated translation filesThomas Müller2013-10-0785-3387/+0
| | | | | |
* | | | | | Merge pull request #5142 from owncloud/fix_version_cache_expireFrank Karlitschek2013-10-071-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | correctly expire cache if version file changed.
| * | | | | | a few styleguide fixesFrank Karlitschek2013-10-071-2/+2
| | | | | | |
| * | | | | | correctly expire cache if version file changed. Fixes problem that ownCloud ↵Frank Karlitschek2013-10-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | only starts upgrading during login
* | | | | | | Merge pull request #4974 from owncloud/fixing-4011-masterThomas Müller2013-10-073-70/+61
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | error handling added in case file_put_contents is failing
| * | | | | | Merge branch 'master' into fixing-4011-masterThomas Müller2013-10-04339-1035/+5758
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-303-14/+103
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| * | | | | | | | remove commented codeThomas Müller2013-09-301-56/+0
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-3015-56/+176
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php lib/connector/sabre/file.php
| * | | | | | | | | catching NotPermittedException and throw it to the dav client as 403Thomas Müller2013-09-261-5/+10
| | | | | | | | | |
| * | | | | | | | | creating non static getETagPropertyForPath()Thomas Müller2013-09-243-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding public $fileView to Node to allow unit testing
| * | | | | | | | | unify duplicate codeThomas Müller2013-09-242-59/+29
| | | | | | | | | |