summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Keep scroll position in users page when sortingVincent Petry2016-01-131-1/+8
* Merge pull request #21263 from owncloud/backport-21260-stable8.1Vincent Petry2015-12-241-3/+1
|\
| * initialize l10n instance earlier, fixes an undefined var warning followed by ...Arthur Schiwon2015-12-171-3/+1
* | Update users.jsmichag862015-12-181-1/+1
|/
* reset mailadress/displayname on blurmichag862015-12-111-3/+5
* Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
* also don't count group members when more than 1 ldap configs are activeArthur Schiwon2015-08-261-1/+3
* Add option to disable autocomplete in share dialogMorris Jobke2015-08-172-0/+6
* Merge pull request #18064 from owncloud/import_root_certificates_8.1Thomas Müller2015-08-124-3/+54
|\
| * also block certificate management in the back-end if external storages are di...Bjoern Schiessle2015-08-052-2/+35
| * only add the possibility to import ssl root certificates to the personalBjoern Schiessle2015-08-052-1/+19
* | Merge pull request #17972 from owncloud/stable81-17969Thomas Müller2015-08-121-1/+4
|\ \ | |/ |/|
| * [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
* | Merge pull request #18003 from owncloud/backport-17805-stable8.1Roeland Douma2015-07-312-2/+34
|\ \ | |/ |/|
| * [avatar] add error handlers for avatar setupMorris Jobke2015-07-312-2/+34
* | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
* | Merge pull request #17935 from owncloud/detect-old-openssl-versions-stable81Thomas Müller2015-07-292-2/+71
|\ \
| * | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-282-2/+71
* | | Add unit testsLukas Reschke2015-07-281-13/+25
* | | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/ /
* | Merge pull request #17883 from owncloud/backport-17882Thomas Müller2015-07-272-4/+4
|\ \
| * | Allow classes in <h2> tagsLukas Reschke2015-07-262-4/+4
| |/
* / assign error message to correct objectmichag862015-07-231-2/+2
|/
* make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-231-4/+4
* don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-172-3/+10
* only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-161-0/+2
* Handle returned null value in app level codeMorris Jobke2015-07-141-2/+2
* Fix global app list stateVincent Petry2015-07-022-2/+29
* Add missing version fieldLukas Reschke2015-06-291-2/+2
* Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-291-1/+1
|\
| * Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-291-1/+1
* | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-291-0/+18
|\ \ | |/ |/|
| * Also load enabled appsLukas Reschke2015-06-291-0/+9
| * Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2914-2/+94
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2812-0/+40
* | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-2715-8/+13
|\ \
| * | update license headers and authorsMorris Jobke2015-06-2515-8/+13
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2736-70/+14
* | | Merge pull request #17190 from owncloud/lock-changelabelThomas Müller2015-06-261-2/+2
|\ \ \
| * | | Rename experimental to transactional file lockingVincent Petry2015-06-261-2/+2
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-06-262-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2516-10/+52
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2460-76/+32
* | Accept this language change at your own riskJoas Schilling2015-06-231-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-234-4/+30
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-222-2/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-214-4/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-202-2/+20
|/
* Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-194-10/+61
|\