Axel Uhl
|
584f5350cb
|
removed Hockey dependency; fixed proxy settings in build script for android SDK update
|
2015-04-22 16:24:10 +02:00 |
|
Axel Uhl
|
118dd33eaf
|
Merge branch 'ubilabs--buoy_positioning_app--develop' into ubilabs--tracking_app--develop
|
2015-04-22 16:07:26 +02:00 |
|
Axel Uhl
|
dbea038349
|
adjusted finding of "android" tool so that it also works for Windows platform where it's called android.bat
|
2015-04-22 15:48:12 +02:00 |
|
Axel Uhl
|
1a7292f970
|
added the org.json.simple dependency to the build.gradle file of com.sap.sse.common
|
2015-04-22 15:36:58 +02:00 |
|
Axel Uhl
|
6d3afe9707
|
fixed some files to match formatting conventions
|
2015-04-22 14:58:48 +02:00 |
|
Axel Uhl
|
7747e8707d
|
Merge branch 'ubilabs--tracking_app--develop' into ubilabs--buoy_positioning_app--develop
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
java/com.sap.sse.security.ui/Security UI sdm.launch
|
2015-04-22 14:56:03 +02:00 |
|
Axel Uhl
|
18997d1159
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-22 14:55:23 +02:00 |
|
Axel Uhl
|
7f67ac85fb
|
Merge branch 'master' into ubilabs--buoy_positioning_app--develop
|
2015-04-22 14:54:28 +02:00 |
|
fmittag
|
7a8a267613
|
fix for Bug 2515 - Height of leaderboard competitor charts depends on height of leaderboard which is too tall with long leaderboard / many competitors
|
2015-04-21 21:38:53 +02:00 |
|
fmittag
|
9782fbc9e5
|
added a link to jobs.sapsailing.com in the footer
|
2015-04-21 18:32:55 +02:00 |
|
fmittag
|
0c31315125
|
added racecommittee app tutorial for race officer
|
2015-04-21 18:23:31 +02:00 |
|
fmittag
|
cfd36680f6
|
Merge remote-tracking branch 'origin/bug1963'
|
2015-04-20 18:57:54 +02:00 |
|
fmittag
|
eaa3320293
|
Merge remote-tracking branch 'origin/master' into bug1963
|
2015-04-20 18:32:53 +02:00 |
|
fmittag
|
0ae77d446f
|
added a load/store test for flagImage attribute of competitor
|
2015-04-20 18:13:18 +02:00 |
|
Axel Uhl
|
7c59da1972
|
Merge branch 'bug26'
|
2015-04-17 17:00:29 +02:00 |
|
fmittag
|
5cf08e4d66
|
added replication test for flagImage attribute of competitor
|
2015-04-17 16:37:04 +02:00 |
|
fmittag
|
1a4fde5069
|
added flagImage attribute of competitor to rest api
|
2015-04-17 15:47:51 +02:00 |
|
Axel Uhl
|
2b54719fa9
|
added some support for string-serialization of enum values
|
2015-04-17 15:03:34 +02:00 |
|
Axel Uhl
|
a6b60d6b96
|
added some Javadoc explaining the limitations and capabilities of the SettingsToJsonSerializer
|
2015-04-17 14:43:38 +02:00 |
|
Axel Uhl
|
7db994f3fe
|
support for enum lists
|
2015-04-17 14:34:56 +02:00 |
|
Axel Uhl
|
2a7444c3c9
|
fixed support for ___TYPE setting name escaping; added test case
|
2015-04-17 14:20:46 +02:00 |
|
Axel Uhl
|
a798b1247c
|
added test for nested settings
|
2015-04-17 14:09:29 +02:00 |
|
Axel Uhl
|
64431486da
|
simplified JSON-serialized representation, providing type names only for enums
|
2015-04-17 14:04:25 +02:00 |
|
Axel Uhl
|
6bc793844f
|
a first successful settings "serialization/deserialization" test with JSON
|
2015-04-17 12:20:51 +02:00 |
|
Lennart Hensler
|
533e9fce81
|
Cleaned the processor instruction implementation
|
2015-04-17 11:49:43 +02:00 |
|
Lennart Hensler
|
d7dc62fb11
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2015-04-17 11:08:16 +02:00 |
|
Lennart Hensler
|
3dda7463ef
|
Simplified the processor inheritance hierarchy
|
2015-04-17 11:07:24 +02:00 |
|
Axel Uhl
|
aff66aeaf7
|
Merge branch 'master' into bug26
|
2015-04-17 09:17:38 +02:00 |
|
Axel Uhl
|
1d198aa82c
|
Merge remote-tracking branch 'server/master'
|
2015-04-17 09:12:05 +02:00 |
|
Lennart Hensler
|
ce9a332ec9
|
Introduced ParameterizedFunctions
|
2015-04-16 20:11:05 +02:00 |
|
Lennart Hensler
|
aab2bd7f8e
|
ConcatenatingCompoundFunction builds its simple name during construction
|
2015-04-16 19:11:34 +02:00 |
|
Lennart Hensler
|
ca6f789a60
|
Removed the attribute name from CompoundConcatenationFunction
|
2015-04-16 19:02:40 +02:00 |
|
Lennart Hensler
|
bda102aafc
|
The retriever chain builders stepFurther method is more safe to use
|
2015-04-16 18:25:03 +02:00 |
|
Lennart Hensler
|
75bbfd5d62
|
Counters of processors are now AtomicIntegers
|
2015-04-16 18:15:42 +02:00 |
|
fmittag
|
59248fcf49
|
added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags
|
2015-04-16 17:38:08 +02:00 |
|
Axel Uhl
|
33692ffcf8
|
use simpler version of EntryPointHelper service registration method in EditProfileEntryPoint
|
2015-04-16 15:28:14 +02:00 |
|
Axel Uhl
|
65cc616537
|
re-formatted org.json.simple.parser package contents to meet our code formatter
|
2015-04-16 14:37:54 +02:00 |
|
Axel Uhl
|
a4fd920ee3
|
re-formatted org.json.simple implementation to make it fit our code formatter
|
2015-04-16 14:22:20 +02:00 |
|
Bennet Brunsen
|
8626f67187
|
Applied code formatting.
Used code formatter provided by Siegmund. Applied code formatting to
tracking app, buoy positioning app, android shared.
|
2015-04-16 11:16:11 +02:00 |
|
Bennet Brunsen
|
e28dec03fc
|
Merge branch 'master' into ubilabs--tracking_app--develop
|
2015-04-16 11:02:40 +02:00 |
|
fmittag
|
274ed63fcc
|
first appearance of a club flag in the leaderboard
|
2015-04-15 18:41:40 +02:00 |
|
Axel Uhl
|
3be144894c
|
introduced more settings types; introduced AbstractSettings
|
2015-04-15 14:14:27 +02:00 |
|
Lennart Hensler
|
e7e64feaac
|
The filter selection tables are now sorted
|
2015-04-15 13:47:10 +02:00 |
|
Axel Uhl
|
8b6f05cfb3
|
Merge remote-tracking branch 'server/master' into bug26
|
2015-04-15 13:19:39 +02:00 |
|
Lennart Hensler
|
937465c40f
|
Small fix for the data mining wiki
|
2015-04-15 12:15:33 +02:00 |
|
Lennart Hensler
|
3ad685a1eb
|
Merge remote-tracking branch 'origin/master' into dataMining
|
2015-04-15 10:32:27 +02:00 |
|
Lennart Hensler
|
baf9ed8b7c
|
Wrote the section about the aggregators
|
2015-04-15 10:31:34 +02:00 |
|
Axel Uhl
|
076b9e433c
|
added the first settings implementations
|
2015-04-15 09:58:52 +02:00 |
|
fmittag
|
765ed0618c
|
Merge remote-tracking branch 'origin/master'
|
2015-04-14 23:30:01 +02:00 |
|
fmittag
|
6167ffedb5
|
removed bullshit
|
2015-04-14 23:28:16 +02:00 |
|