summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-0666-582/+322
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-01124-136/+608
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2016-07-012-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-302-0/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-2920-0/+66
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-28124-136/+538
* | Set content-type to "application/octet-stream"Lukas Reschke2016-06-301-1/+2
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-278-21/+45
|\|
| * Merge pull request #25261 from owncloud/app-password-login-nameVincent Petry2016-06-274-2/+28
| |\
| | * fix layoutChristoph Wurst2016-06-243-6/+24
| | * show which login name to use for the new app passwordChristoph Wurst2016-06-243-0/+8
| * | Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnectMorris Jobke2016-06-271-0/+2
| |\ \
| | * | Remove tooltip when disconnecting tokenVincent Petry2016-06-231-0/+2
| * | | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-272-22/+2
| |\ \ \
| | * | | remove ie8+9 supportHendrik Leppelsack2016-06-232-22/+2
| | |/ /
| * | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefixVincent Petry2016-06-273-11/+11
| |\ \ \
| | * | | Use OC.Backbone instead of Backbone directly in authtoken JS codeVincent Petry2016-06-233-11/+11
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-272-0/+4
* | | | verify user password on changeBjoern Schiessle2016-06-273-23/+41
* | | | 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