Skip to content

Conversation

jadeglaze
Copy link

No description provided.

xael-fry and others added 30 commits February 16, 2015 09:02
[#1901] feat(lib): update to slf4j-log4j12 1.7.10
Conflicts:
	samples-and-tests/just-test-cases/conf/application.conf
…a specific test category (unit, functional, selenium)
[playframework#1344] Fixed OAuth2 lib not finding access_token inside JSON response
[#1916] Get Java version from application.conf
…rMaster

[#1937] fix(router): make some improvement in router
asolntsev and others added 28 commits October 20, 2016 11:51
…ange of htmlUnit

* [playframework#986] chore(lib): update htmlunit from 2.19 to 2.23
…e as a key message

* [playframework#996] fix(messages): ensure default is null before using it

# Conflicts:
#	framework/src/play/mvc/Scope.java
# Conflicts:
#	documentation/manual/home.textile
…when compiling a temaplate with a non GroovyInlineTag

** revert modif on GroovyTemplateCompiler.java don in 765dec2
so we can run all unit-tests in IDE by one click
it seems that it was broken. That's why http://localhost:9000/@db didn't show tables on the left
…patch

[#2066] fix-open-file-on-500-error-pages-for-modules
…static args in routes

# Conflicts:
#	framework/src/play/mvc/Router.java
Detect changed for JNDI datasource which using jndi: prefix and its documentation
@jadeglaze
Copy link
Author

Hmm. I think it's highly unlikely that my change broke the build. Thoughts?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.