summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2122-2/+110
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-212-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-0/+36
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-172-0/+26
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-162-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-152-0/+12
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-1412-2/+32
* | Merge pull request #122 from nextcloud/readd-labels-for-usabilityMorris Jobke2016-06-201-0/+2
|\ \
| * | Re-add labels for password inputs for usabilityMorris Jobke2016-06-161-0/+2
* | | fix more stringsMorris Jobke2016-06-205-11/+11
* | | fix translationsMorris Jobke2016-06-2060-60/+60
* | | rename owncloud to nextcloud in Official apps button popupTimo Witte2016-06-201-1/+1
* | | Use blue as approved color in app managementMorris Jobke2016-06-161-1/+1
|/ /
* | Merge pull request #112 from nextcloud/drop-useless-ie8-stuffblizzz2016-06-152-14/+0
|\ \
| * | Drop useless IE8 rulesMorris Jobke2016-06-152-14/+0
* | | fix strengthify in personal settingsMorris Jobke2016-06-153-4/+4
|/ /
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-1436-0/+42
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-1336-0/+42
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-113-0/+18
|\|
| * Add developer documentation, website and bug to the applist (#25041)Joas Schilling2016-06-101-0/+14
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-102-0/+4
* | Add user ID to log entries in admin pageLukas Reschke2016-06-102-0/+6
* | Downstream 2016-06-09Arthur Schiwon2016-06-096-1/+143
|\|
| * Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-091-0/+4
| |\
| | * Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-071-0/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-094-0/+138
| * | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-071-1/+1
| |/
* | Revert "Downstream 2016-06-08"blizzz2016-06-091-1/+1
* | decrease initial users to load to 50Jörn Friedrich Dreyer2016-06-091-1/+1
* | THIS IS NEXTCLOUD! adjusting the designJan-Christoph Borchardt2016-06-088-8/+8
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-062-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-052-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-044-8/+24
* Merge pull request #24954 from owncloud/issue-24536-language-name-reused-for-...Vincent Petry2016-06-031-2/+3
|\
| * Do not use the language name, when it's not the one from the language we wantJoas Schilling2016-06-011-2/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-0220-2/+48
|/
* Merge pull request #24912 from owncloud/session-tokens-apache-authVincent Petry2016-06-011-1/+6
|\
| * Create session tokens for apache auth usersChristoph Wurst2016-05-311-1/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-0128-28/+0
* | Update personal.php (#24923)MTRichards2016-05-311-1/+1
|/
* Merge pull request #24889 from owncloud/add-warning-wrong-transaction-isolati...Vincent Petry2016-05-312-0/+22
|\
| * Add a warning when the transaction isolation level is not READ_COMMITEDJoas Schilling2016-05-302-0/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-312-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-292-0/+12
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-282-0/+22
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-2714-4/+98
* Update license headersLukas Reschke2016-05-2627-44/+52
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-2612-78/+212
* Move Group_LDAP and Group_Proxy to PSR-4Joas Schilling2016-05-251-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-25146-0/+208