Errai

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into 1.3

Conflicts:

weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventObserverIntegrationTest.java

weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventProducerIntegrationTest.java

remove uneeded class

Merge branch 'master' of https://github.com/csadilek/errai-cdi

Conflicts:

weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventObserverIntegrationTest.java

weld-integration/src/test/java/org/jboss/errai/cdi/event/client/test/EventProducerIntegrationTest.java

Merge branch 'master' of https://github.com/csadilek/errai-cdi into 1.3

...

Merge branch 'master' of https://github.com/csadilek/errai

...

some initial steps

    • -0
    • +272
    /demos/jaxrs-demo/pom.xml
    • -0
    • +29
    /demos/jaxrs-demo/src/jboss/web.xml
    • -0
    • +29
    /demos/jaxrs-demo/src/jetty/web.xml
    • -0
    • +29
    /demos/jaxrs-demo/src/tomcat/web.xml
    • -0
    • +4
    /demos/jaxrs-demo/war/.gitignore
    • -0
    • +7
    /demos/jaxrs-demo/war/RestDemo.css
    • -0
    • +25
    /demos/jaxrs-demo/war/RestDemo.html
    • -0
    • +46
    /demos/jaxrs-demo/war/WEB-INF/web.xml
  1. … 8 more files in changeset.
test refactorings

minor change

test improvements

Merge branch 'master' of https://github.com/mikebrock/errai

minor changes

test refactorings

test refactorings

Merge branch 'master' of https://github.com/mikebrock/errai

fixes

fixes

Merge branch 'master' of https://github.com/mikebrock/errai

code cleanup

code cleanup

Fix to JettyContinuationsServlet

Merge branch 'master' of https://github.com/mikebrock/errai

[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release 1.3.0.CR1

[maven-release-plugin] prepare for next development iteration

    • -1
    • +1
    /errai-bus-demos/clientservice/pom.xml
    • -1
    • +1
    /errai-bus-demos/serialization/pom.xml
[maven-release-plugin] prepare release 1.3.0.CR1

    • -7
    • +6
    /errai-bus-demos/clientservice/pom.xml
    • -7
    • +6
    /errai-bus-demos/serialization/pom.xml
update docs

update docs

Merge branch 'master' of https://github.com/mikebrock/errai