 Benjamin Barth
|
006ff3b0f0
|
Merge branch 'design2015-competition' into design2015
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
|
2015-08-14 10:34:36 +02:00 |
|
 Axel Uhl
|
e72e59ee0c
|
removed commented code
|
2015-08-13 17:34:47 +02:00 |
|
|
Axel Uhl
|
0fbe9da733
|
Merge branch 'master' into ubilabs--tracking_app--master
|
2015-08-13 17:19:57 +02:00 |
|
|
Benjamin Barth
|
494db9a8a4
|
Integrated series info in mobile event list
|
2015-08-13 16:40:52 +02:00 |
|
|
Benjamin Barth
|
b64bd5c563
|
Added partial for mobile series info
|
2015-08-13 16:37:58 +02:00 |
|
|
Axel Uhl
|
edd86f0f74
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3204'
|
2015-08-13 15:41:24 +02:00 |
|
 Bennet Brunsen
|
496a53b752
|
Removed warning
|
2015-08-13 15:12:45 +02:00 |
|
|
Bennet Brunsen
|
7547a315f7
|
Use target api instead of new api
|
2015-08-13 15:11:56 +02:00 |
|
 Simon Pamies
|
15dce614f1
|
Added number of wind and gps fixes per race to XML export
|
2015-08-13 15:03:02 +02:00 |
|
|
Bennet Brunsen
|
e7f985eb38
|
Commented code resposible for tracking lock
|
2015-08-13 14:54:17 +02:00 |
|
|
Simon Pamies
|
9869bd684c
|
Refactored WindStatusServlet into two sub classes that deliver HTML and Json
|
2015-08-13 13:26:37 +02:00 |
|
|
Benjamin Barth
|
bfe631d338
|
Adjusted browser event consumption in PlaceNavigation
|
2015-08-13 12:06:29 +02:00 |
|
|
Benjamin Barth
|
f9cfaba032
|
Added String messages for series event info
|
2015-08-13 11:57:23 +02:00 |
|
 Peter Siegmund
|
fab658450a
|
return also in By-Course (not 100% implemented, but if the setting is wrong)
|
2015-08-13 11:42:22 +02:00 |
|
|
Benjamin Barth
|
01734587b4
|
Integrated series info corner in event list
|
2015-08-13 11:41:26 +02:00 |
|
|
Peter Siegmund
|
91a30b62ab
|
back from By-Marks Course Designer while race setup
|
2015-08-13 11:38:44 +02:00 |
|
|
Benjamin Barth
|
02e8f64ebf
|
Refactored EventDTO structure
|
2015-08-13 11:29:22 +02:00 |
|
|
Benjamin Barth
|
39b9f10368
|
Extended EventTeaser to use series info corner
|
2015-08-13 11:26:58 +02:00 |
|
|
Benjamin Barth
|
946f2eff94
|
Added partial for series info corner
|
2015-08-13 11:23:29 +02:00 |
|
|
Peter Siegmund
|
957fe53224
|
Bug 3204 - Lollipop protest time chooser
|
2015-08-13 11:21:29 +02:00 |
|
|
Bennet Brunsen
|
915e6b1b6f
|
Merge branch 'ubilabs--tracking_app--master' into ubilabs--tracking_app--develop
|
2015-08-13 10:40:15 +02:00 |
|
|
Bennet Brunsen
|
db8cf16232
|
Merge branch 'master' into ubilabs--tracking_app--master
|
2015-08-13 10:39:37 +02:00 |
|
|
Axel Uhl
|
728f06e4c4
|
made invitational text somewhat clearer, mentioning that the app must be installed first
|
2015-08-13 06:18:25 +02:00 |
|
|
Axel Uhl
|
d288da88e6
|
added logging when removing race log from DB
|
2015-08-13 05:54:44 +02:00 |
|
|
Axel Uhl
|
8ea379d678
|
aftermath for commit 022e83a979, bug 3217;
no need to escape device configuration identifier; it is already unescaped by the servlet
when receiving it
|
2015-08-13 05:41:20 +02:00 |
|
|
Axel Uhl
|
bfcc02f34e
|
fix for bug 3218: NPE when mark positions are not known;
in this case, if the next mark determining the leg bearing is not known, an NPE resulted
|
2015-08-13 05:33:43 +02:00 |
|
|
Axel Uhl
|
d652c5c884
|
fixing empty boat class field in competitor edit dialog
|
2015-08-13 00:01:35 +02:00 |
|
|
Axel Uhl
|
022e83a979
|
emergency fix for bug 3217: no longer escape parameters; they are passed to UrlHelper where they get escaped
|
2015-08-12 22:34:06 +02:00 |
|
|
Axel Uhl
|
beab5ecdb3
|
Merge branch 'ubilabs--rcapp--master'
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java
|
2015-08-12 20:31:06 +02:00 |
|
|
Axel Uhl
|
6484bfa5fe
|
fixing warnings in LoginBackgrop
|
2015-08-12 20:28:20 +02:00 |
|
|
Peter Siegmund
|
4a5bc79cd4
|
Removed warning (sorry for the @SuppressWarnings("unchecked") in LoginBackdrop - it's because of the usage of reflection)
|
2015-08-12 20:12:36 +02:00 |
|
|
Axel Uhl
|
4b6cdaa724
|
trying to fix tick mark issue when moving a RaceBoard to live mode with no good timing initialization
|
2015-08-12 18:56:08 +02:00 |
|
|
Axel Uhl
|
755af55d0a
|
avoid redraw when no coordinate system change affects a map that is already shown
|
2015-08-12 18:11:26 +02:00 |
|
|
Bennet Brunsen
|
91cf5d7c73
|
Moved marker service start up to oncreate method
|
2015-08-12 18:03:03 +02:00 |
|
|
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
|
37c70f7c88
|
Merge branch 'ubilabs--tracking_app--develop' into ubilabs--tracking_app--master
|
2015-08-12 14:43:50 +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 |
|
|
Benjamin Barth
|
ec974ddf52
|
Added calculation of event series metadata for event list
|
2015-08-12 13:52:34 +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 |
|
|
Benjamin Barth
|
421d5ca0ae
|
Refactored EventDTO structure
|
2015-08-12 12:14:00 +02:00 |
|
|
Benjamin Barth
|
8d92eac8db
|
Added DTO structure for EventSeries
|
2015-08-12 12:10:44 +02:00 |
|
|
Peter Siegmund
|
83461cb120
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 10:53:55 +02:00 |
|