 Axel Uhl
|
e8c225ca47
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-06 18:07:04 +01:00 |
|
|
Axel Uhl
|
f29f4b434d
|
fixed execution enviornment for two last 1.6 projects
|
2015-03-06 17:49:39 +01:00 |
|
 Peter Siegmund
|
197b4e039e
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-16 12:56:03 +01:00 |
|
|
Peter Siegmund
|
b7de2dff53
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-13 16:30:07 +01:00 |
|
 Fredrik Teschke
|
4cb7b535c8
|
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
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/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
|
2015-02-13 08:29:41 +01:00 |
|
|
Axel Uhl
|
98d5235b47
|
upgraded all Mongo-using bundles to 2.13.0 driver
|
2015-02-12 16:00:15 +01:00 |
|
|
Fredrik Teschke
|
523ad4cc3e
|
Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' into jbross-email-invitation
|
2015-02-10 03:10:29 +01:00 |
|
|
Fredrik Teschke
|
c861fcbd74
|
upgrade poms of shared and common bundles to 1.7 compiler level
|
2015-02-10 03:09:27 +01:00 |
|
|
Peter Siegmund
|
abcebf2f04
|
Merge branch 'master' into feature/procedure_wizard
|
2015-02-09 11:51:03 +01:00 |
|
 Jan Broß
|
0e4775d51f
|
Add email field to Competitor
|
2015-02-04 22:36:48 +01:00 |
|
|
Axel Uhl
|
3d7137fa03
|
removed redundant version specidications in bundle dependencies
|
2015-02-02 15:59:44 +01:00 |
|
|
Fredrik Teschke
|
3edbbb04bb
|
move type based service finder to sse bundles (create new com.sap.sse.osgi bundle)
|
2015-01-23 16:56:49 +01:00 |
|
|
Peter Siegmund
|
c5ee521e3c
|
Merge branch 'master' into android_apps
|
2015-01-23 10:08:08 +01:00 |
|
|
Axel Uhl
|
0c43f2b64b
|
moved color stuff from com.sap.sailing.domain.common to com.sap.sse.common
|
2015-01-22 11:05:24 +01:00 |
|
|
Axel Uhl
|
ba4d5b0f6c
|
moved CountryCode stuff to SSE
|
2015-01-22 11:01:01 +01:00 |
|
|
Peter Siegmund
|
faececd647
|
Gradle: changed to local json-simple module
|
2015-01-16 16:03:40 +01:00 |
|
|
Peter Siegmund
|
015c4f2d82
|
Merge branch 'bug2572' into android_apps
|
2015-01-14 17:02:18 +01:00 |
|
|
Axel Uhl
|
c13325e1b3
|
added com.sap.sailing.server.gateway.serialization.android.shared to feature.xml; made gateway.serialization.[android.shared] lazy-activated
|
2015-01-14 13:41:23 +01:00 |
|
|
Axel Uhl
|
485cba10fb
|
added pom.xml for com.sap.sailing.server.gateway.serialization.shared.android
|
2015-01-14 13:37:48 +01:00 |
|
|
Axel Uhl
|
8ee256a4b7
|
split com.sap.sailing.gateway.serialization in two bundles, creating com.sap.sailing.gateway.serialization.shared.android, see bug 2572
|
2015-01-14 13:22:22 +01:00 |
|