Commit Graph
29699 Commits
Author SHA1 Message Date
Jan Broß 15ce858eb7 Fixes bug in competitorRegistrationDialog 2016-01-22 13:47:23 +01:00
Axel Uhl b81e6742e5 re-added version to TracAPI's pom.xml
Change-Id: Ia234e07f754324801f072a4181e84859bfa7948d
2016-01-21 16:47:34 +01:00
Axel Uhl 1d93baa62c upgraded TracAPI from 3.1.1 to 3.1.2, hoping to ultimately fix the deadlock upon terminating a subscription and stopping a subscriber
Change-Id: I82c5cb7fbaa9ab9f3b475245d96b35500dd3248f
2016-01-21 14:40:19 +01:00
Charlotte Proeller d011a205e9 Updated onboarding (markdown) 2016-01-20 12:19:55 +00:00
Simon Pamies c777b25a96 Merge remote-tracking branch 'origin/gc32-changes' 2016-01-19 17:47:01 +01:00
Fredrik Teschke e8cac5d44f fix path of REST API description 2016-01-19 09:33:56 +00:00
Axel Uhl 563a282b73 fixed message strings explaining soring schemes for ESS / 12
Change-Id: Ia8d076dbc49fb21c269789185cf00d9c6cf89f9f
2016-01-18 18:33:38 +01:00
Axel Uhl a23387bacd fixed ordering in BoatClassMasterdata
Change-Id: I8fc0fe40ca99e89137d6d2a3754ec14595bba298
2016-01-18 18:25:45 +01:00
Charlotte Proeller 66d68161b0 Updated onboarding (markdown) 2016-01-18 17:25:06 +00:00
Axel Uhl b5e60a0417 factored out commonalities between ESS High Point scoring schemes for act leaderboards
Change-Id: I962f12756e1667a53c533bdd95c0f6757cf29349
2016-01-18 18:24:01 +01:00
Axel Uhl 11132b9fa2 factored out commonalities between the two different ESS HighPoint overall scoring schemes
Change-Id: Iebaf853057056aad271bc20868d6f08323ea31b4
2016-01-18 18:19:45 +01:00
Axel Uhl ba9a19c7c6 re-format and comment change only
Change-Id: I447224e1cc21eef1034f40665f135b0ec800adf8
2016-01-18 17:51:51 +01:00
Axel Uhl b488c2608f Merge branch 'master' into gc32-changes 2016-01-18 17:14:00 +01:00
Axel Uhl 0fffbe7869 upgraded TracAPI version also in pom.xml
Change-Id: I25e689f8460f12919c37f9798709fdfae03f61a3
2016-01-18 17:06:41 +01:00
Axel Uhl 1891a5562b upgraded TracAPI to version 3.1.1; this should resolve the timeouts during unsubscribe
Change-Id: I7ffa172214d76938258890285b8af4fb48a1028e
2016-01-18 16:58:54 +01:00
Jonas Dann 67e5e98b5c Merge branch 'master' into bug3416 2016-01-13 19:01:27 +01:00
Jonas Dann fae4768cd8 Tested and seems to work 2016-01-13 18:59:29 +01:00
Jonas Dann ea14b195ed deleted extension time for race start was in the past. Forgot that before 2016-01-13 16:49:24 +01:00
Jonas Dann abb6f210ba Did the todos in RaceTimesCalculationUtil 2016-01-13 14:14:50 +01:00
Axel Uhl 803c91dd78 fixed position of race filter text box in TracTracEventManagementPanel
Change-Id: Ic7c8599f383184ac73775b48bb6431343b549277
2016-01-13 12:09:15 +01:00
Axel Uhl 1830f17cc5 Merge branch 'android-maven-build-bug3190' 2016-01-13 09:48:32 +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
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