summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-281-0/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-272-2/+2
|
* Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-263-22/+11
|\ | | | | Fixing 998 master
| * Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1879-305/+317
| |\ | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js
| * | displaying notification now centeredThomas Mueller2013-01-111-2/+0
| | | | | | | | | | | | | | | The notification div has been moved to the user templates. Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
| * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1110-50/+105
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-064-0/+141
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/helper.php
| * \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-065-1/+59
| |\ \ \ \
| * | | | | javascript syntax error fixed on the wayThomas Mueller2013-01-041-3/+3
| | | | | |
| * | | | | new javascript notification functions used within users.jsThomas Mueller2013-01-041-5/+4
| | | | | |
| * | | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-021-12/+4
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-261-0/+3
| | | | | |
* | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-251-0/+15
|\ \ \ \ \ \
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-251-0/+15
| | | | | | |
* | | | | | | Merge master...Lukas Reschke2013-01-231-0/+17
|\| | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-231-0/+17
| | | | | | |
* | | | | | | Move appid to external fileLukas Reschke2013-01-233-4/+5
| | | | | | |
* | | | | | | Remove uneeded JSLukas Reschke2013-01-221-22/+1
| | | | | | |
* | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-224-2/+22
|\| | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-213-2/+18
| | | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-201-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | External JSON for the AppsLukas Reschke2013-01-214-7/+30
| | | | | |
* | | | | | Move to OC_AppLukas Reschke2013-01-211-89/+0
| | | | | |
* | | | | | Move isadmin to external fileLukas Reschke2013-01-213-3/+25
|/ / / / /
* | | | | [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
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 10:54:34 +0000