summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-252-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-241-0/+1
|
* Merge pull request #3766 from owncloud/fix_display_name_editThomas Müller2013-06-211-1/+1
|\ | | | | Correct new user display name output
| * Replace display name onlyVictor Dubiniuk2013-06-181-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-2166-19/+88
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-203-15/+56
| |
* | Users page: username instead of login name as col header to avoid confusion ↵Arthur Schiwon2013-06-181-1/+1
| | | | | | | | with other backends
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-181-0/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-161-0/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-1538-37/+40
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-144-5/+10
|
* Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-133-8/+13
|\ | | | | Make templates aware of different owncloud editions
| * Merge branch 'template_updates' of github.com:owncloud/core into ↵Björn Schießle2013-06-122-9/+4
| |\ | | | | | | | | | template_updates
| | * move common settings footer fieldset out of conditionalJan-Christoph Borchardt2013-06-122-9/+4
| | |
| * | don't show translation hints in enterprise editionBjörn Schießle2013-06-121-0/+2
| |/
| * make footer and urls aware of ownCloud editionsBjörn Schießle2013-06-123-5/+13
| |
* | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1314-16/+41
|\ \ | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
| * \ Merge pull request #3677 from owncloud/apps-buttonsJan-Christoph Borchardt2013-06-132-6/+17
| |\ \ | | | | | | | | remove App management top bar and move buttons more contextually in the interface
| | * | apps management: change misleading + to ...Jan-Christoph Borchardt2013-06-121-1/+1
| | | |
| | * | remove App management top bar and move buttons more contextually in the ↵Jan-Christoph Borchardt2013-06-122-6/+17
| | |/ | | | | | | | | | interface
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-132-2/+4
| | |
| * | Merge pull request #3676 from owncloud/move-storage-barFrank Karlitschek2013-06-121-6/+9
| |\ \ | | |/ | |/| move storage bar below clients showcase to make it more visible
| | * move storage bar below clients showcase to make it more visibleJan-Christoph Borchardt2013-06-111-6/+9
| | |
| * | Merge pull request #3681 from owncloud/fix_ajax_removeuser.phpMorris Jobke2013-06-121-0/+1
| |\ \ | | | | | | | | Init language object before using it
| | * | init language object before using itGeorg Ehrke2013-06-121-0/+1
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-128-2/+10
| | |/ | |/|
* | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-111-0/+1
|\| | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-111-0/+1
| | |
* | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1017-25/+114
|\| | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php
| * | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-102-10/+26
| |\ \ | | |/ | |/| recover encryption keys if ownCloud can't change the log-in password
| | * use pre_setPassword hook to update the encryption keys if the back-end ↵Björn Schießle2013-06-061-9/+21
| | | | | | | | | | | | doesn't support password change; improved output to let the admin know what happened
| | * add hint about what the recovery password field is forBjörn Schießle2013-06-061-1/+5
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-084-0/+4
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-074-1/+56
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-064-8/+10
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-053-6/+16
| |
| * Merge pull request #3454 from owncloud/fix_hasInternetConnectionThomas Müller2013-05-311-1/+1
| |\ | | | | | | isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
| | * fix method namingThomas Mueller2013-05-311-1/+1
| | |
| | * use false instead of 0Georg Ehrke2013-05-271-1/+1
| | |
| | * make method names camelCaseGeorg Ehrke2013-05-271-1/+1
| | |
| | * don't show a warning if internet connection is disabled on purposeGeorg Ehrke2013-05-271-1/+1
| | |
* | | only check for recovery key if someone else than the user wants to change ↵Björn Schießle2013-06-071-1/+1
| | | | | | | | | | | | the password
* | | fix password change when files_encryption app is disabledFlorin Peter2013-06-031-23/+29
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-302-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-291-0/+1
| |
* | Merge pull request #2778 from Kondou-ger/optimize_picturesJörn Friedrich Dreyer2013-05-2810-9497/+39
|\ \ | | | | | | Optimize pictures with optipng.
| * | Optimize svgs with scour.kondou2013-04-126-9497/+39
| | |
| * | Optimize pictures with optipng.kondou2013-04-074-0/+0
| | |
* | | Merge pull request #3488 from zafi/masterblizzz2013-05-281-0/+6
|\ \ \ | | | | | | | | The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
| * | | The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORDzafi2013-05-251-0/+6
| | | | | | | | | | | | | | | | so it should only be visible for users with a supporting backend.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 12:51:06 +0000