github.com/playframework/playframework commits

Merge branch 'master' into non_empty_file

3ea4cefb05663d965fee6bb7ffd549e82f410b6a authored over 4 years ago

Merge pull request #10285 from jroper/csrf-invalid-content-type

29fdb3ed556cc3307b66c4e4d73db1a9226ee270 authored over 4 years ago

Merge pull request #10287 from scala-steward/update/okhttp-4.7.1

Update okhttp to 4.7.1

fcdd05c3ab75b2775aab49d0d91f77cf51bedf76 authored over 4 years ago

Merge pull request #10288 from scala-steward/update/hibernate-core-5.4.16.Final

Update hibernate-core to 5.4.16.Final

eb1e915efc7c9be5164bec3ab0fe6c52fcbe0928 authored over 4 years ago

Fixed CSRF handling for invalid content types

681d8ee3f785a6105b0595d8f10a8ee5718e6d7b authored over 4 years ago

Update hibernate-core to 5.4.16.Final

6e88caaa1231b0da653a826bbaf098839b3ffb39 authored over 4 years ago

Update okhttp to 4.7.1

d1cf5436e8c448ff192569b9ac44f81c84d66600 authored over 4 years ago

Merge pull request #10286 from scala-steward/update/caffeine-2.8.3

Update caffeine, jcache to 2.8.3

5e59c2133ca4fd45ca29e857078029ecb2d3d2f7 authored over 4 years ago

Update caffeine, jcache to 2.8.3

00f60c80ba7e6e87729ee12b552d5632be6f3329 authored over 4 years ago

Merge pull request #10284 from scala-steward/update/okhttp-4.7.0

Update okhttp to 4.7.0

fe2cbc27abf3c59d1cd52383385dd99b138630a9 authored over 4 years ago

Update okhttp to 4.7.0

d5c021b096871746ab6bc573010fc93bb5093dea authored over 4 years ago

Merge pull request #10283 from mkurz/merge-2.8.x

Merge branch '2.8.x' into master

584bf82e247835e9793cc822fff7bcb5f175c936 authored over 4 years ago

Merge pull request #10265 from mkurz/csp_rfc7807_tests

3811d60970f97fea5078d2434f66a100750639e9 authored over 4 years ago

Merge pull request #10282 from mkurz/caffeine_executor

470706f461bc82a7b3287b41161fedbbe2135588 authored over 4 years ago

Merge branch '2.8.x' into master

21fdca25d432f28ec7738fd60a1226af684c6d62 authored over 4 years ago

Caffeine's internal executor should use Play's default dispatcher

d40d295ce50c4b11eebcea762c07fb1b3c1af97a authored over 4 years ago

Merge pull request #10224 from mkurz/caffeine_executor

Config to set Caffeine's internal executor

7ccdac6703499336ed04be04d77f77d3d109b747 authored over 4 years ago

Better document caffeine executor(s)

71524b83887a13ae757a6a122dacf5854038b663 authored over 4 years ago

Title should contain status code description

213e00457e2a998a51b8bea980d94a4971c97400 authored over 4 years ago

Merge pull request #10280 from playframework/mergify/bp/2.8.x/pr-10260

Allow customization of error message when JSON error handler failed (bp #10260)

ecd2a32c0b05abfb75ebf9bad5f6fa1f293b1b73 authored over 4 years ago

Add return type

(cherry picked from commit 6b27156080fa0b5886f7389dca697fbea0140c29)

27777af91f49beacee8672699530e069658a85bc authored almost 5 years ago

fatalErrorJson

(cherry picked from commit a2d865e5a6453313acd2bf1c64d28088ed05ed54)

c171a7678df66c8f0ee6eac594573de07ceebc56 authored almost 5 years ago

Allow customization of error message when JSON error handler failed

(cherry picked from commit 0463cff8b7d803636e8967a3fa48c7447fa1122c)

7645e41ca2c035b02952ae88edec0b1c5cb1748b authored almost 5 years ago

Merge pull request #10260 from mkurz/fatalErrorMessage_json-error-handler

Allow customization of error message when JSON error handler failed

52b8be80c345c235c6f030c67d5e2a310ef57c12 authored almost 5 years ago

Merge pull request #10278 from playframework/mergify/bp/2.8.x/pr-10230

Make sure Play's temp folder is unique (bp #10230)

1240017af612ebb58d16796d709bb8eb23d29754 authored almost 5 years ago

Add CaffeineExecutionContext

f081a655ecc553f6a7c0aed9888830d7d5aad14a authored almost 5 years ago

Config to set Caffeine's internal executor

6b17ee94b44e6f342840e4cd6df1540f764ffa46 authored almost 5 years ago

Merge pull request #10277 from scala-steward/update/netty-transport-native-epoll-4.1.50.Final

Update netty-transport-native-epoll to 4.1.50.Final

89d7c75e6a46d32eb274703947bfdae3c7c78504 authored almost 5 years ago

Make sure Play's temp folder is unique

(cherry picked from commit bf616a067661663875632cd75a202744432059b7)

bfd0dd7eec51252ae04caba7bc65c0177d4c04da authored almost 5 years ago

Merge pull request #10230 from mkurz/tmp_folder_fix

Make sure Play's temp folder is unique

c1ca1fa2020a843f87fde65d4ea3897c9fb0b0f9 authored almost 5 years ago

Merge pull request #10228 from mkurz/result_attrs

8270a10faa9b94080f354710f2d6cb5ce380c133 authored almost 5 years ago

Update netty-transport-native-epoll to 4.1.50.Final

8aa7eefd0c268bb1aebc763dc02265fe62ddcfee authored almost 5 years ago

Add Result attributes

e77d9f732ab6254a184e9c997a4cb9810efeee7c authored almost 5 years ago

Merge pull request #10039 from mkurz/custom_evolutions_table_name

Support custom name of play_evolutions(_lock) table

79ef49e567c962ffff6bf4cded4a07dd473e797d authored almost 5 years ago

Merge pull request #10275 from mkurz/upgrades28

[2.8.x] Scala 2.13.2 / 2.12.11 & sbt 1.3.10

b80566cdbebf4f9d6000c460161211316cb516b9 authored almost 5 years ago

Make sure Play's temp folder is unique

bf616a067661663875632cd75a202744432059b7 authored almost 5 years ago

Support custom name of play_evolutions(_lock) table

acc4eef69328cbe1dae54bd3c56df6f3846c6fb3 authored almost 5 years ago

Merge pull request #10084 from wsargent/doc-note-ws-with-ahc

[doc] Add note to show using AHC client directly

1601f2c5907d39a95256350faef002a00ed173e1 authored almost 5 years ago

Scala 2.13.2 / 2.12.11 & sbt 1.3.10

7a3fd51b1b38d70680015f5394fd5a6089e23714 authored almost 5 years ago

Merge pull request #10274 from mkurz/jetty-alpn-agent-2.0.10_28

[2.8.x] jetty-alpn-agent 2.0.10, akka-http 10.1.12 and akka 2.6.5

ac72fa280f9eeec7e2567d0952be4ed867d544e6 authored almost 5 years ago

Merge pull request #10198 from bjaglin/defaultpoolname

5686af7100d054e414c268569060b0530923559d authored almost 5 years ago

Merge pull request #10217 from mkurz/upgrades

a920b372de26949affcc100ca7624231a75bb3e9 authored almost 5 years ago

Merge pull request #10272 from scala-steward/update/sbt-native-packager-1.7.2

Update sbt-native-packager to 1.7.2

4715857aaa02a7ce15fbe679b325d4baadf48c2d authored almost 5 years ago

Merge pull request #10267 from scala-steward/update/HikariCP-3.4.5

Update HikariCP to 3.4.5

e61f77f04e45489c4ec79bba99d5f8c057a62313 authored almost 5 years ago

fatalErrorJson

a2d865e5a6453313acd2bf1c64d28088ed05ed54 authored almost 5 years ago

Merge pull request #10268 from mkurz/jetty-alpn-agent-2.0.10

jetty-alpn-agent 2.0.10 and akka-http 10.1.12

af09a552c10bba712f52c09807a71f43018ecdf1 authored almost 5 years ago

Compatibility

e949eb195a17e02e2a412c4468c8e1fb0cd89aba authored almost 5 years ago

Refactor IdleTimeoutSpec

c2680764769eaae28ab0d74bfa1227b6a358cb04 authored almost 5 years ago

akka-http 10.1.12

951e23de305ec1c1e3f0332050b2e9088b6d0877 authored almost 5 years ago

jetty-alpn-agent 2.0.10

04c6167111a41f10214d5cac48393bd52b576573 authored almost 5 years ago

Refactor IdleTimeoutSpec

398df223ee18a40d09fa7d02de22638dd603878f authored almost 5 years ago

akka-http 10.1.12

0ff7237ae8357a4ae998628213370a1a41755d79 authored almost 5 years ago

Update sbt-native-packager to 1.7.2

15e662e870fe6478cd10a3bc406150b2f91db795 authored almost 5 years ago

Add return type

6b27156080fa0b5886f7389dca697fbea0140c29 authored almost 5 years ago

Option[JsObject], private method, deprecation without replacement

a28ca4fbe5b23a368b64a9fb1e063a7bd1d3570b authored almost 5 years ago

jetty-alpn-agent 2.0.10

7159f7754dfa8f21301d38e853a1361f7d2d94fd authored almost 5 years ago

Update HikariCP to 3.4.5

c6ac57c3221325e61dd0d80c411dfb03b6495e51 authored almost 5 years ago

Tests for CSP errors, which should be in RFC 7807 format

cede3e6c36384488ad879bce4ec4e65827a03908 authored almost 5 years ago

Merge pull request #10263 from fusuiyi123/scripted-test-akka-version

Save akka and akka-http version after publish-local

6bac5dadfd1879600074de868b7c1432ea96a812 authored almost 5 years ago

Save akka and akka-http version after publish-local

Issue: #10215

afebf62d3c3abec5957320809f1a581a18757d72 authored almost 5 years ago

Merge pull request #10262 from scala-steward/update/salvation-2.7.2

Update salvation to 2.7.2

3bdd11ac595d07faf6604042485c1beebf305f92 authored almost 5 years ago

Update salvation to 2.7.2

39efd2ed8ce851c46495693c3db2b30b6e508c6b authored almost 5 years ago

Merge pull request #10261 from scala-steward/update/hibernate-validator-6.1.5.Final

Update hibernate-validator to 6.1.5.Final

363a51453bd2c1c3942f7d82cbc407ec6f9e832c authored almost 5 years ago

Update hibernate-validator to 6.1.5.Final

ff3b6ffbf8fa0205fd415d1304b68a951ab80edb authored almost 5 years ago

Allow customization of error message when JSON error handler failed

0463cff8b7d803636e8967a3fa48c7447fa1122c authored almost 5 years ago

Merge pull request #10258 from scala-steward/update/jquery-3.5.1

Update jquery to 3.5.1

0284dee2b90173eb40ba62503496f6376f55b9b7 authored almost 5 years ago

Merge pull request #10251 from softdevca/master

Method name was outdated in documentation

1edfaa70168abfc4ac2d9654c80fd25ffe133ac3 authored almost 5 years ago

Merge pull request #10252 from scala-steward/update/jackson-core-2.10.4

Update jackson-annotations, jackson-core, ... to 2.10.4

806ab248168b6f49d3fc2a7d6cf49105999472f5 authored almost 5 years ago

Merge pull request #10254 from scala-steward/update/hibernate-core-5.4.15.Final

Update hibernate-core to 5.4.15.Final

768182e5b0f8ddb64bbdd618d0c351ae0e26d6ba authored almost 5 years ago

Merge pull request #10255 from scala-steward/update/htmlunit-driver-2.40.0

Update htmlunit-driver to 2.40.0

a45a3f7dfb92ea46c0966ebe21f47eccb795540a authored almost 5 years ago

Merge pull request #10256 from scala-steward/update/sbt-native-packager-1.7.1

Update sbt-native-packager to 1.7.1

3cf579590581c48b33847af0b285e5e7f3791f4d authored almost 5 years ago

Update jquery to 3.5.1

0f1264989f221972f98b04f608c9bec5a45ce160 authored almost 5 years ago

Merge branch 'master' into non_empty_file

7c83e0d97c98a6942d6870204d517693abcda084 authored almost 5 years ago

Update sbt-native-packager to 1.7.1

0284690d6d5b31b6a271552495fe5cec64495db4 authored almost 5 years ago

Update htmlunit-driver to 2.40.0

9d06fc7472261f235351704d86358edcf4ac5d36 authored almost 5 years ago

Update hibernate-core to 5.4.15.Final

3b6ebc64f0ae822d0bfd06701acf209a40a803d4 authored almost 5 years ago

Update jackson-annotations, jackson-core, ... to 2.10.4

87f8bc1fcd0112d4526029865d1b80b83f482722 authored almost 5 years ago

Method name was outdated in documentation

302baf7662a0bd6668d8bd2b5405efc5d532550e authored almost 5 years ago

Merge pull request #10249 from scala-steward/update/akka-actor-2.6.5

Update akka-actor, ... to 2.6.5

a1ccdd032a14dcb1574562a73f10936ac848c054 authored almost 5 years ago

Update akka-actor, ... to 2.6.5

7225eef4f0e8e63615e5ca30f81cef08de22950d authored almost 5 years ago

Merge pull request #10248 from joegichuru/patch-2

Update JavaResponse.md

241527a130e5181c72cc63e04114b25b7dda6f38 authored almost 5 years ago

Merge pull request #10247 from joegichuru/patch-1

Update ScalaResults.md

919e3bb4650221e27a70d75cb30e374a1054df7d authored almost 5 years ago

Update JavaResponse.md

fixed a typo from "delivery" to "deliver" on line 64

f008bbd1788c0d0e47a4e8ecce138d78c9c4b757 authored almost 5 years ago

Update ScalaResults.md

fixed a typo from "delivery" to "deliver" on line 74

6e9b8b14b1ee15183b2c441ab4b6430f92b928ca authored almost 5 years ago

Merge pull request #10245 from scala-steward/update/okhttp-4.6.0

Update okhttp to 4.6.0

d933345f2080d4daf309ae73de8127422949a567 authored almost 5 years ago

Update okhttp to 4.6.0

154ee747427e20208ae329526cc9f0e4be70ab23 authored almost 5 years ago

Merge pull request #10243 from playframework/mergify/bp/2.8.x/pr-10226

Add CustomExecutionContext.current() (bp #10226)

80a1537be21990d09e3a87aa4267565623c1c637 authored almost 5 years ago

Add CustomExecutionContext.current()

(cherry picked from commit 6e1876dd8a697cd53836cf456963306c87ee6c03)

2c84b71a5582a8321948864c861a485f7ca0bf28 authored almost 5 years ago

Merge pull request #10241 from scala-steward/update/spring-core-5.2.6.RELEASE

Update spring-beans, spring-context, ... to 5.2.6.RELEASE

a991302cd0fa3a7ad618163051a66cd5674b44dd authored almost 5 years ago

Update spring-beans, spring-context, ... to 5.2.6.RELEASE

51cd4e4c135c9c1f3ea91788e791878668e4e2c8 authored almost 5 years ago

Merge pull request #10223 from mkurz/rm_outdated

Remove outdated code and comments

482717728518ce680c97ef1d44e22bea45e22dc4 authored almost 5 years ago

Merge pull request #10226 from mkurz/ce_current

Add CustomExecutionContext.current()

27edeef8143e6a3a356b3ded0911ce340482cb9c authored almost 5 years ago

Allow file uploads with empty body or empty filenames

418b734368e6b4fe776a0735e42f7e197580070c authored almost 5 years ago

Merge pull request #10234 from scala-steward/update/caffeine-2.8.2

Update caffeine, jcache to 2.8.2

4e12c259fc9910de0ff25d3cef7a4c6ca7a4482b authored almost 5 years ago

Merge pull request #10235 from scala-steward/update/specs2-core-4.9.4

Update specs2-core, specs2-junit, ... to 4.9.4

b44eed71d106f9d856b6c4f97a87e58212498d51 authored almost 5 years ago

Merge pull request #10233 from renatocaval/remove-auto-merge-for-scala-steward

2350b3f7539934d560ffc99586d0be783aec6445 authored almost 5 years ago

Update specs2-core, specs2-junit, ... to 4.9.4

3229c4869387f8370f3ca9f21e6f949017714308 authored almost 5 years ago

Update caffeine, jcache to 2.8.2

5a11d019d98c560134d1c89cc6097299ed6d5622 authored almost 5 years ago

Remove auto-merge for scala-steward PRs

56161d1ffcabeec379335229cb3ac26e228f6c01 authored almost 5 years ago

Merge pull request #10213 from playframework/mergify/bp/2.8.x/pr-9927

Fetch dynver-versioned latest snapshot version (bp #9927)

a7339f98f37cd274bdfcb3cd5b02ab7659199be5 authored almost 5 years ago

Ecosyste.ms: OpenCollective

github.com/playframework/playframework