summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* adding warning about failed apache module authThomas Müller2013-10-021-0/+6
|
* $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.
* use $defaults instead of $themeThomas Müller2013-10-011-3/+3
|
* Squashed commit of the following:Thomas Müller2013-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-301-1/+2
|\ | | | | don't remember login if the encrypion app is enabled
| * introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-241-1/+1
| |
| * don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-241-1/+2
| | | | | | | | needs to log-in again in order to decrypt his private key with his password
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-305-3/+47
| |
* | followup of #4032 - makes the settings-button bigger and adds again padding ↵Alessandro Cosentino2013-09-291-1/+2
| | | | | | | | at bottom of app-navigation
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-292-6/+20
| |
* | Base defaultavatar text on displaynamekondou2013-09-282-2/+6
| | | | | | | | Fix #4876
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-273-0/+8
| |
* | Merge pull request #4887 from owncloud/sharing_disable_public_uploadBjörn Schießle2013-09-261-2/+2
|\ \ | | | | | | check only permission from link-share to decide if public upload is enabled or disabled
| * | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-171-3/+1
| | |
| * | check only permission from link-share to decide if public upload is enabled ↵Bjoern Schiessle2013-09-171-1/+3
| | | | | | | | | | | | or disabled
* | | Merge pull request #4987 from owncloud/different_color_placeholderMorris Jobke2013-09-251-2/+13
|\ \ \ | | | | | | | | Make it possible to have a different color than the username for placeholder
| * | | Shorten optional text-argument processingkondou2013-09-251-3/+2
| | | |
| * | | Make it possible to have a different color than the username for placeholderkondou2013-09-251-2/+14
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2013-09-244-4/+36
|/ /
* | Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-231-1/+12
|\ \ | | | | | | sharing, allow user to disable password protection
| * | initialize variableBjoern Schiessle2013-09-201-0/+1
| | |
| * | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-201-1/+11
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2265-12/+139
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2083-18/+183
| |
* | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-192-0/+43
|\ \ | | | | | | Use more object oriented way for console commands
| * | Add copyright, remove starting blank lineBart Visscher2013-09-191-0/+6
| | |
| * | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-131-0/+9
| | |
| * | Cleanup and more style fixesBart Visscher2013-09-021-7/+5
| | |
| * | Use more object oriented way for console commandsBart Visscher2013-09-011-0/+30
| | |
* | | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
|\ \ \ | | | | | | | | css selectors never have a : before []
| * | | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1
| | | |
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1916-0/+152
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js
| * \ \ \ Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-191-0/+13
| |\ \ \ \ | | |/ / / | |/| | | initial scrollto implementation
| | * | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1815-0/+139
| | | | |
| * | | | disable avatar loading on public guest pageJörn Friedrich Dreyer2013-09-171-3/+5
| | |_|/ | |/| |
* | | | use {count} instead of 'One' for more versatile translationJörn Friedrich Dreyer2013-09-191-1/+1
| | | |
* | | | use n to translate titleJörn Friedrich Dreyer2013-09-191-1/+7
| | | |
* | | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵Jörn Friedrich Dreyer2013-09-191-1/+1
| | | | | | | | | | | | | | | | ... maybe something is wrong there
* | | | fix 'event is not defined' errorJörn Friedrich Dreyer2013-09-191-1/+1
| | | |
* | | | indentationJörn Friedrich Dreyer2013-09-181-43/+43
| | | |
* | | | simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-13/+11
| | | |
* | | | allow passing classes to buttonsJörn Friedrich Dreyer2013-09-181-0/+3
| | | |
* | | | we cannot load avatar on guest pageJörn Friedrich Dreyer2013-09-171-3/+5
| | | |
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-171-1/+10
|\| | |
| * | | Merge pull request #4871 from owncloud/add_exists_method_to_jqueryBernhard Posselt2013-09-171-1/+10
| |\ \ \ | | |/ / | |/| | add exists method to jquery
| | * | add exists method to jqueryJörn Friedrich Dreyer2013-09-161-1/+10
| | | |
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1749-73/+401
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1636-36/+0
| |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 17:30:38 +0000