summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #6189 from nextcloud/circle-tokenMorris Jobke2017-08-261-0/+9
|\ \ \ \ \ \
| * | | | | | link to getShareByTokenMaxence Lange2017-08-201-0/+9
* | | | | | | Merge pull request #6182 from nextcloud/fixes-in-files-drop-jsRoeland Jago Douma2017-08-261-16/+14
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Do not iterate over the filesDaniel Calviño Sánchez2017-08-181-5/+4
| * | | | | | Replace fileName variable with data.files[0].nameDaniel Calviño Sánchez2017-08-181-8/+6
| * | | | | | Update the whole file item instead of only its contentsDaniel Calviño Sánchez2017-08-181-7/+8
| * | | | | | Remove "errorThrown" parameterDaniel Calviño Sánchez2017-08-181-1/+1
* | | | | | | Merge pull request #6250 from nextcloud/twofactor/provider-custom-cspRoeland Jago Douma2017-08-264-1/+47
|\ \ \ \ \ \ \
| * | | | | | | Bump autoloaderRoeland Jago Douma2017-08-262-0/+2
| * | | | | | | Allow 2FA providers to specify their custom CSPChristoph Wurst2017-08-262-1/+45
|/ / / / / / /
* | | | | | | Merge pull request #6252 from nextcloud/only_show1_errorMorris Jobke2017-08-263-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Don't try the actual file upload if the checks already error outRoeland Jago Douma2017-08-263-0/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6157 from nextcloud/smb-2.0.2Morris Jobke2017-08-2613-52/+265
|\ \ \ \ \ \ \
| * | | | | | | update icewind/smb to 2.0.2Robin Appelman2017-08-1613-52/+265
* | | | | | | | Merge pull request #6262 from nextcloud/navigation-entries-sortMorris Jobke2017-08-262-6/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix sorting of entries in Files sidebarJan-Christoph Borchardt2017-08-252-6/+6
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-266-4/+12
* | | | | | | | Merge pull request #6260 from nextcloud/popover-border-radiusRoeland Jago Douma2017-08-251-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add standard border-radius to datepickerJan-Christoph Borchardt2017-08-251-0/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #6261 from nextcloud/fix-favorites-permanentRoeland Jago Douma2017-08-251-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix permanent display of favorite iconJan-Christoph Borchardt2017-08-251-0/+6
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-2560-108/+414
* | | | | | | Merge pull request #6244 from nextcloud/redis_clusterMorris Jobke2017-08-251-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Use a new phpredisRoeland Jago Douma2017-08-241-1/+1
| * | | | | | | Give redis a change to fireupRoeland Jago Douma2017-08-231-0/+1
* | | | | | | | Merge pull request #6249 from nextcloud/ignore-vscodeRoeland Jago Douma2017-08-241-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Visual Studio Code to .gitignoreJakob Sack2017-08-241-0/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #6251 from nextcloud/get_right_translationRoeland Jago Douma2017-08-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't fetch the translation from core but from filesRoeland Jago Douma2017-08-241-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-247-28/+229
|\ \ \ \ \ \ \ \
| * | | | | | | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| * | | | | | | | Bump versionRoeland Jago Douma2017-08-101-1/+1
| * | | | | | | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-104-8/+122
| * | | | | | | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-103-23/+108
* | | | | | | | | Merge pull request #6241 from nextcloud/integration_ramMorris Jobke2017-08-241-25/+25
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | [drone] Install intergration tests in RAMRoeland Jago Douma2017-08-241-25/+25
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-24100-364/+562
* | | | | | | | | Merge pull request #6239 from nextcloud/fix-uploading-messageRoeland Jago Douma2017-08-232-3/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Replace ... with …Morris Jobke2017-08-232-4/+4
| * | | | | | | | Show "Uploading..." in web UI for long uploadsMorris Jobke2017-08-231-0/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failedRoeland Jago Douma2017-08-233-3/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent SQL error message in case of errorLukas Reschke2017-08-173-3/+29
* | | | | | | | | Merge pull request #6165 from nextcloud/bump-dompurifyMorris Jobke2017-08-233-10/+12
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Bump merged JSLukas Reschke2017-08-171-2/+3
| * | | | | | | | Bump DOMPurify to 1.0.0Lukas Reschke2017-08-172-8/+9
* | | | | | | | | Merge pull request #6236 from nextcloud/drone-ci-imagesMorris Jobke2017-08-231-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix phan testMorris Jobke2017-08-231-1/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6229 from nextcloud/drone-ci-imagesMorris Jobke2017-08-231-71/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use docker images without XDebug and with OpcacheMorris Jobke2017-08-231-71/+76
* | | | | | | | | | Merge pull request #6218 from nextcloud/sabre-xml-fixMorris Jobke2017-08-231-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |