SuccèsChangements

Summary

  1. Merge (commit: 47d5bf2) (details)
  2. Revert "Add projet gs-example-angular2" (commit: b373b08) (details)
  3. Add gs-security/gs-security-model modules to fix compilation with maven (commit: 9344682) (details)
  4. gs-color-model2 : maven module fix (commit: 17549a6) (details)
  5. gs-carcolor-model && extended : model and app merged (commit: 8a0adb1) (details)
Commit 47d5bf214f9a50c4be3261b0907a410ac8fab796 by nfeybesse
Merge
 (commit: 47d5bf2)
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents/GSInstanceBuilder.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents/GSMonitorExtended.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/InstanceEditor.java
The file was modifiedgs-example-angular/src/main/java/org/genericsystem/angular/webroot/tpl/home.html
The file was modifiedgs-example-angular/src/main/java/org/genericsystem/angular/webroot/js/app.js
The file was modifiedgs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/model/ContextAction.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/InstanceEditor.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents/GSHeader.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents/GSResponsive.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents/GSStepEditor.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/GSComposite.java
The file was addedgs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp2.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/Tag.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/Modal.java
The file was addedgs-carcolor/src/main/java/org/genericsystem/carcolor/UserGuide2.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/annotations/Stepper.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/InstancesTable.java
The file was modifiedgs-kernel/src/test/java/org/genericsystem/cache/AnnotationTest.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents/GSLogo.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SelectionDefaults.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/SwitchDefaults.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/DivWithTitle.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/modelproperties/StepperDefaults.java
The file was addedgs-carcolor/src/main/resources/carcolorapp2.css
The file was modifiedgs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/Table.java
The file was modifiedgs-example-reactor/src/main/java/org/genericsystem/reactor/example/AppHtml5.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/GSInstanceBuilder.java
The file was addedgs-carcolor/src/main/java/org/genericsystem/carcolor/GSLogo.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/InstanceStepEditor.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/annotations/Attribute.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/InstanceBuilder.java
The file was removedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/GSComposite.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/Table.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/GSCellDiv.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/annotations/Styles.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/Responsive.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/InstancesTable.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/InstanceBuilder.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/GSEditor.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/Monitor.java
The file was addedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents3/DivWithTitle.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/htmltag/HtmlHyperLink.java
The file was modifiedgs-reactor/src/main/java/org/genericsystem/reactor/gscomponents2/GSTable.java
Commit b373b0820accd5d41be34bdc5904693cad429b90 by plagarrigue
Revert "Add projet gs-example-angular2"
This reverts commit 11e17c6df7bf53248c5995e63cba299d1fbbb173.
 (commit: b373b08)
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/webroot/tpl/add-new.html
The file was removedgs-example-angular2/target/classes/META-INF/MANIFEST.MF
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/webroot/tpl/add-new.html
The file was removedgs-example-angular2/.classpath
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/Server.java
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/webroot/index.html
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/model/Car.java
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/webroot/index.html
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/webroot/tpl/home.html
The file was removedgs-example-angular2/.settings/org.eclipse.core.resources.prefs
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/model/Car.class
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/model/Power.class
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/webroot/tpl/edit.html
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/annotation/Table.class
The file was removedgs-example-angular2/pom.xml
The file was removedgs-example-angular2/target/classes/META-INF/maven/org.genericsystem/gs-example-angular2/pom.xml
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/webroot/tpl/home.html
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/webroot/tpl/lists.html
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/webroot/js/app.js
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/Server.class
The file was removedgs-example-angular2/target/classes/META-INF/maven/org.genericsystem/gs-example-angular2/pom.properties
The file was removedgs-example-angular2/.settings/org.eclipse.jdt.core.prefs
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/webroot/js/app.js
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/Server$CacheHandler.class
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/annotation/Column.java
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/model/Power.java
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/annotation/Column.class
The file was removedgs-example-angular2/.settings/org.eclipse.m2e.core.prefs
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/webroot/tpl/lists.html
The file was removedgs-example-angular2/src/main/java/org/genericsystem/angular/annotation/Table.java
The file was removedgs-example-angular2/.project
The file was removedgs-example-angular2/target/classes/org/genericsystem/angular/webroot/tpl/edit.html
Commit 9344682cdabeb0d83ff6609c28c12b594840b993 by fducroquet
Add gs-security/gs-security-model modules to fix compilation with maven
 (commit: 9344682)
The file was modifiedpom.xml
Commit 17549a61e32c09f279b4efbdf308f603cc3af869 by plagarrigue
gs-color-model2 : maven module fix
 (commit: 17549a6)
The file was modifiedpom.xml
Commit 8a0adb1278f30fa505784a0e16a5127146d734be by plagarrigue
gs-carcolor-model && extended : model and app merged
 (commit: 8a0adb1)
The file was addedgs-carcolor-model/src/main/ressources/carcolorapp.js
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/UsedCar.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/CarColor2.class
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Bike.class
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Airbag.java
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/GSLogo.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Color.java
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp.java
The file was removedgs-carcolor/src/main/resources/carcolorapp.js
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/MileageUnit.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Power.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Energy.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/VehicleEngine.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/VehicleVehicleEngine.class
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/MileageUnit.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/SideCar.java
The file was addedgs-carcolor-model/src/main/java/org/genericsystem/carcolor/app/CarColorApp2.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/VehicleColor.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Color.class
The file was modifiedgs-carcolor-model2/.classpath
The file was addedgs-carcolor-model/src/main/java/org/genericsystem/carcolor/app/UserGuide2.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/MileageUnit.class
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/UsedCar.java
The file was modifiedgs-carcolor-model/.classpath
The file was modifiedgs-carcolor-model2/.settings/org.eclipse.jdt.core.prefs
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Car.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/CarColor2.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Mileage.class
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/VehicleVehicleEngine.java
The file was removedgs-carcolor/.settings/org.eclipse.core.resources.prefs
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/VehicleColor.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Color.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Mileage.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Vehicle.class
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Energy.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/VehicleColor.class
The file was modifiedgs-carcolor-model2/.project
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/VehicleEnergy.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Airbag.class
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/VehicleEngine.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/CarColor2.java
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp2.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/CarColor.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/VehicleVehicleEngine.java
The file was addedgs-carcolor-model/src/main/java/org/genericsystem/carcolor/app/CCInheritStyle.java
The file was addedgs-carcolor-model/src/main/java/org/genericsystem/carcolor/app/GSLogo.java
The file was removedgs-carcolor/pom.xml
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Mileage.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/VehicleEnergy.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/SideCar.class
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/CarColor.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Transmission.class
The file was removedgs-carcolor/.classpath
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Price.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Price.class
The file was removedgs-carcolor/.settings/org.eclipse.jdt.core.prefs
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Car.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Vehicle.java
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/CCInheritStyle.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/VehicleEnergy.class
The file was removedgs-carcolor-model2/target/test-classes/genericsystem2015/gs_carcolor_model2/AppTest.class
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/CarColorApp3.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Bike.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/CarColor.class
The file was modifiedgs-carcolor-model2/pom.xml
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Power.class
The file was removedgs-carcolor/.gitignore
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Price.java
The file was modifiedgs-carcolor-model/pom.xml
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Bike.java
The file was addedgs-carcolor-model/src/main/java/org/genericsystem/carcolor/app/CarColorApp.java
The file was removedgs-carcolor-model2/target/classes/.gitignore
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Energy.class
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Vehicle.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/Car.class
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/VehicleEngine.class
The file was removedgs-carcolor/.project
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Transmission.java
The file was removedgs-carcolor-model2/target/classes/org/genericsystem/carcolor/model2/UsedCar.class
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Airbag.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model/extended/Power.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/Transmission.java
The file was modifiedgs-security/src/main/java/org/genericsystem/security/SecurityApp.java
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/UserGuide2.java
The file was removedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/model2/SideCar.java
The file was modifiedpom.xml
The file was removedgs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java
The file was addedgs-carcolor-model/src/main/java/org/genericsystem/carcolor/app/GSUserGuide.java
The file was addedgs-carcolor-model2/src/main/java/org/genericsystem/carcolor/app/extended/CarColorApp3.java