summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-1266-66/+2
* Merge pull request #347 from nextcloud/drop-windows-fooLukas Reschke2016-07-112-12/+0
|\
| * Remove unneeded checks if it runs on a Windows machineMorris Jobke2016-07-082-12/+0
* | [tx-robot] updated from transifexNextcloud bot2016-07-112-0/+2
* | [tx-robot] updated from transifexNextcloud bot2016-07-102-0/+2
* | [tx-robot] updated from transifexNextcloud bot2016-07-098-2/+10
|/
* [tx-robot] updated from transifexNextcloud bot2016-07-084-24/+24
* Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-078-25/+64
|\
| * Merge branch 'master' into sync-masterMorris Jobke2016-07-0786-630/+403
| |\
| * | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-0736-314/+20
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0710-4/+192
| * | Set content type when downloading log file to force download in some browsers...Vincent Petry2016-07-061-0/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0616-2/+20
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-056-6/+28
| * | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-046-15/+15
| |\ \
| | * | remove svg classesHendrik Leppelsack2016-07-016-15/+15
| * | | Merge pull request #25253 from owncloud/users-fixotherquotadropdownVincent Petry2016-07-041-3/+15
| |\ \ \
| | * | | Prevent negative or non-number values in quota inputVincent Petry2016-06-241-0/+6
| | * | | Fix "Other" value handling in quota dropdown in users pageVincent Petry2016-06-231-3/+9
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-046-6/+56
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-034-2/+16
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-022-0/+2
| | |/ / | |/| |
| * | | Merge pull request #25276 from owncloud/delete-own-session-tokenVincent Petry2016-07-012-7/+34
| |\ \ \
| | * | | prevent users from deleting their own session tokenChristoph Wurst2016-06-282-7/+34
* | | | | [tx-robot] updated from transifexNextcloud bot2016-07-074-36/+86
| |_|_|/ |/| | |
* | | | [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