summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [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
|\
| * 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
* | [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 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 depends on OC_USER_BACKEND_SET_PASSWORDzafi2013-05-251-0/+6
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-282-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-272-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-268-0/+8
|/ / /
* | | Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-246-5/+31
|\ \ \
| * \ \ Merge branch 'master' into files_encryptionBjörn Schießle2013-05-212-2/+52
| |\ \ \ | | | |/ | | |/|
| * | | 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 t...Björn Schießle2013-05-181-3/+7
| * | | | 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 #3251kondou2013-05-091-2/+3
| * | | 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 arraykondou2013-05-011-3/+4
* | | 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 on every page for admin usersLukas Reschke2013-04-241-2/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2753-189/+257