Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,444 Commits 15 Branches 184 Tags
b48082a8115dee04f33c6db29aacee64973424c6
Commit Graph

4444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukasz Lenart b48082a811 Fixes test to use HttpParameters instead of Map 2016-03-12 16:14:45 +01:00
Lukasz Lenart 31826bc117 Drops unused import 2016-03-12 16:14:25 +01:00
Lukasz Lenart bb21dbe492 Merge remote-tracking branch 'upstream/master' into http-parameters 
Conflicts:
	core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
	core/src/test/java/com/opensymphony/xwork2/interceptor/I18nInterceptorTest.java
	core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
	core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
	core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
	core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
 2016-03-12 16:03:42 +01:00
Lukasz Lenart fc2179cf1a Narrows possible locale to those from available locales 2016-03-11 11:04:14 +01:00
Lukasz Lenart 3c68a3def6 WW-4533 Reverts the old behaviour of how empty action should be handled 2016-03-10 08:46:59 +01:00
Lukasz Lenart 15857a69e7 Reduces expression evaluation if there is no expression 2016-03-06 10:08:15 +01:00
Aleksandr Mashchenko f7364a50dc radio checked fix vol.2 2016-03-04 20:52:23 +02:00
Aleksandr Mashchenko 866b8902cd radio checked fix 2016-03-04 20:43:07 +02:00
Aleksandr Mashchenko 820c52dd26 formatting 2016-03-04 20:39:58 +02:00
Aleksandr Mashchenko 7a0ae0ebae WW-4586 Custom StrutsTypeConverter's convertToString not called in radio and checkboxlist tags 2016-03-04 20:37:51 +02:00
Lukasz Lenart 2b92ebb500 Upgrades lib to latest version 2016-03-04 18:39:24 +01:00
Lukasz Lenart 754c8a247a WW-4593 Upgrades easy-mock 2016-03-04 07:09:53 +01:00
victorsosa 3df363e7a7 Merge branch 'easymock_update' of git@github.com:victorsosa/struts.git into easymock_update 2016-03-03 17:57:27 -04:00
victorsosa a0a70581f9 Merge branch 'easymock_update' of git@github.com:victorsosa/struts.git 
into easymock_update
 2016-03-03 17:56:44 -04:00
victorsosa 88b37cdb40 Merge branch 'easymock_update' of git@github.com:victorsosa/struts.git into easymock_update 2016-03-03 17:49:06 -04:00
victorsosa d8e4cb8b48 Merge branch 'master' into easymock_update 
# Conflicts:
#	core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
 2016-03-03 17:43:17 -04:00
victorsosa eddd8e0547 Merge branch 'master' into easymock_update 
# Conflicts:
#	core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
 2016-03-03 14:38:13 -04:00
Lukasz Lenart 5bcdd3d9f3 WW-4464 Adds null checking 2016-03-03 19:30:00 +01:00
Lukasz Lenart f9fb3549cd WW-4610 Adds proper context initialisation when file upload is used 2016-03-03 17:56:05 +01:00
Lukasz Lenart 65e2a864a2 WW-4607 Allows defined custom type for text field 2016-03-03 17:40:24 +01:00
Lukasz Lenart e5d693a8df WW-3940 Upgrades Velocity tools 2016-03-03 17:38:37 +01:00
victorsosa 0c92e2a1f3 fix for WW-4610 ServletActionContext.getRequest() doesn't return the 
MultiPartRequestWrapper (or StrutsRequestWrapper) when using
StrutsPrepareFilter
 2016-03-03 10:06:57 -04:00
victor sosa f34283b26e Merge pull request #7 from apache/master 
update pull
 2016-02-27 11:20:39 -04:00
Lukasz Lenart 4ea8883ff9 WW-4410 Adds dedicated interface to allow inject ServletContext 2016-02-25 21:30:19 +01:00
Lukasz Lenart 5d98650921 Drops wrong arg passed to logger 
Conflicts:
	core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
 2016-02-25 20:48:12 +01:00
Lukasz Lenart e2c6b42b82 WW-4595 Resolves regression issue but keeping support for custom text provider 2016-02-25 20:13:36 +01:00
Lukasz Lenart 41227fab82 WW-4563 Reverts checking if value is excluded and uses Internal Security Mechanism 2016-02-25 18:32:31 +01:00
Lukasz Lenart 0d494106f6 WW-4560 Reverts checking if value is excluded and uses Internal Security Mechanism 2016-02-25 18:31:51 +01:00
cnenning b638260d92 escaped @ characters in javadoc code sample to avoid javadoc warnings 2016-02-25 09:31:40 +01:00
nkjackzhang 46cd6a1276 fix spelling error in comments 
change "cssStyle" to "cssErrorStyle"
 2016-02-22 10:13:37 +08:00
gregh3269 d397abcfc1 html5 attributes again 2016-02-10 11:12:10 +00:00
gregh3269 40f7b39c3f Allow html5 attributes 2016-02-10 08:53:32 +00:00
Lukasz Lenart 24085bdc5a Adds some logginf to allowed methods 2016-02-05 09:36:21 +01:00
Lukasz Lenart c53c6d8c8e WW-4596 Uses unmodifiable set to avoid changing allowed methods 2016-02-05 09:02:52 +01:00
victor sosa a2c5bc835e Merge pull request #6 from apache/master 
pull update
 2016-02-04 13:12:22 -04:00
Lukasz Lenart 0cc5fcaaa3 WW-4596 Fixes bug with overriding global-allowed-methods 2016-02-04 11:00:04 +01:00
Lukasz Lenart 857195c1b1 WW-4605 Refactors MessageStoreInterceptor to use listener 2016-02-04 08:20:02 +01:00
Lukasz Lenart 41cf08c772 Updates tests to reflect invocation change logic 2016-02-04 08:06:08 +01:00
Lukasz Lenart f755e01c18 Updates test to cover usage of new listener 2016-02-04 08:05:46 +01:00
Lukasz Lenart 8071052f86 Uses the new listener 2016-02-04 08:05:21 +01:00
Lukasz Lenart 0754027a5a Adds test based on MessageStoreInterceptor 2016-02-04 08:05:00 +01:00
Lukasz Lenart a9b2c3cb4d Defines listener to store messages 2016-02-04 08:04:44 +01:00
Lukasz Lenart 6bb526d8ec Creates result before executing it to allow listeners to operate on it 2016-02-03 21:01:48 +01:00
cnenning 6d2a57355e Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts 2016-02-03 10:51:53 +01:00
cnenning 15688132ef WW-4594 Merges #85 which adds annotations to configure tiles 2016-02-03 10:51:15 +01:00
Lukasz Lenart 954a29efce WW-4596 Adds support to defined allowed methods with * 2016-02-03 10:38:13 +01:00
Lukasz Lenart 23a0c9eb64 WW-4596 Fixes SMI with ActionConfigMatcher 2016-02-03 09:48:30 +01:00
Lukasz Lenart d8b6602e6f WW-4600 Adds additional check if session was invalidated 
Conflicts:
	core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
 2016-02-03 09:37:19 +01:00
cnenning 94691e0afd Every 2nd build on jenkins with jdk8 fails while generating javadoc for tiles-plugin. It fails at file serialized-form.html because it misses class org.apache.tiles.context.TilesRequestContextWrapper. That class was present in tiles 2 but is not present in tiles 3 anymore. To avoid failing builds due to this failOnError is set to false. 2016-02-01 11:33:20 +01:00
cnenning f5ef1438aa removed outcommented line 2016-02-01 09:45:34 +01:00