summaryrefslogtreecommitdiffstats
path: root/settings/ajax
Commit message (Collapse)AuthorAgeFilesLines
* fixes #2743 - use public OC_User::getDisplayName instead of ↵Thomas Mueller2013-04-081-1/+1
| | | | OC_User::determineDisplayName
* Add log as text and not as HTMLLukas Reschke2013-03-031-9/+2
|
* Fix encoding settings ajax getlogBart Visscher2013-03-031-1/+10
|
* Whitespace fixesBart Visscher2013-02-221-31/+31
|
* Merge pull request #1855 from owncloud/userlist_load_displaynamesBernhard Posselt2013-02-221-2/+4
|\ | | | | Fetch displayname in userlist ajax requests. Refs #1681
| * Fetch displayname in userlist ajax requests. Refs #1681Thomas Tanghus2013-02-221-2/+4
| |
* | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-222-2/+6
|\ \ | |/ |/| Codestyle cleanup
| * Style cleanup settingsBart Visscher2013-02-212-2/+6
| |
* | Fix error path in changedisplayname callBart Visscher2013-02-221-2/+2
|/
* Do not set password if it has't providedVictor Dubiniuk2013-02-181-2/+2
|
* Merge branch 'master' into fixing-1424-masterThomas Mueller2013-02-113-8/+9
|\
| * I'm an evil bastard and I commit this 3 letter text fix without a pull request.Frank Karlitschek2013-02-091-1/+1
| |
| * add switch to enable/disable the possibility to change the display name by ↵Björn Schießle2013-02-101-0/+4
| | | | | | | | the user
| * Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-101-3/+3
| |\ | | | | | | Typo
| | * TypoLukas Reschke2013-02-091-3/+3
| | |
| * | Remove uneeded linesLukas Reschke2013-02-091-4/+1
| | |
* | | Merge branch 'master' into fixing-1424-masterThomas Müller2013-02-094-6/+5
|\| |
| * | Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-091-4/+1
| |\ \ | | | | | | | | Fix loading hooks when going though the routing system
| | * | Better way of getting the navigation entries for an appBart Visscher2013-02-081-4/+1
| | |/
| * / Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-094-2/+4
| |/
* / on creation only test for existing users if the backend supports user creationThomas Müller2013-02-081-6/+0
|/ | | | this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
* Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-061-0/+3
|\ | | | | Files encryption
| * Reverted fix temporarily; another fix by LukasReschke is awaiting mergeSam Tuke2013-02-061-1/+3
| |
| * Added commentSam Tuke2013-02-061-0/+1
| |
| * Fixed bug causing password change related hooks to not be called due to ajaxSam Tuke2013-02-061-0/+2
| |
| * Removed call to depreciated isUserVerified()Sam Tuke2013-02-061-3/+1
| |
* | Merge pull request #1363 from owncloud/FixPasswordChangeLukas Reschke2013-02-061-8/+2
|\ \ | |/ |/| Fix password change
| * Fix indentationLukas Reschke2013-01-301-1/+1
| |
| * Remove the no longer existing function "isUserVerified"Lukas Reschke2013-01-301-7/+1
| | | | | | | | Thx @eMerzh
* | make strings translatableBjörn Schießle2013-02-061-2/+2
| |
* | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-061-2/+3
| |
* | Cleanup string - easier for translatorsThomas Mueller2013-01-311-1/+1
| |
* | fix typoFrank Karlitschek2013-01-301-1/+1
| |
* | merge masterFrank Karlitschek2013-01-307-15/+37
|\| | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * check permissions before changing the display nameBjörn Schießle2013-01-291-0/+13
| |
| * added missing changedisplayname.phpBjörn Schießle2013-01-291-0/+15
| |
| * Spaces to tabsBart Visscher2013-01-161-2/+2
| |
| * Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-141-4/+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-146-9/+7
| | | | | | | | | | | | | | | | | | | | | | 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 :)
* | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-301-1/+6
| |
* | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-212-0/+18
|/
* Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-111-16/+0
|\ | | | | | | | | | | | | Move openid.php to apps repo Conflicts: settings/routes.php
| * Move to apps repoLukas Reschke2013-01-111-16/+0
| | | | | | | | This belongs to the apps repo.
* | Merge pull request #1150 from owncloud/EnableSSL-AdminMenuLukas Reschke2013-01-111-0/+13
|\ \ | | | | | | Add security section to admin settings to enable the HTTPS enforcement
| * | Add security section to admin menuLukas Reschke2013-01-111-0/+13
| |/ | | | | | | | | | | | | | | | | 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.
* Fix "There must be a single space between the closing parenthesis and the ↵Bart Visscher2012-12-151-1/+1
| | | | opening brace"
* Merge pull request #603 from owncloud/store_plain_groupnameBart Visscher2012-11-302-2/+2
|\ | | | | Group name doesn't need to be sanitized before storing it in the database
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 05:06:47 +0000