Files
sailing-analytics/java/com.sap.sailing.domain.common
Papick Garcia Taboada 1504cd0bb7 Merge commit 'd21d6ae84566964e31112c9be830398006ddc934' into design2015-media
* commit 'd21d6ae84566964e31112c9be830398006ddc934': (522 commits)
  Adapted Util for Iterable realated stuff in HomeService
  use PassingInstruction.None during TracTrac control point construction
  fixing SwissTimingAdapter DomainFactoryImpl which now has to use PassingInstruction.None to produce equal ControlPoint/PassingInstruction pairs
  trying to fix bug 2860 by first obtaining the course read lock before obtaining the mark passing lock
  Adapted current version of footer styling
  Adapted current version of social footer styling
  Adapted current version of main.gss
  fixing bug 2847 by issuing a UUID for new GateDTO objects already in the client-side editor thanks to Lennart's fix allowing us to issue random UUIDs on the client
  fixing bug 2858 by comparing ControlPoint *and* PassingInstruction
  fixed name for copied course
  added some null-safety to CandidateFinderImpl; see also bug 2857
  some aftermath to bug 2846, factoring the race log analysis of the "from" race log out of the loop that copies it to the other race logs
  Fixes broken build and bug 2684
  Fixes bug2684
  Fixes bug 2846
  Adapted styling of the current design for solutions page
  Fixed search icon styling
  Implemented current desing of socialFooter
  - Added filter logic to exclude media tracks not related to the scope of the current master data export. - Extended tests.
  Fix to implement sticky footer
  ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/HomeServiceImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2015-05-20 00:08:50 +02:00
..
…