summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-084-24/+24
|
* Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-078-25/+64
|\ | | | | Sync master
| * Merge branch 'master' into sync-masterMorris Jobke2016-07-0786-630/+403
| |\
| * | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-0736-314/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4. Revert "[tx-robot] updated from transifex" This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e. Revert "[tx-robot] updated from transifex" This reverts commit e7cc8bac1e26935ed3bceb2b777659cc72cafdf2. Revert "[tx-robot] updated from transifex" This reverts commit 59fc3ff45a98e305ad65069d31fc78081fa88dc6. Revert "[tx-robot] updated from transifex" This reverts commit 6a89a63d2e5f6d807f6e99823b76f3cfea268c29. Revert "[tx-robot] updated from transifex" This reverts commit b0bad03234329113988d7d9c9cf2613d8f031c5f.
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0710-4/+192
| | |
| * | Set content type when downloading log file to force download in some ↵Vincent Petry2016-07-061-0/+1
| | | | | | | | | | | | browsers (#25382)
| * | [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 fallback
| | * | remove svg classesHendrik Leppelsack2016-07-016-15/+15
| | | |
| * | | Merge pull request #25253 from owncloud/users-fixotherquotadropdownVincent Petry2016-07-041-3/+15
| |\ \ \ | | | | | | | | | | Fix "Other" value handling in quota dropdown in users page
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Prevents "other" value to be deleted. When appending custom value, put it above the "other" entry.
| * | | | [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 token
| | * | | 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
| | | | | | | | | | | | Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly.
* | | 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
| |\ \ | | | | | | | | show which login name to use for the new app password
| | * | 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 token
| | * | | 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 support
| | * | | 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 code
| | * | | Use OC.Backbone instead of Backbone directly in authtoken JS codeVincent Petry2016-06-233-11/+11
| | |/ / | | | | | | | | | | | | Fixes asset pipeline issue with the auth token in personal page
| * | | [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
|\ \ \ \ | | | | | | | | | | [Master] upstream sync
| * | | | 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
| | |\ | | | | | | | | app passwords/device tokens wording
| | | * 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
| | | | | | | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side