summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-201-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-183-1/+9
|
* Spaces to tabsBart Visscher2013-01-167-176/+176
|
* Fix regression caused by 31b1a73e1f508a33843835b632ee05c7bfc2aaafDaniel Molkentin2013-01-151-1/+3
|
* Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-masterBart Visscher2013-01-151-1/+1
|\ | | | | Fixing unused and undefined in master
| * Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-1475-202/+254
| |\
| * | fixing <input> tagThomas Mueller2013-01-071-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-152-0/+5
| |/ |/|
* | Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-142-5/+0
| | | | | | | | | | | | Let's remove it, it's also not secure anymore with the introduction of our API etc... (And doesn't work with ldap etc…)
* | Add a closing )Lukas Reschke2013-01-141-1/+1
| | | | | | | | Thanks Jenkins!
* | CP failLukas Reschke2013-01-141-1/+1
| |
* | Check if user is admin - boolLukas Reschke2013-01-148-12/+9
| | | | | | | | | | | | | | | | | | | | | | There was no "isAdminUser()" function which returned bool. This is irritiating as there were a loooooooot of places in the code which checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not use a function for this? (Especially if you consider that we might change the group name in the future, which would lead to problems then) Additionally, @Raydiation needed such a method for his AppFramework :)
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-131-0/+9
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1256-112/+73
| |
* | Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-112-20/+0
|\ \ | | | | | | | | | | | | | | | | | | Move openid.php to apps repo Conflicts: settings/routes.php
| * | Remove OpenID from the routerLukas Reschke2013-01-111-5/+1
| | |
| * | Move to apps repoLukas Reschke2013-01-111-16/+0
| | | | | | | | | | | | This belongs to the apps repo.
* | | Merge pull request #994 from owncloud/enhanced_multiSelectLukas Reschke2013-01-111-2/+3
|\ \ \ | | | | | | | | Enhanced multiSelect
| * | | Users: Show selected groups first in list.Thomas Tanghus2012-12-211-0/+1
| | | |
| * | | multiSelect: Modified users.js to only update other multiSelects.Thomas Tanghus2012-12-211-2/+2
| | | |
* | | | Merge pull request #1150 from owncloud/EnableSSL-AdminMenuLukas Reschke2013-01-115-0/+56
|\ \ \ \ | | | | | | | | | | Add security section to admin settings to enable the HTTPS enforcement
| * | | | Removed uneeded HTML tagLukas Reschke2013-01-111-1/+1
| | | | |
| * | | | Add security section to admin menuLukas Reschke2013-01-115-0/+56
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it only allows the admin to enable or disable the HTTPS enforcement, but in the future it could be expanded to further options. The HTTPS enforcement only allows the admin to enforce it, if he is connected via HTTPS. (To prevent admins to enable it without a proper SSL setup)
* / | | Remove setContentTypeHeader()Lukas Reschke2013-01-112-2/+0
|/ / / | | | | | | | | | | | | | | | `OC_JSON::success` and `OC_JSON::error` are calling `OC_JSON::encodedPrint`, which already sets these headers. So this two calls are uneeded duplicates.
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-115-27/+63
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-102-23/+19
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-091-0/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-082-0/+19
| |/ |/|
* | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-044-0/+141
|\ \ | | | | | | External API for ownCloud based on OCS
| * \ Merge branch 'master' into ocs_apiTom Needham2012-12-3167-1221/+1226
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot
| * \ \ Merge branch 'master' into ocs_apiTom Needham2012-12-163-3/+3
| |\ \ \
| * \ \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-1493-834/+589
| |\ \ \ \
| * \ \ \ \ Merge master into ocs_apiTom Needham2012-10-2867-359/+933
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ocs_apiTom Needham2012-09-1734-59/+115
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Fix merge conflictsTom Needham2012-09-1392-508/+1861
| |\ \ \ \ \ \ \
| * | | | | | | | API: Add callback_fail, add OC_OAuth::init and bespoke request token methodTom Needham2012-09-041-6/+21
| | | | | | | | |
| * | | | | | | | Fix class nameTom Needham2012-08-301-2/+2
| | | | | | | | |
| * | | | | | | | API: Fix merging of responses. Return 400 error when no OAuth operation sent.Tom Needham2012-08-031-2/+2
| | | | | | | | |
| * | | | | | | | Move OAuth classes into lib/oauthTom Needham2012-08-031-1/+1
| | | | | | | | |
| * | | | | | | | API: Use OC_API::checkLoggedIn() and OAuth scopes are app_$appnameTom Needham2012-08-031-1/+3
| | | | | | | | |
| * | | | | | | | OAuth server implementation using oauth libraryMichael Gapczynski2012-08-021-4/+19
| | | | | | | | |
| * | | | | | | | Check if required apps are installedTom Needham2012-07-304-9/+53
| | | | | | | | |
| * | | | | | | | Authorisation requires you to be logged inTom Needham2012-07-301-0/+1
| | | | | | | | |
| * | | | | | | | Include the css for the OAuth pageTom Needham2012-07-301-0/+1
| | | | | | | | |
| * | | | | | | | Improve styling of permission request pageTom Needham2012-07-302-12/+15
| | | | | | | | |
| * | | | | | | | Basic template for authorising exernal apps with OAuthTom Needham2012-07-302-0/+60
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-041-0/+4
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-033-0/+54
| | | | | | | | |
* | | | | | | | | omit type attribute in script tag to use fallback (text/javascript)Jörn Friedrich Dreyer2013-01-021-1/+1
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-021-0/+16
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 05:09:07 +0000