github.com/playframework/play-samples commits

Merge branch '2.6.x' into 2.7.x

Update 2.6.x references to 2.7.x (fastmod '2\.6\.x' '2.7.x')

* 2.6.x:
Fix shields & other links

f41c7746d2f5c1a866461b8a5a66227af1e94f68 authored over 5 years ago

adds mergify config

ccc9213974e953386b40355acba203f27b6989d9 authored over 5 years ago

[2.6] Fix shields & other links (#21)

[2.6] Fix shields & other links

e43e8b704e44e5acb299365668ebd6cc49070f2b authored over 5 years ago

Fix shields & other links

4c2fa1093760def1ad5768d23816eaf49e8f5549 authored over 5 years ago

Merge branch '2.7.x' into 2.8.x

* 2.7.x: (252 commits)
Updated with template-control on 2019-05-02T14:42:59.243Z **/plugins....

26544325e97aa85ddf3e7a27eb92c0d5419b67a2 authored over 5 years ago

Merge branch '2.6.x' into 2.7.x

* 2.6.x: (252 commits)
Updated with template-control on 2019-05-02T14:42:59.243Z **/plugins....

233b8caee7d5015c5c33280274a9b8c39a686276 authored over 5 years ago

Use 2.8.0-M1 (#16)

Use 2.8.0-M1

3df2de94f89e84e99bffcedd91ac6bb786f35cfa authored over 5 years ago

fix deprecation warning

cdb8ca7c6fff3c4a180a320fb9a7a06dd1187623 authored over 5 years ago

Replaced deprecated API

63b53effe11fe9b6d2bf5a0e39fb10b36b853aec authored over 5 years ago

Fix compilation issues on java-file-upload

5180e43fcb51d5d3063505084d4a5faf4e943477 authored over 5 years ago

Use 2.8.0-M1

7e8606ab7bd1f0c13c8679e246f34717c2d42597 authored over 5 years ago

[2.8] Fix play-scala-tls-example on Java 11 (#19)

[2.8] Fix play-scala-tls-example on Java 11

f09dff85a5afd0930a8a043905f5dfba4f3369ab authored over 5 years ago

Try new play-ws when running play-scala-tls-example on Java 11

18179f80394da5c75ea1b00a858c2470b16221e6 authored over 5 years ago

Merge pull request #18 from ignasi35/fix-scala-tls-sample

Enable tests on scala-tls-example (java 8)

ec17d6299b2785d018704be9164088818e542c6c authored over 5 years ago

Use -J-javaagent

-javaagent is a JVM option, the -J prefix is used so it is processed as such.

5500c9ccbc899de496b76becc76d8dd99c6d8132 authored over 5 years ago

Makes test portable (doesn't depend on /etc/hosts hacks)

ecf5363fe6cf878635c2e3982e32e5798dc7af17 authored over 5 years ago

Fix test script

0a40b65e9c2dad33122f170735fbcffcd1b0ba01 authored over 5 years ago

Increase timeout (default is too agressive)

670b1025c33ab6a313792bcb51f3f47d6765d26c authored over 5 years ago

Redo certificates (old ones had expired)

e6a3203da09763ec47b487ff9610670abdd72eb7 authored over 5 years ago

Don't run tests in a forked JVM

40736cc1f5be9642d56290cc19359e6e0f78d193 authored over 5 years ago

Format scalaVersion intentation (#15)

05a73aaba3cc404677ca4fa67a9d1d4ec6a83621 authored over 5 years ago

Merge pull request #14 from marcospereira/templatecontrol-2.7.x

Upgrade branch 2.7.x using TemplateControl

c611527a4e0d6731b0031d9a85dc437660238025 authored over 5 years ago

Updated with template-control on 2019-05-08T02:30:30.065Z

/.github/settings.yml:
wrote /.github/settings.yml
**build.sbt:
libraryDependencies +...

1d4da7d7cc4601623ffaecd398dbaa6a2add93fa authored over 5 years ago

Mergify merges instead of squash

0a361351c409d68774e49b49f96126aec9348890 authored over 5 years ago

Upgrade branch 2.6.x using TemplateControl (#13)

Upgrade branch 2.6.x using TemplateControl

e918cdf5a6670ba947d585d8628a5256f0667bf6 authored over 5 years ago

Updated with template-control on 2019-05-02T14:42:59.243Z

**/plugins.sbt:
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
**/plugins.sb...

45493b505ed31bcc21450eb182506ca98a46e27c authored over 5 years ago

Merge pull request #11 from marcospereira/play-2.7.2

Play 2.7.2

19831c902a2a64c384410a11b1aa3bd4ccba28f8 authored over 5 years ago

Play 2.7.2

84fc5c6fb92ebf6584d603ab98945255a3b31f56 authored over 5 years ago

Merge pull request #10 from marcospereira/fix-java11-script

Remove wrong parameter when running tests with Java 9+

b9e40eb87259fbbf04d647c094cc72711174bec5 authored almost 6 years ago

Add LICENSE on 2.6.x branch

dfa50df7dc66453392be0e04368c48a06640acf3 authored almost 6 years ago

Fix play-scala-tls-example script

41bc19f74e621cbb3b2619444847ff69f09a32d1 authored almost 6 years ago

Fix play-java-ebean-example

a63a47cf4c7dd1fa1b69b58ce3126705a87c1177 authored almost 6 years ago

Fix play-java-api-rest-example

27c5eab8dedd85667f8e9aa6a561b679157bc609 authored almost 6 years ago

grpc samples are good with Play 2.7.1

:tada:

695c1fa58286b6aba492a54da8eb584753f24a28 authored almost 6 years ago

Remove wrong parameter when running tests with Java 9+

6299ba5e84129d25bde59e6d478f0e6d343229fe authored almost 6 years ago

Removing passing examples from allow_failures

2152167c5774384ff271568a53f720e979370048 authored almost 6 years ago

Merge pull request #9 from marcospereira/play-2.7.1

Play 2.7.1

f78b33c2dc8ce1f11cf95a8ab4935f22fadcc7e2 authored almost 6 years ago

Fix grpc samples

3251b5c96b6faf9bebaa01f128080e72e5ba8136 authored almost 6 years ago

Fix play-scala-secure-session-example tests

f3294dbc6fad315d8df1b5b57536abbf8593c114 authored almost 6 years ago

Scala 2.12.8

9368d2de684c2aaa7afe9943793b02f714e3b7a3 authored almost 6 years ago

Use Akka 2.5.22 consistently

88cf1a7bde161374087c9b17bcde7ed745244296 authored almost 6 years ago

play-grpc 0.7.0 and akka-grpc 0.6.1

ebc18314fe84c50e6f554f50e63612b3ce453e5d authored almost 6 years ago

scalatests+play 4.0.2

fdc3ee7d8d070def76bf1f9d5fde1c1f6816ece4 authored almost 6 years ago

Play 2.7.1

dc0bf1104c75be702b7454aaca00fc221de2ac3d authored almost 6 years ago

Finish removing Gradle from the 2.7.x branch (#7)

Finish removing Gradle from the 2.7.x branch

4fd467c6f9e598799f5f5692228cc18b7dce4530 authored almost 6 years ago

Finish removing Gradle from the 2.7.x branch

7f688210d5dbdde8d65e8aa2410df708d3174dd2 authored almost 6 years ago

Switch to JVM_OPTS, from _JAVA_OPTIONS (#4)

Switch to JVM_OPTS, from _JAVA_OPTIONS

835371f1d138f801f4c5858e747c13808c5e9caf authored almost 6 years ago

Merge pull request #5 from dwijnand/remove-test-gradle

Remove test-gradle, for now

e99d4bbda5e86920ab1d6c6c1c5c5a212949153a authored almost 6 years ago

Merge pull request #2 from dwijnand/fix-2.6.x.branch

Fix 2.6.x branch

6732ab1af24f5937faa9fdfb2babffac0a15c46b authored almost 6 years ago

Remove test-gradle, for now

4f80663f9db9323bbedd9765c65ead7f684330e4 authored almost 6 years ago

Switch to JVM_OPTS, from _JAVA_OPTIONS

I think that by switching some of the builds from "language: java" to
"language: scala" they're ...

dfbcceaf506444388393e2d3186cef7a89671ca2 authored almost 6 years ago

Merge pull request #3 from dwijnand/switch-to-merge-commits

Switch to merge commits

8219e68a8ab86b7109f691dbd56caa108a789df8 authored almost 6 years ago

Switch to merge commits

[ci skip]

77088ee772f4eeb1e838cf5bdad99203a21cce40 authored almost 6 years ago

Add a license section (#1)

Add a license section

5839b36583a3a4657c4be1120fa5697a63ccb765 authored almost 6 years ago

Drop Java 11 in the 2.6.x samples

Only 2 samples are passing on Java 11: play-scala-secure-session-example
and play-scala-starter-...

1e0410a6a48b84daeaa26c6e749661b857356514 authored almost 6 years ago

Add a license section

c802f85c4e8a2efd9ba30fd51bcc8acebaa00442 authored almost 6 years ago

One .travis.yml to rule them all

(cherry picked from commit 79639f2914254ad65a604e1ff388ca4641e33922)

371c8478ac4501175927b3873d6a0f6cba21d4ae authored almost 6 years ago

Add a top-level LICENSE/NOTICE to be sure, to be sure

(cherry picked from commit 91497c38abf65cd26c151ab071f89c6b6935bad9)

9517bed263c3d6325405a693949e50c2fa780b93 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-starter-example/2.6.x' into 2.6.x

* play-scala-starter-example/2.6.x: (68 commits)
Nest play-scala-starter-example
Updated wit...

62fd6cb0051883bf1fc6bce270c847aa4fa03fa4 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-websocket-example/2.6.x' into 2.6.x

* play-scala-websocket-example/2.6.x: (117 commits)
Nest play-scala-websocket-example
Update...

bc03de6f10dcd3e17131326706562d43ba2e7259 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-streaming-example/2.6.x' into 2.6.x

* play-scala-streaming-example/2.6.x: (52 commits)
Nest play-scala-streaming-example
Updated...

bbc60d4391a9cc868839c9fda2c5551d09f45347 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-slick-example/2.6.x' into 2.6.x

* play-scala-slick-example/2.6.x: (55 commits)
Nest play-scala-slick-example
Updated with te...

0a2f46a8eb963f9bb1d2dd049935495fbd40dbc1 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-tls-example/2.6.x' into 2.6.x

* play-scala-tls-example/2.6.x: (53 commits)
Nest play-scala-tls-example
Updated with templa...

69725ea366c5950fdcfd7e0b078200b39432333e authored almost 6 years ago

Merge remote-tracking branch 'play-scala-rest-api-example/2.6.x' into 2.6.x

* play-scala-rest-api-example/2.6.x: (73 commits)
Nest play-scala-rest-api-example
Updated w...

a2746150f2699e6a71a7133ab4ec289a0ffe042f authored almost 6 years ago

Merge remote-tracking branch 'play-scala-macwire-di-example/2.6.x' into 2.6.x

* play-scala-macwire-di-example/2.6.x: (65 commits)
Nest play-scala-macwire-di-example
Updat...

47be391cc2290c0e802ad176d91e7a8971770d4b authored almost 6 years ago

Merge remote-tracking branch 'play-scala-secure-session-example/2.6.x' into 2.6.x

* play-scala-secure-session-example/2.6.x: (70 commits)
Nest play-scala-secure-session-example...

fff317a220b25e8dcaa9850b69415a68b5c83836 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-log4j2-example/2.6.x' into 2.6.x

* play-scala-log4j2-example/2.6.x: (36 commits)
Nest play-scala-log4j2-example
Updated with ...

3adb9462aa62485c9ad6f4b5d0981a2268d83dfc authored almost 6 years ago

Merge remote-tracking branch 'play-scala-forms-example/2.6.x' into 2.6.x

* play-scala-forms-example/2.6.x: (43 commits)
Nest play-scala-forms-example
Updated with te...

68faf34c64b11457a8a062f38333558a5556472c authored almost 6 years ago

Merge remote-tracking branch 'play-scala-isolated-slick-example/2.6.x' into 2.6.x

* play-scala-isolated-slick-example/2.6.x: (53 commits)
Nest play-scala-isolated-slick-example...

5905ae3a5d1e7d09e9f7d9151a8e6727dae35525 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-hello-world-tutorial/2.6.x' into 2.6.x

* play-scala-hello-world-tutorial/2.6.x:
Nest play-scala-hello-world-tutorial
Updated with t...

c3f67de537c322d155a1c3f357d687fd4b8214fe authored almost 6 years ago

Merge remote-tracking branch 'play-scala-fileupload-example/2.6.x' into 2.6.x

* play-scala-fileupload-example/2.6.x: (50 commits)
Nest play-scala-fileupload-example
Updat...

219ca420e29f2f7d706f001ffb56b7a5b1685456 authored almost 6 years ago

Merge remote-tracking branch 'play-java-websocket-example/2.6.x' into 2.6.x

* play-java-websocket-example/2.6.x: (83 commits)
Nest play-java-websocket-example
Updated w...

3a42d9c3430c8d54727c3f5f541765423d3ebcc9 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-anorm-example/2.6.x' into 2.6.x

* play-scala-anorm-example/2.6.x: (68 commits)
Nest play-scala-anorm-example
Updated with te...

18b40b72269645f32387ee9da130a490f7f386a3 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-chatroom-example/2.6.x' into 2.6.x

* play-scala-chatroom-example/2.6.x: (52 commits)
Nest play-scala-chatroom-example
Updated w...

e6bfc46ee94b1db9a714df2818e865297f9f5024 authored almost 6 years ago

Merge remote-tracking branch 'play-java-streaming-example/2.6.x' into 2.6.x

* play-java-streaming-example/2.6.x: (45 commits)
Nest play-java-streaming-example
Updated w...

9f3262731e0d7e1a4ec127cc9557a8e573ce7685 authored almost 6 years ago

Merge remote-tracking branch 'play-scala-compile-di-example/2.6.x' into 2.6.x

* play-scala-compile-di-example/2.6.x: (66 commits)
Nest play-scala-compile-di-example
Updat...

8903bb9d6b436bd0d764115b541a5151ec169927 authored almost 6 years ago

Merge remote-tracking branch 'play-java-rest-api-example/2.6.x' into 2.6.x

* play-java-rest-api-example/2.6.x: (61 commits)
Nest play-java-rest-api-example
Updated wit...

90cb77770d6f228e253b799558d5e49fb1f507fb authored almost 6 years ago

Merge remote-tracking branch 'play-java-jpa-example/2.6.x' into 2.6.x

* play-java-jpa-example/2.6.x: (48 commits)
Nest play-java-jpa-example
Updated with template...

3d9fb369e2a2071766f07e3cbe05b079200f3d93 authored almost 6 years ago

Merge remote-tracking branch 'play-java-hello-world-tutorial/2.6.x' into 2.6.x

* play-java-hello-world-tutorial/2.6.x: (25 commits)
Nest play-java-hello-world-tutorial
Upd...

7b21cb4fb1430b8f0095437f57fc27fffcdbeb4a authored almost 6 years ago

Merge remote-tracking branch 'play-java-starter-example/2.6.x' into 2.6.x

* play-java-starter-example/2.6.x: (57 commits)
Nest play-java-starter-example
Updated with ...

28a452db01163344bd20743808b18b409c2478c8 authored almost 6 years ago

Merge remote-tracking branch 'play-java-forms-example/2.6.x' into 2.6.x

* play-java-forms-example/2.6.x: (40 commits)
Nest play-java-forms-example
Updated with temp...

b9baa5ef4ca29f0948bd2dffc5f98f433cb8e812 authored almost 6 years ago

Merge remote-tracking branch 'play-java-ebean-example/2.6.x' into 2.6.x

* play-java-ebean-example/2.6.x: (52 commits)
Nest play-java-ebean-example
Updated with temp...

ff17d4fda812a83125c335a1aa01fc72fd4fc21f authored almost 6 years ago

Merge remote-tracking branch 'play-java-compile-di-example/2.6.x' into 2.6.x

* play-java-compile-di-example/2.6.x: (44 commits)
Nest play-java-compile-di-example
Updated...

2119ef935211a905a4fdf2d5b16f75e570f9bdd9 authored almost 6 years ago

Merge remote-tracking branch 'play-java-dagger2-example/2.6.x' into 2.6.x

* play-java-dagger2-example/2.6.x: (54 commits)
Nest play-java-dagger2-example
Updated with ...

2541220ad85e51243c7c19be92a8478b99bf8c98 authored almost 6 years ago

Merge remote-tracking branch 'play-java-fileupload-example/2.6.x' into 2.6.x

* play-java-fileupload-example/2.6.x: (47 commits)
Nest play-java-fileupload-example
Updated...

9d92639c25aeeb1ad8b07940e01f80511a28ee51 authored almost 6 years ago

Merge remote-tracking branch 'play-java-chatroom-example/2.6.x' into 2.6.x

* play-java-chatroom-example/2.6.x: (51 commits)
Nest play-java-chatroom-example
Updated wit...

481207e9b0bcc2154821d67a8712ab1ee757da77 authored almost 6 years ago

Nest play-scala-websocket-example

e4fd2d0905369d73e524b0f3e4c56c701d3361d6 authored almost 6 years ago

Nest play-scala-starter-example

e12435d160ee43c9456a52dab975876a8f6f0ade authored almost 6 years ago

Nest play-scala-slick-example

442787ebd8cf7f491e8522c73c79286471dee04e authored almost 6 years ago

Nest play-scala-streaming-example

e124edae2c88d97958c8c62b31048b567ba3b42a authored almost 6 years ago

Nest play-scala-tls-example

dc755991953bc0cad5e6835f5adf448f6b1ad518 authored almost 6 years ago

Nest play-scala-rest-api-example

e1b04603b7de123e7777e1157b5e4ad5328b441a authored almost 6 years ago

Nest play-scala-macwire-di-example

a6c397308b4d06c38e1588ab4e43d1d70932282c authored almost 6 years ago

Nest play-scala-secure-session-example

2f7c675850fbfbb7ab1e85ee42359063264e19c3 authored almost 6 years ago

Nest play-scala-log4j2-example

eda37fe1176daa1adf282055ce0e106046f78fff authored almost 6 years ago

Nest play-scala-isolated-slick-example

b17d69823a2cc48d49246216638facff2e2b5ff3 authored almost 6 years ago

Nest play-scala-fileupload-example

4030a2a1edddd97be7d30554bff3b3c98fdee43d authored almost 6 years ago

Nest play-scala-hello-world-tutorial

236cca821832111b357788987a0cd4b9b1fa7c87 authored almost 6 years ago

Nest play-scala-compile-di-example

0728b9b19257e83456872aeb9e4c93b1844fc0eb authored almost 6 years ago

Nest play-scala-forms-example

44e18077176f0222eff5d065ea54f283f28b01bc authored almost 6 years ago

Ecosyste.ms: OpenCollective

github.com/playframework/play-samples