Commit Graph

112 Commits

Author SHA1 Message Date
slavisa-baeldung d81365a7ac Merge branch 'pr/562-sunil-integration-testing'
Conflicts:
	pom.xml
2016-08-14 09:47:39 +02:00
slavisa-baeldung aed7a46324 BAEL-175 - moving to mvc java module 2016-08-14 09:45:23 +02:00
Grzegorz Piwowarek c3766c0138 Remove eclipse-specific config 2016-08-02 00:15:36 +02:00
slavisa-baeldung 1972b45a5b BAEL-102 - Spring with JSON-P 2016-08-01 00:14:00 +02:00
slavisa-baeldung a9b95d326b Merge branch 'master' into pr/462-jsonp 2016-07-31 23:37:36 +02:00
MafaldaLandeiro a384872870 Spring JSON-P with Jackson 2016-07-27 20:55:04 +01:00
tomjoebob 53062a85df Merge pull request #514 from jgarciaheredero/master
BAEL-83: Circular dependencies in Spring
2016-07-19 14:23:48 -06:00
Grzegorz Piwowarek a09e6454f3 Remove Eclipse-specific files 2016-07-19 18:18:50 +03:00
Juan García Heredero 4e7a47de12 Create CircularDependencyTest 2016-07-19 12:42:27 +02:00
Juan García Heredero 170a45a314 Create TestConfig 2016-07-19 12:42:04 +02:00
Juan García Heredero a42a9bbc88 Create CircularDependencyB 2016-07-19 12:41:15 +02:00
Juan García Heredero 259f3ca7ab Create CircularDependencyA 2016-07-19 12:40:49 +02:00
m0cacin0 46d5938ab6 Update README.md 2016-06-28 12:27:43 +03:00
MafaldaLandeiro 9b30521a3f Spring JSONP with Jackson 2016-06-26 00:16:13 +01:00
slavisa-baeldung 70322e1a44 spring-mvc-matrix-variables - manually merging 2016-06-15 20:25:41 +02:00
Alex Theedom f4ee749afc Merge pull request #445 from toubou91/master
Updates for @ModelAttribute example
2016-06-10 00:56:45 +03:00
toubou91 815933447b Updates for @ModelAttribute example 2016-06-09 00:22:06 +02:00
David Morley 5fb75f508d Merge branch 'master' of https://github.com/ivanp81/tutorials into ivanp81-master 2016-05-12 05:30:15 -05:00
slavisa-baeldung a58a896ac8 Merge pull request #410 from yuriikostyshyn/YKostyshyn_spring_mvc_1
Sending media in response body using Spring MVC
2016-05-10 12:39:57 +01:00
eugenp 8bd5e12207 minor formatting work 2016-05-09 12:16:40 +03:00
Ivan Paolillo ed72ff42e8 Add websocket example 2016-05-05 10:37:56 +02:00
Ivan Paolillo 889b266107 Add websocket example 2016-04-27 18:06:10 +02:00
Yurii Kostyshyn 3601821582 Added controller for returning image in response body with configuration via java class 2016-04-18 23:17:03 +03:00
Ivan Paolillo 4d1dd06a26 Add websocket example 2016-04-18 16:44:01 +02:00
Ivan Paolillo 70e9d2fa18 Add websocket example 2016-04-18 16:42:18 +02:00
David Morley 9630170b03 Rename package 2016-04-07 06:17:57 -05:00
David Morley 44eca5ba04 Merge branch 'master' of https://github.com/ivanp81/tutorials into ivanp81-master 2016-04-07 06:10:09 -05:00
Ivan 3061fc7c0f Add file upload example 2016-04-04 14:03:44 +02:00
Ivan b7d0b2947a Add file upload example 2016-03-30 15:08:53 +02:00
Ivan 09a1ebfa07 Add file upload example 2016-03-23 13:16:10 +01:00
Ivan 8d398b2852 Add file upload example 2016-03-23 13:12:12 +01:00
RoshanThomas 66f34a4503 Removing HTML media type 2016-03-13 20:30:25 -04:00
RoshanThomas 67ae14e8d4 Removing HTML media type 2016-03-13 20:29:38 -04:00
Roshan Thomas 12ce3ee247 Revert "Removing HTML media type"
This reverts commit a243105b01.
2016-03-13 20:26:59 -04:00
Roshan Thomas a243105b01 Removing HTML media type 2016-03-13 20:21:35 -04:00
Roshan Thomas aea2aafe06 Content Negotiation Strategy 2016-03-11 22:43:49 -05:00
eugenp a2989da4bf maven work 2016-03-06 12:10:06 +02:00
eugenp 0708c51125 mave work 2016-03-06 11:59:13 +02:00
eugenp c467ca73e2 maven work 2016-03-06 11:49:59 +02:00
MichelLeBon b0d8d83280 Update README.md 2016-02-11 03:04:45 +02:00
MichelLeBon fda7b00e6b Update README.md 2016-02-10 14:29:26 +02:00
MichelLeBon 238f5d340f Update README.md 2016-02-10 14:28:15 +02:00
MichelLeBon d91f7672ff Update README.md 2016-02-10 14:26:17 +02:00
MichelLeBon f602cea186 Update README.md 2016-02-10 14:25:49 +02:00
eugenp dffa1d2504 minor cleanup work 2016-02-03 19:28:48 +02:00
Ivan 6a203ae91b Add multiple ViewResolver configuration example 2016-02-02 17:37:39 +01:00
eugenp 95e2d063f4 general formatting work 2016-01-30 12:01:41 +02:00
eugenp 62fd1e6eda minor cleanup 2015-12-24 11:39:47 +02:00
eugenp 8238c11c80 maven upgrades 2015-12-21 11:34:42 +02:00
eugenp 55b0827420 minor cleanup 2015-12-18 13:14:30 +02:00