summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-172-3/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-172-38/+38
* Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-161-0/+2
|\
| * only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-081-0/+2
* | Handle returned null value in app level codeMorris Jobke2015-07-131-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-114-2/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-102-16/+16
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-092-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-082-4/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-072-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-054-0/+28
* Remove OC_AppconfigThomas Müller2015-07-031-1/+1
* Remove OC_LogThomas Müller2015-07-031-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-036-2/+38
* Unit test for app listVincent Petry2015-07-021-0/+26
* Fix global app list stateVincent Petry2015-07-021-2/+3
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-0210-8/+100
* 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
|\
| * Do not return backends but add a method to check for oneJoas Schilling2015-06-161-6/+4
| * Only sort by group name when LDAP is involvedJoas Schilling2015-06-164-10/+49
| * Always keep "Everyone" and "admin" at the top of the listJoas Schilling2015-06-161-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1812-24/+94
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1718-18/+18
* | Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-...Lukas Reschke2015-06-163-13/+31
|\ \ | |/ |/|
| * Make "include update info" part of the cache keyJoas Schilling2015-06-151-3/+5
| * Load the update information asyncroniously to fix the page load speedJoas Schilling2015-06-103-10/+26
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-152-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-144-68/+750
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-134-6/+166