9180 Commits (363798e9ad3ea25d438ab8675ff5b3450e36d89f)
 

Author SHA1 Message Date
Stephane Nicoll 363798e9ad Fix unresolved merge commit 9 years ago
Stephane Nicoll 7fc2566650 Merge branch '1.5.x' 9 years ago
Stephane Nicoll b0474b7c9d Merge branch '1.4.x' into 1.5.x 9 years ago
Stephane Nicoll 120ece726d Merge pull request #7203 from kdombeck:fix-typo 9 years ago
Ken Dombeck 4621f82b0e Correct typo in docs 9 years ago
Phillip Webb df3c152813 Merge '1.5.x' 9 years ago
Phillip Webb 2ba978b4ad Polish 9 years ago
Phillip Webb 1e1d929dde Merge branch '1.5.x' 9 years ago
Madhura Bhave ab81d993e6 Add CloudFoundryDiscoveryMvcEndpoint 9 years ago
Madhura Bhave 7afb161fcf Add CloudFoundry EndpointHandlerMapping 9 years ago
Andy Wilkinson 3eb9397c9d Merge branch '1.5.x' 9 years ago
Andy Wilkinson 570b292df7 Disable JspServlet's development mode by default 9 years ago
Andy Wilkinson 8832df3303 Merge branch '1.5.x' 9 years ago
Andy Wilkinson c2d97c9757 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 5ebfa4b139 Start building against Spring Integration 4.3.5 snapshots 9 years ago
Andy Wilkinson 702d904d53 Merge branch '1.5.x' 9 years ago
Andy Wilkinson d7e2708687 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 999fa123df Deprecate support for Gradle 2.7 and earlier 9 years ago
Andy Wilkinson 2017e763c3 Merge branch '1.5.x' 9 years ago
Andy Wilkinson 129c20965b Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 943a054b61 Remove ineffective, premature optimisation from ErrorPageFilter 9 years ago
Andy Wilkinson 86034e5c5c Merge branch '1.5.x' 9 years ago
Andy Wilkinson 3ea09d2e04 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 02e89acd1e Add managed version for kotlin-runtime to spring-boot-parent 9 years ago
Andy Wilkinson b1026db330 Merge branch '1.5.x' 9 years ago
Andy Wilkinson f942fe4947 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 64d32191cf Ignore Kotlin annotations when creating test context cache key 9 years ago
Andy Wilkinson 8a547facd1 Merge branch '1.5.x' 9 years ago
Andy Wilkinson c9e6aff374 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK 9 years ago
Andy Wilkinson 57450042bb Merge branch '1.5.x' 9 years ago
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample 9 years ago
Andy Wilkinson 3dd0b9d59a Merge branch '1.5.x' 9 years ago
Andy Wilkinson 7d68c14d03 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson a531173691 Merge pull request #7183 from Raja Dilip Kolli 9 years ago
Raja Dilip Kolli 4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version 9 years ago
Andy Wilkinson 81d8e4ab89 Merge branch '1.5.x' 9 years ago
Andy Wilkinson de578cb004 Upgrade to Spring Web Services 2.4.0.RELEASE 9 years ago
Andy Wilkinson a4bc341028 Merge branch '1.5.x' 9 years ago
Andy Wilkinson a416f496c0 Clean up deprecation and unused code warnings 9 years ago
Andy Wilkinson f17be6e9f1 Merge branch '1.5.x' 9 years ago
Andy Wilkinson c58852e05b Start building against Spring Security 4.2.0 snapshots 9 years ago
Andy Wilkinson 2a685a8c15 Merge branch '1.5.x' 9 years ago
Andy Wilkinson b7c55fb192 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson a31180dd68 Avoid calling URL.getContent() when defining a package 9 years ago
Stephane Nicoll d79546da74 Merge branch '1.5.x' 9 years ago
Stephane Nicoll 6186262ecc Switch `excludeDevtools` to true by default 9 years ago
Andy Wilkinson e49b5f241e Merge branch '1.5.x' 9 years ago
Andy Wilkinson 57108a9faa Try to make the tests for the Cassandra sample more robust 9 years ago