summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-07121-1456/+5189
|
* Merge pull request #5179 from owncloud/userlist-avatarMorris Jobke2013-10-071-0/+6
|\ | | | | Fix new user avatar. Ref#5166
| * Fix new user avatar. Ref#5166Victor Dubiniuk2013-10-071-0/+6
| |
* | Merge pull request #5178 from owncloud/sharing-ispublicflagintemplateVincent Petry2013-10-071-0/+1
|\ \ | | | | | | Added isPublic flag in files_sharing template
| * | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | To make it possible for apps to find out whether they are running in public mode, the flag "isPublic" will now be present in the DOM. This is required to disable the editor app in public mode to fix #5059
* | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-076-42/+7
|\ \ \ | |_|/ |/| | File conflicts dialog fixes
| * | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| | |
| * | canceling individual uploads is currently impossible because there is no ↵Jörn Friedrich Dreyer2013-10-072-34/+1
| | | | | | | | | | | | placeholder
| * | use correct property for mimetype of existing filesJörn Friedrich Dreyer2013-10-071-1/+1
| | |
| * | remove obsolete commentJörn Friedrich Dreyer2013-10-071-2/+0
| | |
| * | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
| | |
* | | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-076-4/+170
|\ \ \ | |_|/ |/| | 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-072-2/+2
| | |
| * | 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
| | |
| * | adding warning about failed apache module authThomas Müller2013-10-021-0/+6
| | |
| * | code cleanup - remove special case for webdav in handleApacheAuth()Thomas Müller2013-10-023-20/+23
| | |
| * | $defaults is not necessary here - merge artifactThomas Müller2013-10-021-2/+0
| | |
| * | Revert "use $defaults instead of $theme"Thomas Müller2013-10-021-3/+3
| | | | | | | | | | | | This reverts commit d5038e93dba633cce36538905b7e5365ba1b3b63.
| * | Merge branch 'master' into apache-auth-masterThomas Müller2013-10-02314-17/+78
| |\ \
| * | | adding getCurrentUserId() to ApacheBackendThomas Müller2013-10-012-6/+11
| | | |
| * | | use $defaults instead of $themeThomas Müller2013-10-011-3/+3
| | | |
| * | | Squashed commit of the following:Thomas Müller2013-10-015-2/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #5169 from owncloud/sharingdropdown-uxbugfixesMorris Jobke2013-10-071-2/+4
|\ \ \ \ | | | | | | | | | | Sharing dropdown bug fixes
| * | | | Prevent share dropdown to close too early with autocompleteVincent Petry2013-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on an autocomplete result in the sharing dropdown, it will mistakenly be detected as being clicked outside and would trigger the sharing dropdown closing. This fix adds a check to detect clicks inside the autocomplete and prevent closing the dropdown in that case. This fixes #4142
| * | | | Fixed label for sharing notification to be clickableVincent Petry2013-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed the sharing notification checkbox label in the file sharing dropdown, which makes it possible to click on the label directly.
| * | | | Prevent scroll up when click on links in sharing dropdownVincent Petry2013-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on a link that points to "#" in the sharing dropdown, and the current view is scrolled down, the browser will scroll the page up to the top (anchor behavior). This fix cancels the click event when clicking on "unshare" link or "show crud" link.
* | | | | Merge pull request #5162 from owncloud/fixing-l10n-master-2Morris Jobke2013-10-0787-3388/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixing l10n master 2
| * | | | | update version to 6.0.0 and adding comment optionThomas Müller2013-10-071-1/+1
| | | | | |
| * | | | | move l10n factory into privateThomas Müller2013-10-071-0/+0
| | | | | |
| * | | | | remove outdated translation filesThomas Müller2013-10-0785-3387/+0
| |/ / / /
* | | | | Merge pull request #5165 from owncloud/files-dropontobreadcrumbfixMorris Jobke2013-10-071-6/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix breadcrumb to reinit dnd after ajax nav #5064
| * | | | | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now correctly reinitializing the breadcrumb drop zone after ajax navigation. This also fixes dropping onto the "files" app icon.
* | | | | 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-074-70/+99
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | error handling added in case file_put_contents is failing
| * | | | | Merge branch 'master' into fixing-4011-masterThomas Müller2013-10-04484-2132/+10456
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-305-14/+201
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| * | | | | | | adding test testSimplePutFailsOnRename()Thomas Müller2013-09-301-0/+14
| | | | | | | |
| * | | | | | | remove commented codeThomas Müller2013-09-301-56/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into fixing-4011-masterThomas Müller2013-09-3097-573/+1100
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php lib/connector/sabre/file.php
| * | | | | | | | remove unused setUp()Thomas Müller2013-09-271-3/+0
| | | | | | | | |
| * | | | | | | | catching NotPermittedException and throw it to the dav client as 403Thomas Müller2013-09-261-5/+10
| | | | | | | | |
| * | | | | | | | adding basic unit test for failing file_put_content operationThomas Müller2013-09-241-0/+27
| | | | | | | | |
| * | | | | | | | creating non static getETagPropertyForPath()Thomas Müller2013-09-243-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding public $fileView to Node to allow unit testing
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 05:00:42 +0000