root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10,595 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

326 Commits

Author SHA1 Message Date
Stephane Nicoll d67ce78e8b Merge branch '1.5.x' 2017-01-24 13:23:06 +01:00
Johnny Lim e0de28a1f7 Polish 
Closes gh-8076
 2017-01-24 13:22:22 +01:00
Stephane Nicoll 1f164906dc Merge branch '1.5.x' 2017-01-24 09:56:47 +01:00
Stephane Nicoll 4a60de78ff Merge branch '1.4.x' into 1.5.x 2017-01-24 09:56:26 +01:00
Stephane Nicoll 4efa4590f8 Review doc on advanced datasource customization 
Closes gh-7652
 2017-01-24 09:55:13 +01:00
Andy Wilkinson d5a4058862 Merge branch '1.5.x' 2017-01-20 15:45:34 +00:00
Andy Wilkinson bfd319755c Merge branch '1.4.x' into 1.5.x 2017-01-20 15:45:23 +00:00
Andy Wilkinson 0ce7c9516a Document how to configure test- and profile-specific Flyway migrations 
Closes gh-2753
 2017-01-20 15:44:42 +00:00
Stephane Nicoll 87cf236aae Merge branch '1.5.x' 2017-01-16 10:41:56 +01:00
Stephane Nicoll 3e05329fd7 Order internal RepositoryRestConfigurer 
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.

Closes gh-7981
 2017-01-16 10:41:44 +01:00
Andy Wilkinson ce2256d7dc Merge branch '1.5.x' 2017-01-10 09:13:37 -05:00
Andy Wilkinson db56e1cd00 Merge branch '1.4.x' into 1.5.x 2017-01-10 09:13:27 -05:00
Michael J. Simons 3c291150d6 Update springloaded version to 1.2.6.RELEASE in Maven-related docs 
Closes gh-7937
 2017-01-10 09:13:00 -05:00
Andy Wilkinson 891045880d Merge branch '1.5.x' 2017-01-10 09:10:36 -05:00
Andy Wilkinson 8934dfaecf Merge branch '1.4.x' into 1.5.x 2017-01-10 09:10:26 -05:00
Michael J. Simons ddca9a1687 Update springloaded version to 1.2.6.RELEASE in Gradle-related docs 
Closes gh-7937
 2017-01-10 09:08:35 -05:00
Stephane Nicoll 506f6497c0 Merge branch '1.5.x' 2017-01-04 09:56:19 +01:00
Johnny Lim f915ae197a Polish 2017-01-04 09:53:45 +01:00
Phillip Webb 24f5125a8b Merge branch '1.5.x' 2017-01-03 19:01:17 -08:00
Phillip Webb 18dcf31aa6 Polish documentation formatting 2017-01-03 17:24:37 -08:00
Stephane Nicoll 85f176da08 Merge branch '1.5.x' 2017-01-03 11:39:33 +01:00
Stephane Nicoll fe89af5e82 Polish contribution 
Closes gh-7796
 2017-01-03 11:33:57 +01:00
Stephane Nicoll 219e0baa58 Merge branch '1.5.x' 2016-12-22 15:40:02 +01:00
Stephane Nicoll 449043bf21 Polish contribution 
Closes gh-6900
 2016-12-22 15:39:31 +01:00
Andy Wilkinson 943262bb97 Raise the minimum supported version of Hibernate to 5.2.x 
Closes gh-7586
 2016-12-15 21:31:53 +00:00
Stephane Nicoll 0568afc6cb Merge branch '1.5.x' 2016-11-30 08:31:41 +01:00
Johnny Lim 423f8037ce Polish 
Closes gh-7530
 2016-11-30 08:31:13 +01:00
Stephane Nicoll e8d476dbca Fix use of `forceCreation` flag in `maven-jar-plugin` 2016-11-29 11:28:14 +01:00
Stephane Nicoll c9fa1a1f70 Merge branch '1.4.x' into 1.5.x 2016-11-24 10:39:51 +01:00
Stephane Nicoll 0359b2f6f5 Document how to disable JMS transacted session 
Closes gh-7463
 2016-11-24 10:39:40 +01:00
Stephane Nicoll 2b8801a6b5 Merge branch '1.4.x' into 1.5.x 2016-11-12 11:16:30 +01:00
Emanuel Rabina 6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc 
Closes gh-7370
 2016-11-12 11:15:00 +01:00
Stephane Nicoll 389acb094b Merge branch '1.4.x' into 1.5.x 2016-11-05 07:43:09 +01:00
Johnny Lim ec9f0ab6b4 Polish 
Closes gh-7322
 2016-11-05 07:42:37 +01:00
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:44:20 +01:00
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample 
See gh-6991
Closes gh-7183
 2016-10-19 10:43:38 +01:00
Andy Wilkinson 7d68c14d03 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:36:48 +01:00
Raja Dilip Kolli 4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version 
Closes gh-7183
 2016-10-19 10:34:11 +01:00
Stephane Nicoll f254e1227f Merge branch '1.4.x' into 1.5.x 2016-10-12 10:03:59 +02:00
Stephane Nicoll 0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll bd2956c3f0 Fix `metricsFilter` reference in doc 
Closes gh-7147
 2016-10-12 10:03:23 +02:00
Stephane Nicoll 18c3d42f45 Merge branch '1.4.x' into 1.5.x 2016-10-11 08:32:43 +02:00
Stephane Nicoll 98f14f2ee9 Polish documentation 
Closes gh-2642
 2016-10-11 08:30:18 +02:00
Stephane Nicoll 5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00
Aurélien Leboulanger 2c64661b58 Fix typo 
Closes gh-7127
 2016-10-07 14:14:50 +02:00
Stephane Nicoll f684bcc9e5 Merge branch '1.4.x' into 1.5.x 2016-10-06 11:37:20 +02:00
Stephane Nicoll 0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3 
Closes gh-7097
 2016-10-06 11:21:24 +02:00
Stephane Nicoll 6977dcaf44 Merge branch '1.4.x' into 1.5.x 2016-10-03 12:28:58 +02:00
Stephane Nicoll 9f7e97b23f Improve war to executable app documentation 
Closes gh-7040
 2016-10-03 12:28:25 +02:00
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 2016-10-02 11:08:33 +02:00