Axel Uhl
7216a8cee5
Merge branch 'master' into bug2851
2016-01-13 09:52:31 +01:00
Axel Uhl
1830f17cc5
Merge branch 'android-maven-build-bug3190'
2016-01-13 09:48:32 +01:00
Axel Uhl
5650c97a51
consolidated imports to remove warnings
...
Change-Id: Ibba9a42165dc0baaf6fb76986ad0c0de6c4a6587
2016-01-13 09:47:09 +01:00
Axel Uhl
e6fef6c04f
Merge branch 'master' into bug2851
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
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
Change-Id: Ifd8c60c6f7d2d2274a68681607a1b5df7b4040b7
2016-01-13 09:39:02 +01:00
Axel Uhl
74ada427fe
also enable live mode regardless the time point of the newest tracking event; disable live mode after endOfTracking has passed
2016-01-12 21:34:16 +01:00
Jonas Dann
256ee81c1b
Solved some problems related to the timeSlider documented in bug 3416
2016-01-12 20:30:47 +01:00
Axel Uhl
a08dc8f121
Merge remote-tracking branch 'server/master'
2016-01-12 18:18:58 +01:00
Axel Uhl
ee2eb970ec
call updated(TimePoint) on a DynamicTrackedRaceImpl for mark fixes which are now assumed to be restricted to the race's tracking duration
...
Change-Id: I8e2ad31d5480922268acf191cc9d1b5f4540f7a3
2016-01-12 18:14:31 +01:00
Bennet Brunsen
5194b02d0e
Fixes gradle build issues in race manager app
2016-01-12 18:07:09 +01:00
Bennet Brunsen
cd0cdddcb1
Fixes grade build error for tracking app
2016-01-12 17:56:52 +01:00
Bennet Brunsen
2b40b94fc8
Use constants in tracking app database helper
2016-01-12 17:35:50 +01:00
Bennet Brunsen
a036e7ee54
Fixes build error in race manager app
2016-01-12 17:10:46 +01:00
Bennet Brunsen
690cc8eb99
Fixed additional lint warnings in database helper
2016-01-12 15:52:01 +01:00
Bennet Brunsen
80efda3022
Remove some lint warnings
2016-01-12 15:44:20 +01:00
Bennet Brunsen
519b14d17d
Fix filename related build error
2016-01-12 15:27:56 +01:00
Bennet Brunsen
4d4c089290
Null check for database cursors in Database helper
2016-01-12 15:27:13 +01:00
Bennet Brunsen
f6270e97f5
Updated gradle version in build
2016-01-12 14:51:39 +01:00
Bennet Brunsen
b00e275e04
Fix gradle build by excluding test libraries for tracking and buoy tender app
2016-01-12 14:44:24 +01:00
Bennet Brunsen
ba5a5a2b98
Merge branch 'master' into ubilabs--tracking_app--develop
2016-01-12 14:36:25 +01:00
Jonas Dann
98fb0ba967
Link of Configure Races on Server pointed to wrong page
2016-01-12 11:52:27 +00:00
Axel Uhl
0217ae7c03
Merge remote-tracking branch 'server/android-maven-build-bug3190' into android-maven-build-bug3190
2016-01-12 12:48:44 +01:00
Axel Uhl
3917060c1a
Merge branch 'master' into android-maven-build-bug3190
...
Conflicts:
java/pom.xml
Change-Id: I8707442d05979fcd8e0a8be0b593ee3e94a513d3
2016-01-12 12:47:30 +01:00
Axel Uhl
ccc71c426a
Merge remote-tracking branch 'server/master'
2016-01-12 09:57:53 +01:00
Axel Uhl
f91153d93c
cleaned up the ClientUtils implementation and removed unused OAuth cruft; removed GWT dependency from com.sap.sse.security;
...
removed RemoteServiceServlet superclass from SecurityServiceImpl; why was it there? The GWT RPC is implemented by
UserManagementServiceImpl
Change-Id: Ifc2e1f848b9fb5d7f24398a0497d301b037a822e
2016-01-12 09:43:07 +01:00
Axel Uhl
4e0c3f7073
providing update feature for additional User properties in SecurityService and UserManagementService
...
Change-Id: I46a4c2c58e35595dc20b85575a27c1cfbd639592
2016-01-12 09:28:23 +01:00
Axel Uhl
fb3f74d297
added fields fullName and company to User
...
Change-Id: I831b2a229c29081aab8f79174caa8d1900303b67
2016-01-12 09:13:01 +01:00
Axel Uhl
bfb9ecb9b5
using java.net.URLEncoder.encode to encode UUID parameter to startToReplicateFrom method
...
Change-Id: I6af165b62a09fbd28d59830b3bf910ab34f985e7
2016-01-11 21:43:58 +01:00
Axel Uhl
f12f3d5f82
also using StringEscapeUtils.escapeHtml to escape competitor ID in exception/error message to avoid XSS attack
...
Change-Id: I9c70c02682dcac23238251faa13e0e4a2cc83ea5
2016-01-11 21:38:25 +01:00
Axel Uhl
b885e975dc
using another SafeHtmlUtils.fromString to escape a string to avoid XSS attacks
...
Change-Id: Ib90b5cfcf180f3643ef0eb1f9e49df9a792daf9c
2016-01-11 21:35:16 +01:00
Simon Pamies
8592d48155
Merge remote-tracking branch 'origin/master' into gc32-changes
2016-01-11 16:37:07 +01:00
Axel Uhl
4332497ac9
Updated fortify (markdown)
2016-01-11 13:26:20 +00:00
Axel Uhl
9ea2777da7
Merge remote-tracking branch 'server/master'
2016-01-11 14:11:05 +01:00
Axel Uhl
c22dc1f0c3
Created fortify (markdown)
2016-01-11 13:05:43 +00:00
Simon Pamies
c1f870082e
Added new high point scoring schemes for GC32 scoring based on NOR 1.5 from October 2015
2016-01-11 14:04:22 +01:00
Axel Uhl
19c8ef792d
Using a safeClose method in abstract super class HttpRequest
...
Change-Id: I16a66858b6f413aafad19025ed0f7ec973208ed1
2016-01-11 13:54:31 +01:00
Axel Uhl
c18df38916
catch IOException during close in finally
...
Change-Id: Ia199b13d9669ee4397a3f494031efa4aaa318287
2016-01-11 13:49:10 +01:00
Axel Uhl
40ddcab65e
Added link to new Fortify security scans document to Wiki home
2016-01-11 12:03:25 +00:00
Axel Uhl
571f113c0d
consolidate import to clear warnings
...
Change-Id: I642af7b17622b0c823ae6baa10e0203ca59dbed6
2016-01-11 12:59:54 +01:00
Axel Uhl
6797656bd8
releasing camera also in onStop and onDestroy
...
Change-Id: I26887b13f742b38353461937fa73cf0234c226be
2016-01-11 12:57:23 +01:00
Axel Uhl
1c41fd8ef1
moved close() call into finally clause
...
Change-Id: I9802c78c0a21252a4b43a9fe7e3096656b18dee8
2016-01-11 12:42:00 +01:00
Simon Pamies
e790410b63
Merge branch 'master' into gc32-changes
2016-01-11 10:41:13 +01:00
Axel Uhl
c061ad0c41
removed redundant comments in AnalyticsProvider
...
Change-Id: I823d0306becac831b0ae093154ba570c24274b16
2016-01-11 09:50:43 +01:00
Axel Uhl
4a7242df2e
replaced two more string concatenations in DatabaseHelper by ? and selectionArgs usage
...
Change-Id: I337277d604f9f28020db3fe41029cd551e293c6f
2016-01-11 09:43:10 +01:00
Axel Uhl
ef3be27867
using ? query args in DatabaseHelper
...
Change-Id: I83f6a878d34196ba4f31fbbd2149cc547beed8ef
2016-01-11 09:41:13 +01:00
Axel Uhl
9a208d9105
removed redundant comments; enhanced logging by the exception
...
Change-Id: Id975b1134d3ff74d3fcb0202b642d32c2c29e255
2016-01-11 09:31:34 +01:00
Axel Uhl
d4b2b34de3
omit exception message from log
...
Change-Id: Ic60cb62452376d20fda6a41e55e114cbe97f7cf9
2016-01-08 22:53:13 +01:00
Axel Uhl
47febe3d8c
replaced e.printStackTrace by reasonable logging
...
Change-Id: Iead1364cf8438c88780621d93856b628d54c67ac
2016-01-08 22:49:38 +01:00
Axel Uhl
09a9eea119
avoid log forging
...
Change-Id: I449954fb97a7debdad0a311d8c434678140c287a
2016-01-08 22:28:46 +01:00
Axel Uhl
aeb61b9dfe
replaced e.printStackTrace() by proper logging statements
...
Change-Id: Ica5f8fac6fd7616126d546041b83669bc6a9fe36
2016-01-08 16:42:59 +01:00
Axel Uhl
95198ef094
replaced printStackTrace() by proper logging
...
Change-Id: I69ddb3f2284295ca079e6417204e09f711db466c
2016-01-08 16:30:51 +01:00