summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #226 from nextcloud/master-upstream-syncLukas Reschke2016-06-26142-345/+484
|\
| * Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-26142-345/+484
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-264-0/+48
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-252-0/+10
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-2474-0/+156
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-23132-270/+166
| | * Merge pull request #25134 from owncloud/app-passwordsVincent Petry2016-06-224-36/+36
| | |\
| | | * use theme name instead of hard-coded 'ownCloud'Christoph Wurst2016-06-211-1/+1
| | | * fix tranlationsChristoph Wurst2016-06-211-3/+3
| | | * app passwords/device tokens wordingChristoph Wurst2016-06-214-36/+36
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-224-6/+20
| | |/
| | * redirect to new login route (#25099)Christoph Wurst2016-06-211-0/+11
| | * Merge pull request #25196 from owncloud/update-session-token-passwordChristoph Wurst2016-06-211-0/+1
| | |\
| | | * pass new password instead of usernameChristoph Wurst2016-06-211-1/+1
| | | * update session token password on user password changeChristoph Wurst2016-06-211-0/+1
| | * | Merge pull request #25042 from owncloud/session-settings-ellipsisVincent Petry2016-06-213-33/+36
| | |\ \ | | | |/ | | |/|
| | | * Fix tooltip position in token listVincent Petry2016-06-171-6/+4
| | | * rearrange personal settings sectionsChristoph Wurst2016-06-101-28/+28
| | | * add tooltip to token namesChristoph Wurst2016-06-101-1/+2
| | | * add overflow ellipsis to session and device tokens listChristoph Wurst2016-06-101-0/+4
* | | | select css changes in setting/adminVincent Chan2016-06-231-0/+9
|/ / /
* | | 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