Commit Graph
31055 Commits
Author SHA1 Message Date
Papick Garcia Taboada 6527662596 Fixed box and icon, bug 3454 2016-02-08 14:16:06 +01:00
Papick Garcia Taboada a93ed785db Merge commit '34c28b37d6fe75cd25591015c4f0828912ae9054' into bug-3454 2016-02-08 11:07:04 +01:00
Charlotte Pröller 9c8e37e733 reverted some formatting 2016-02-06 16:56:28 +01:00
Benjamin Barth 34c28b37d6 Fixed Acceleration factor text field size 2016-02-05 18:18:45 +01:00
Axel Uhl dec63406fb bug3422: extracted common transition handling parts into CanvasOverlayV3 and now also use it in CourseMarkOverlay
Change-Id: I284c2c25a40ccd3285c4695cb9bb32a7d218cf70
2016-02-05 15:09:47 +01:00
Peter Siegmund 67edcbc101 new icons SAP Sailing inSight iOS 2016-02-05 12:29:33 +01:00
Axel Uhl ac9e60eda7 minor refactoring of ManeuverColor, using single point of exit pattern
Change-Id: I78e401c0dc189c216a1c1a0149a688d21092c275
2016-02-05 11:56:15 +01:00
Axel Uhl 78d5b65b85 slighly improved release notes
Change-Id: Ie6e1dda0944b43895e4fd679f83343451d33f20d
2016-02-05 11:41:01 +01:00
Axel Uhl 1a4d6f8b27 Merge branch 'master' into bug778
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/SailingAnalyticsNotes.html

Change-Id: I4452a526ac2470cb8423e2f2473823572ae97103
2016-02-05 11:38:54 +01:00
Axel Uhl 8e9f59bd03 Merge branch 'ubilabs--rcapp--bug-3077' into ubilabs--rcapp--develop 2016-02-05 11:02:46 +01:00
Axel Uhl ff1bd7a2d4 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3077' into ubilabs--rcapp--bug-3077 2016-02-05 11:00:08 +01:00
Peter Siegmund 473997c663 Merge branch 'ubilabs--rcapp--bug-2760' into ubilabs--rcapp--develop 2016-02-05 10:35:38 +01:00
Peter Siegmund dc0eacf1b2 new app icons 2016-02-05 10:32:42 +01:00
Peter Siegmund 7b0376b94b fixed app names 2016-02-05 09:33:44 +01:00
Axel Uhl 265dc12620 Merge branch 'master' into ubilabs--rcapp--bug-3077
Change-Id: Idd08104ad56ab1e5c17770772d55ff4cc465c988
CR-Id: 012006153200000679212016
2016-02-04 23:24:02 +01:00
Axel Uhl 2548aed407 Merge branch 'master' into ubilabs--rcapp--bug-3077 2016-02-04 23:20:49 +01:00
Axel Uhl 38644b972d Merge branch 'master' into ubilabs--rcapp--bug-2760 2016-02-04 22:12:50 +01:00
Peter Siegmund 6dd793da76 only one EULA accept at startup 2016-02-04 17:13:35 +01:00
Axel Uhl fefd69cc4f Merge remote-tracking branch 'server/master' 2016-02-04 17:09:19 +01:00
Axel Uhl 3b8127dd08 fixed typo in method name
Change-Id: I2450527864a1be9dfcd35326a17bcdb292a095e6
2016-02-04 17:06:45 +01:00
Axel Uhl 56832ae6e8 Merge branch 'archive-hotfix' 2016-02-04 16:58:19 +01:00
Axel Uhl e0766e5246 reduced race times panel margins to 3min before and 1min after race
Change-Id: Iadf8ce656ac39426525b5026cd6f4e178af9343e
2016-02-04 16:57:46 +01:00
Peter Siegmund e01406b400 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3077 2016-02-04 16:54:37 +01:00
Peter Siegmund fb80acbcf7 Merge branch 'master' into ubilabs--rcapp--develop 2016-02-04 16:54:29 +01:00
Peter Siegmund a31f6ed2cc correct layout for photo list 2016-02-04 16:53:57 +01:00
Steffen Schäfer 07795c9f44 Added additional information regarding user management changes to
release_notes_admin.html
2016-02-04 16:15:54 +01:00
Axel Uhl 320d0c84e5 Merge remote-tracking branch 'server/master' 2016-02-04 16:08:09 +01:00
Axel Uhl c4a9e48bb5 fixed synchronization bug regarding leaderboard list in leaderboard group;
the issue was related to the syncGroupsAfterLeaderboardChange method which was based on the assumption that there may be
changes in Leaderboard Java object identity while still meaning the same leaderboard. This would have forced a replacement
of listeners and an update of the leaderboards list in the LeaderboardGroup. Furthermore, LeaderboardGroup used to refer to
the leaderboard by name in the database. This forced an update to the persistent copy of the leaderboard group when the
leaderboard's name changed. Today, this link is based on a MongoDB ObjectId, so no update of the leaderboard group is
necessary any more.

The root cause was a threading issue: iterating over a copy of the leaderboards list of the leaderboard group, then
looking for the old position of the leaderboard in that list, then removing it, then adding it again at the old index.
If this is not atomically locked (which it used to be up to commit 118f03fbb5 when
coarse-grained synchronization was replaced by more fine-grained locking inside the LeaderboardGroupImpl methods) then
one of two concurrent removals for the same leaderboard may not find the leaderboard anymore, yet the second add is
carried out, leading to a duplication; or the first thread gets the index before the second thread removes; then
the first thread adds at an incorrect index.

Change-Id: Ib47ba715c77221fa353fa4669662e5f48d8e5857
2016-02-04 16:01:11 +01:00
Peter Siegmund c52e5a3219 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3077 2016-02-04 15:54:56 +01:00
Peter Siegmund 90951b07fc Merge branch 'master' into ubilabs--rcapp--develop 2016-02-04 15:54:24 +01:00
Peter Siegmund 79475221e5 adjust size of draggable race list item - for better handling 2016-02-04 15:53:33 +01:00
Papick Garcia Taboada 00db5835c3 Merge commit '48b117711f2c6080247a1843a3e776515fc4052c'
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopActivityMapper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopPlacesNavigator.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ApplicationHistoryMapper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/PlaceTokenPrefixes.java
2016-02-04 15:42:17 +01:00
Papick Garcia Taboada 78c972c798 Merge commit 'b680c0baf7b6cca73470b5d6214b961bd43e60cd' into legal-disclosure 2016-02-04 15:11:31 +01:00
Papick Garcia Taboada 19b4bde710 Added components and licenses to imprint 2016-02-04 15:10:48 +01:00
Teresa Holfeld c05c2bba61 Rename string 2016-02-04 14:36:07 +01:00
Teresa Holfeld 86649e102c Corrected spelling mistake 2016-02-04 14:31:47 +01:00
Peter Siegmund b55fe624b3 notification has no separate number 2016-02-04 13:54:14 +01:00
Peter Siegmund 41a32ccfe1 fixed small tablets (7") in landscape 2016-02-04 13:53:25 +01:00
Benjamin Barth 48b117711f Fixed UserManagement setup to ensure callback methods can be handle
correctly
2016-02-04 13:44:43 +01:00
Teresa Holfeld bc8cc02e31 Refactoring: improving code quality, readability 2016-02-04 12:52:03 +01:00
Teresa Holfeld f475073a2f Layout refactorings: remove unessary view, add margin 2016-02-04 12:35:14 +01:00
Teresa Holfeld d7cbe22d44 Add detail text for more explanation 2016-02-04 11:46:40 +01:00
Peter Siegmund b01248495a Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3077 2016-02-04 11:43:52 +01:00
Peter Siegmund ecb708135d Merge branch 'master' into ubilabs--rcapp--develop 2016-02-04 11:43:24 +01:00
Peter Siegmund 4fdf6ad6c3 replace kn with kts (in engl. language) 2016-02-04 11:41:49 +01:00
Peter Siegmund 81f9a36d10 show additional update information after sync, if installed from a known store (Google PlayStore, Amazon App Store, Galaxy Apps) 2016-02-04 11:41:15 +01:00
Teresa Holfeld 8f060e42d4 Remove accuracy of old buoy 2016-02-04 11:30:51 +01:00
Teresa Holfeld 10769287df Remove longitude and latitude fields 2016-02-04 11:16:51 +01:00
Benjamin Barth 3f05521094 Merge remote-tracking branch 'origin/master' into design2015 2016-02-04 11:02:22 +01:00
Benjamin Barth bcb1936944 Added JavaDoc to FlyoutAuthenticationPresenter class 2016-02-04 11:00:05 +01:00