 Simon Pamies
|
addc58c5ea
|
Included bin directory into ignores
|
2014-01-19 18:39:29 +01:00 |
|
 Lennart Hensler
|
7ab1a9ff22
|
Fixed missing file after merge
|
2013-12-19 17:43:46 +01:00 |
|
|
Lennart Hensler
|
adbeb04b24
|
Merge branch 'master' into dataMining
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/pom.xml
|
2013-12-19 17:25:47 +01:00 |
|
 Axel Uhl
|
c8c0574c03
|
fixed formatting of imports
|
2013-12-04 18:10:28 +01:00 |
|
|
Axel Uhl
|
ff8254c68b
|
added persistence for Igtimi access tokens
|
2013-11-29 15:05:05 +01:00 |
|
|
Axel Uhl
|
ed35db38b4
|
removed setConfiguration from MongoDBService and replaced by MongoDBConfiguration.getService()
|
2013-11-29 13:28:42 +01:00 |
|
|
Axel Uhl
|
80da9fa4c7
|
added Igtimi bundles to feature, launch configs and pom.xml
|
2013-11-15 15:49:45 +01:00 |
|
|
Axel Uhl
|
0889442605
|
preparing for JAX XS for callback for oauth
|
2013-11-14 15:16:36 +01:00 |
|
|
Axel Uhl
|
87e1e9743d
|
added structure for Igtimi connector
|
2013-11-14 13:43:35 +01:00 |
|