summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-246-5/+31
|\ | | | | New files encryption app
| * Merge branch 'master' into files_encryptionBjörn Schießle2013-05-212-2/+52
| |\ | | | | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php
| * \ Merge branch 'master' into files_encryptionFlorin Peter2013-05-205-22/+24
| |\ \
| * | | display a warning if the user has enabled file recovery but the admin tries ↵Björn Schießle2013-05-181-3/+7
| | | | | | | | | | | | | | | | to change the users password without a recovery password
| * | | show nicer warning if the admin recovery password was wrongBjörn Schießle2013-05-162-5/+7
| | | |
| * | | some error handling in case the recovery password is wrongBjörn Schießle2013-05-162-2/+9
| | | |
| * | | allow admin to recover users files in case of password lostBjörn Schießle2013-05-166-4/+17
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-241-1/+5
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-202-2/+52
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-181-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-171-20/+20
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-163-2/+3
|/
* Merge remote-tracking branch 'upstream/master' into pr-langcodePellaeon Lin2013-05-1210-23/+93
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-126-14/+87
| |
| * Merge pull request #3257 from owncloud/fix_3251Jan-Christoph Borchardt2013-05-101-2/+3
| |\ | | | | | | Fix 3251
| | * Fix #3251kondou2013-05-091-2/+3
| | | | | | | | | | | | Using ksort now, instead of prefilling the commonlanguages array.
| * | fix inconsistent post parameters in change password operationBjörn Schießle2013-05-082-2/+2
| | |
| * | allow to set quota to zero, issue #2696Björn Schießle2013-05-071-5/+1
| | |
* | | Modify zh_* language codesPellaeon Lin2013-05-041-3/+3
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2013-05-041-0/+1
|/
* Merge pull request #3201 from owncloud/own_sorting_for_priorized_languagesBart Visscher2013-05-031-3/+4
|\ | | | | Sort priorized languages as defined in the array
| * Sort priorized languages as defined in the arraykondou2013-05-011-3/+4
| | | | | | | | Also add russian and arabic to the common languages.
* | Fix retrieval of users with multiple backendsArthur Schiwon2013-05-032-5/+16
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-025-37/+43
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-014-8/+12
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-304-10/+80
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-296-4/+23
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-282-6/+8
|
* Merge pull request #3114 from owncloud/update-notificationRaghu Nayyar2013-04-261-2/+1
|\ | | | | Add an update notification
| * Add an update notification on every page for admin usersLukas Reschke2013-04-241-2/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2753-189/+257
| |
* | Merge pull request #3002 from owncloud/priorize_common_languagesBart Visscher2013-04-263-4/+21
|\ \ | | | | | | Priorize common languages.
| * | Make divider not selectablekondou2013-04-192-5/+4
| | | | | | | | | | | | Very hacky
| * | Priorize common languages.kondou2013-04-183-4/+22
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2636-108/+0
| | |
* | | Merge pull request #3098 from jerrac/displaynamesaveontimeoutMorris Jobke2013-04-253-40/+46
|\ \ \ | | | | | | | | On the Personal Settings page, made the display name save like the email address saves
| * | | Fixed comment in personal.js. Changed message text in changedisplayname.php.David Reagan2013-04-232-2/+2
| | | |
| * | | Made saving the display name work the same way as the email address. Fixed a ↵David Reagan2013-04-233-40/+46
| | | | | | | | | | | | | | | | few comparison operators. Increased the fadeOut time for the success and error messages.
* | | | Merge pull request #3094 from owncloud/log-ajaxBart Visscher2013-04-252-8/+6
|\ \ \ \ | | | | | | | | | | fix logical issue while retrieving log via ajax
| * | | | fix syntax layoutMorris Jobke2013-04-231-3/+6
| | | | |
| * | | | remove log sort in admin sectionMorris Jobke2013-04-231-5/+0
| | | | | | | | | | | | | | | | | | | | doesn't work anymore, because now the datetime is saved as string (ref #2975)
| * | | | fix logical issue while retrieving log via ajaxMorris Jobke2013-04-231-1/+1
| |/ / /
* | | | Merge pull request #3096 from owncloud/add_missing_space_for_new_groupsRaghu Nayyar2013-04-241-9/+3
|\ \ \ \ | |_|_|/ |/| | | Fixing #3095
| * | | Fix #3095.kondou2013-04-241-9/+3
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-04-242-0/+7
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2013-04-221-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-184-4/+7
|
* Merge pull request #2975 from owncloud/log-dateMorris Jobke2013-04-172-2/+10
|\ | | | | use date and time instead of timestamp in log
| * also adjust template properly for log date fixBernhard Posselt2013-04-171-1/+5
| |
| * fix admin log display and use a more readable formatBernhard Posselt2013-04-171-1/+5
| |