Commit Graph

4453 Commits

Author SHA1 Message Date
Lukasz Lenart 17e14ef42b [maven-release-plugin] prepare release STRUTS_2_5_2 STRUTS_2_5_2 2016-07-07 10:48:45 +02:00
Lukasz Lenart d75a890482 WW-4655 Cleans up code and uses more user friendly logic to process parameters 2016-07-03 10:55:14 +02:00
Lukasz Lenart d06689120d Uses the latest OGNL version 2016-06-29 20:41:57 +02:00
Lukasz Lenart fb92c67d13 Cleans up test 2016-06-29 20:34:03 +02:00
victorsosa 6e07a63797 WW-4650 Json deserialization does not work in 2.5.1
logic need to be changed as accept can be a list; the check need to be
done in the list itself.

Accept:application/json, text/plain, */*
2016-06-24 09:06:52 -04:00
victorsosa b462286589 Merge branch 'apache-master' 2016-06-24 08:26:27 -04:00
victorsosa 4f07433626 Merge branch 'master' of https://github.com/apache/struts into apache-master 2016-06-24 08:25:42 -04:00
Lukasz Lenart cd13846e19 Fixes test and conflicts 2016-06-22 11:10:26 +02:00
Lukasz Lenart f096dd611e Adds test to guard pre-evaulation of name attribute 2016-06-22 11:10:04 +02:00
Lukasz Lenart cfcefcf589 Drops commented out test 2016-06-22 11:04:07 +02:00
Lukasz Lenart 8dfe178585 Uses LocaleProvider and default TextProvider instead of evaluating expression 2016-06-22 11:03:41 +02:00
Lukasz Lenart d5e0fe9207 WW-4648 Upgrades commons-fileupload to the latest version 2016-06-22 10:57:14 +02:00
Lukasz Lenart a2de255697 [maven-release-plugin] prepare for next development iteration 2016-06-14 08:07:45 +02:00
Lukasz Lenart e8aa825f21 [maven-release-plugin] prepare release STRUTS_2_5_1 STRUTS_2_5_1 2016-06-14 08:07:24 +02:00
Lukasz Lenart a0fdca138f Improves validation RegEx 2016-06-14 07:02:09 +02:00
Lukasz Lenart 7621c2bc92 WW-4643 Makes set unmodifiable 2016-06-12 19:40:27 +02:00
Lukasz Lenart b866e0e880 WW-4643 Fixes SMI when used with Action-less resutls 2016-06-12 19:38:31 +02:00
Lukasz Lenart 08360cb916 WW-4634 Fixes centre alignment in Velocity tags 2016-06-12 15:48:35 +02:00
Lukasz Lenart 1afb48aa76 WW-4640 Adds more informative message when method is not allowed 2016-06-12 15:41:28 +02:00
Lukasz Lenart ca256a74e9 Inlines constants and drops class 2016-06-12 15:22:45 +02:00
Lukasz Lenart e60119436a WW-4632 Uses proper DTD version 2016-06-12 13:10:49 +02:00
Lukasz Lenart 7da4ef3902 Introduces new callMethod() function to be used to execute actions
(cherry picked from commit b28b78c062)
2016-06-12 13:03:39 +02:00
Lukasz Lenart ce294b48df Drops unneeded method
(cherry picked from commit 3f526d630a)
2016-06-12 13:02:03 +02:00
Lukasz Lenart 04e5e9dde8 Upgrades OGNL to the latest version 2016-06-12 12:54:15 +02:00
Aleksandr Mashchenko e28e5f03a6 Fixes WW-4529 and few other typos 2016-06-11 21:17:01 +03:00
Aleksandr Mashchenko 39cc611d72 WW-4644 - Drops xwork-core from bom 2016-06-11 20:30:05 +03:00
jumiller dd3b80f2be add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig method in ConventionUnknownHandler to reference it 2016-06-10 07:59:27 -06:00
jumiller 0d92fd0ee5 add allowed methods to ActionBuilder 2016-06-09 15:39:23 -06:00
victor sosa 7985fd191a Merge pull request #17 from apache/master
update pull
2016-05-26 19:23:37 -04:00
victorsosa e0b13a5b0b fix test cases 2016-05-25 10:38:37 -04:00
victorsosa 8fea9566a9 fix test cases 2016-05-25 10:36:53 -04:00
victorsosa 2cd28b160e fix test 2016-05-25 09:47:28 -04:00
victorsosa 30b74a3f01 Merge branch 'WW-4634' of github.com:victorsosa/struts into WW-4634 2016-05-25 09:23:39 -04:00
victorsosa dce6d3e110 test fix 2016-05-25 09:23:13 -04:00
victor sosa c70f2409f2 Update styles.css 2016-05-25 08:29:20 -04:00
victorsosa 175d0d42db Add a class .tdInput for future and use align attribute with
class="align-${parameters.align?html}"
2016-05-25 07:52:23 -04:00
Lukasz Lenart 095960b569 Allows empty string as a action name 2016-05-23 17:05:53 +02:00
Lukasz Lenart 9b34a28190 Disallows dot in action name 2016-05-23 16:03:09 +02:00
Lukasz Lenart 880c1d54a4 WW-4558 contentType override ignored for JSONInterceptor 2016-05-22 08:30:27 +02:00
victorsosa 9e11b2c2b1 WW-4634 2016-05-17 09:17:35 -04:00
victorsosa d06c71d68e WW-4634 2016-05-17 09:03:27 -04:00
victorsosa ffdacf1b60 WW-4634 2016-05-17 09:00:33 -04:00
victorsosa f9e4a5e676 Merge branch 'master' of github.com:victorsosa/struts 2016-05-17 08:50:50 -04:00
victor sosa b4facc8e06 Merge pull request #15 from apache/master
update pull
2016-05-17 08:39:51 -04:00
victorsosa 6b360108e5 WW-4634 2016-05-17 08:37:13 -04:00
Lukasz Lenart 104bd92b88 WW-4627 Adds unit test to confirm the issue 2016-05-13 08:07:59 +02:00
Lukasz Lenart a44c7bc13d WW-4626 Adds support for .cat domain 2016-05-13 07:43:02 +02:00
Lukasz Lenart dbf744f54b WW-4618 Supports custom redirect types which base on ServletRedirectResult 2016-05-13 07:05:27 +02:00
Lukasz Lenart 27ca165ddb Throws away methods that doesn't match pattern 2016-05-12 15:36:12 +02:00
victorsosa d16aa65098 remove old second contentType parameter 2016-05-06 18:04:04 -04:00