 Axel Uhl
|
67a2c22acc
|
fixed NPE related to uninitialized tracking times
|
2015-08-12 16:00:49 +02:00 |
|
|
Axel Uhl
|
1cae206254
|
Merge branch 'ubilabs--tracking_app--develop'
Conflicts:
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
|
2015-08-12 15:32:49 +02:00 |
|
|
Axel Uhl
|
b173afc779
|
Merge branch 'ubilabs--rcapp--master'
|
2015-08-12 15:32:05 +02:00 |
|
|
Axel Uhl
|
5336b3e9f0
|
Merge remote-tracking branch 'server/ubilabs--tracking_app--develop' into ubilabs--tracking_app--develop
|
2015-08-12 15:29:13 +02:00 |
|
|
Axel Uhl
|
822bb774f5
|
formatting only
|
2015-08-12 15:19:04 +02:00 |
|
 Bennet Brunsen
|
749953ee23
|
Merge branch 'ubilabs--tracking_app--bug_3207' into ubilabs--tracking_app--develop
|
2015-08-12 14:41:36 +02:00 |
|
|
Bennet Brunsen
|
0b606b4656
|
Removed useless codein checkin manager
|
2015-08-12 14:40:01 +02:00 |
|
 Peter Siegmund
|
7f0fb0f89b
|
Merge branch 'ubilabs--rcapp--feature--phone-login' into ubilabs--rcapp--develop
|
2015-08-12 14:29:46 +02:00 |
|
|
Peter Siegmund
|
9dd5367d49
|
Bug 3205 - Font size in NavDrawer on Lollipop broken
|
2015-08-12 14:02:07 +02:00 |
|
|
Peter Siegmund
|
969d14b46c
|
Bug 3204 - Lollipop protest time chooser
|
2015-08-12 13:49:56 +02:00 |
|
|
Peter Siegmund
|
07105c2005
|
ripples in popup menu (not working yet)
|
2015-08-12 13:27:23 +02:00 |
|
|
Peter Siegmund
|
83461cb120
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 10:53:55 +02:00 |
|
|
Peter Siegmund
|
dc1e1b8c54
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-08-12 10:53:48 +02:00 |
|
|
Peter Siegmund
|
9a6e5e6fbc
|
Merge branch 'ubilabs--rcapp--master' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--master
|
2015-08-12 10:53:18 +02:00 |
|
|
Peter Siegmund
|
dc09162343
|
&& was correct - fixed it back
|
2015-08-12 10:52:51 +02:00 |
|
|
Peter Siegmund
|
0143d24e2c
|
fixed popup normal color
|
2015-08-12 10:34:53 +02:00 |
|
|
Bennet Brunsen
|
26646a5afc
|
Merge branch 'ubilabs--rcapp--feature--phone-login' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--feature--phone-login
|
2015-08-12 09:46:50 +02:00 |
|
|
Bennet Brunsen
|
ce52f3112a
|
Changed pop up menu style again to match light theme
|
2015-08-12 09:46:40 +02:00 |
|
|
Peter Siegmund
|
403378f2a6
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 09:22:30 +02:00 |
|
|
Peter Siegmund
|
22a145b23e
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-08-12 09:22:15 +02:00 |
|
|
Peter Siegmund
|
95e0ad5d4d
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-08-12 09:21:57 +02:00 |
|
|
Peter Siegmund
|
d845bc3743
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-12 09:21:50 +02:00 |
|
|
Peter Siegmund
|
c4c91739e2
|
wrong comparison (&& instead of ||)
|
2015-08-12 09:20:41 +02:00 |
|
|
Axel Uhl
|
11c772741d
|
bug 3206: when no tracked race is attached to a race column / fleet yet, let /sailingservice/rc/marks return the marks defined in the race logs
|
2015-08-12 07:13:32 +02:00 |
|
|
Axel Uhl
|
18519b959d
|
add mark tracks to the tracked race when a DefineMark event or device mapping events are found, also when starting tracking for existing logs
|
2015-08-12 06:56:18 +02:00 |
|
|
Axel Uhl
|
a367f10991
|
sort event names in event list picker
|
2015-08-12 05:12:19 +02:00 |
|
|
Axel Uhl
|
fa19e280cf
|
relating to bug 3207, trim the regatta name to avoid trailing blanks
|
2015-08-12 05:11:55 +02:00 |
|
|
Axel Uhl
|
cd83623664
|
removed empty lines and redundant comments
|
2015-08-12 05:10:15 +02:00 |
|
|
Axel Uhl
|
c9bfe0e703
|
removed empty lines
|
2015-08-12 05:09:40 +02:00 |
|
|
Axel Uhl
|
eb9562f015
|
removed GWT.debugger() statement again
|
2015-08-11 20:43:30 +02:00 |
|
|
Axel Uhl
|
f86f40fca3
|
use a SuggestBox for boat class entry
|
2015-08-11 20:42:35 +02:00 |
|
|
Axel Uhl
|
f357cceb4e
|
use suggest values also for default suggestions in string liste editor
|
2015-08-11 20:19:56 +02:00 |
|
|
Axel Uhl
|
b2bcb93756
|
sort TracTrac connections drop-down list
|
2015-08-11 19:05:06 +02:00 |
|
|
Axel Uhl
|
17549b42b0
|
Merge branch 'ubilabs--rcapp--master'
|
2015-08-11 18:51:24 +02:00 |
|
|
Bennet Brunsen
|
2074dcd0a4
|
Merge branch 'ubilabs--rcapp--feature--phone-login' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--feature--phone-login
|
2015-08-11 17:55:25 +02:00 |
|
|
Bennet Brunsen
|
44f2b2a8be
|
Changed pop up menu style to match light theme
|
2015-08-11 17:47:29 +02:00 |
|
|
Peter Siegmund
|
16f8c6bed5
|
tablet portrait (login) is same as landscape - it's okay with that layout
|
2015-08-11 16:52:39 +02:00 |
|
|
Peter Siegmund
|
077042ac30
|
changed layout folder (from sw600dp to w900dp) for tablets
|
2015-08-11 16:34:02 +02:00 |
|
|
Peter Siegmund
|
8995fda313
|
login screen for phone layout (portrait) should be finished
|
2015-08-11 12:26:43 +02:00 |
|
|
Bennet Brunsen
|
a690c90fdb
|
Fixes configuration loader not working after screen rotation
|
2015-08-11 10:39:03 +02:00 |
|
|
Peter Siegmund
|
a7a7489e65
|
login screen for phone and tablet
|
2015-08-10 16:34:47 +02:00 |
|
|
EC2 Server
|
784f84e412
|
Merge remote-tracking branch 'origin/bug3197'
|
2015-08-10 07:58:37 +00:00 |
|
|
EC2 Server
|
44e8536ac4
|
added ANDROID_HOME to profile.d/sailing.sh script
|
2015-08-10 07:33:02 +00:00 |
|
|
Peter Siegmund
|
a9afece0c8
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-08-10 08:54:26 +02:00 |
|
|
Peter Siegmund
|
b3634fb3a2
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-10 08:54:18 +02:00 |
|
|
Axel Uhl
|
500b862648
|
Merge remote-tracking branch 'server/master'
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
|
2015-08-09 21:18:16 +02:00 |
|
|
Axel Uhl
|
0d9fe33fd3
|
addressing old JAM comment https://jam4.sapjam.com/feed/item/dORLcyW40KB8lB8vd5PZpo;
Score corrections are since ages keyed by the competitor ID, not by the competitor name anymore.
Removed the corresponding migration code.
|
2015-08-09 20:54:07 +02:00 |
|
|
Axel Uhl
|
cc5ec15cde
|
added new TracTrac Javadoc files
|
2015-08-09 20:37:53 +02:00 |
|
|
Axel Uhl
|
0671c2bb94
|
fixing bug 3197 by using UUID.randomUUID() for WaypointImpl instead of a sequential counter
|
2015-08-09 16:09:00 +02:00 |
|
|
Axel Uhl
|
16525176ba
|
fixed TrackedRaceImpl.getTrackingTimesFromRaceLog so that it returns null when no event is found in log
|
2015-08-09 15:49:27 +02:00 |
|