Commit Graph
100 Commits
Author SHA1 Message Date
Jens Rommel 9121aae063 Merge branch 'external/master' 2014-07-25 11:24:07 +02:00
Jens Rommel 78eac0ef94 Merge remote-tracking branch 'external/master' into dev
Added MimeType.byName() to avoid handling of valueOf's IllegalArgumentException. Returning null instead for unsupported MimeType names.
2014-07-24 09:36:02 +02:00
Jens Rommel 71825588eb Added patch to hide prev/next buttons on the events swiper when there's only one event. 2014-07-20 09:01:43 +02:00
Jens Rommel 36a01ccba3 Added event handling to show/hide prev/next buttons when sliding in non-loop mode 2014-07-18 15:40:02 +02:00
Jens Rommel 31deb663d7 Added more information to duplicate key exception to track down Bug 2074 2014-07-18 12:29:57 +02:00
Jens Rommel 6965e27765 Added i18n for countdown 2014-07-18 12:02:19 +02:00
Jens Rommel 02a5b26c01 Removed redundant import causing a warning. 2014-07-17 19:46:21 +02:00
Jens Rommel 4ba92a78dc Improved Countdown, added test. 2014-07-17 09:30:09 +02:00
Jens Rommel 12b6edc873 Workaround for the countdown update bug caused by Swiper's cloning:
- switch off loop mode for Swiper --> no cloning --> reliable updates
2014-07-16 20:35:45 +02:00
Jens Rommel d15779b459 Merge remote-tracking branch 'refs/remotes/external/newhome' into jens--event-countdown 2014-07-16 20:11:30 +02:00
Jens Rommel 0600c18506 Ported Countdown behavior to GWT.
Still open:
- ugly issue with Swiper cloning the event stages, making all countdown updates go to nirvana
- i18n of time units (DAYS --> Tage)
- plural/singular of time units
2014-07-16 20:10:42 +02:00
Jens Rommel 8765d7c6de Successfully ported Youtube video embedding. 2014-07-16 13:22:12 +02:00
Jens Rommel 6ee1305c81 Removed a confusingly commented line of code. 2014-07-15 09:16:55 +02:00
Jens Rommel c372147c1e Fixed last remaing issue, no supporting different resolutions 2014-07-11 14:17:36 +02:00
Jens Rommel 335000e2a4 Solved issue with wrongly positioned prev/next buttons (adding missing "position: relative")
Still open: handling of differently sized images
2014-07-11 13:05:28 +02:00
Jens Rommel 4473a4a0e4 Fixed ugly padding and centering issues.
Introduced new issue with prev/next buttons.
2014-07-11 09:35:32 +02:00
Jens Rommel 0da4f4a2cc Merge remote-tracking branch 'refs/remotes/external/newhome' into jens--swipe-gallery+play-video 2014-07-10 17:12:28 +02:00
Jens Rommel ff7575f06b Merge remote-tracking branch 'refs/remotes/external/master' into newhome 2014-07-10 17:12:08 +02:00
Jens Rommel 24de9384a0 Swiper is working, though still layout issues:
- not centered
- strange padding at left side
2014-07-10 17:10:59 +02:00
Jens Rommel 5827302087 Ported Swiper functionality from JavaScript to GWT 2014-07-09 14:36:12 +02:00
Jens Rommel 006be4017d Fixed bug with duration formatting when number of minutes (h:mm:ss.ms) was zero. 2014-05-19 16:56:52 +02:00
Jens Rommel 346f6931ca Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-23 02:10:15 +01:00
Jens Rommel 989072169f Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-22 23:20:28 +01:00
Jens Rommel 4530ae01c7 Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-22 22:41:47 +01:00
Jens Rommel 71df453414 Fixed constructor mis-use in MasterDataImportTest
--> "test" is not a valid MongoDb objectId and thus not a valid MediaTrackId
2014-02-22 21:33:04 +01:00
Jens Rommel ce28d9ffce Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-21 15:10:17 +01:00
Jens Rommel 05b9c602ce Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-20 17:56:31 +01:00
Jens Rommel 6a75723fa6 Eventually fixed media track importing. Required a major redesign of some media APIs:
- introduced new method MediaDB.insertMediaTrackWithId
- moved import logic into racing event service
2014-02-20 17:03:28 +01:00
Jens Rommel c031a2e38a Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-19 12:40:31 +01:00
Jens Rommel 9d8da37ce9 Added test cases 2014-02-19 10:50:30 +01:00
Jens Rommel bc9d39a282 Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-19 09:21:40 +01:00
Jens Rommel e45e1d60aa Merge remote-tracking branch 'refs/remotes/external/master' into jens--BUG-1778-media-data-importer 2014-02-18 16:37:01 +01:00
Jens Rommel 8fd4b88b5f Merge remote-tracking branch 'refs/remotes/external/master' into jens--gwtbootstrap 2014-02-18 16:34:48 +01:00
Jens Rommel 4b9d91d06c Changed media track import, hoping that it will make it more robust (see bug 1778).
Instead of deleting and re-adding changed tracks, they are no being updated in place.
2014-02-18 15:50:44 +01:00
Jens Rommel f4ee92b17e Removed SNAPSHOT version flag which caused local build problems for me.
See also Lukas' commit history from 26, 27 Nov & 3 Dec
2014-02-18 12:44:26 +01:00
Jens Rommel 9de60bf769 Updated onboarding (markdown) 2014-02-18 10:11:48 +00:00
Jens Rommel a2c27f8866 Updated planning (markdown) 2014-01-24 17:26:35 +00:00
Jens Rommel ccb38f418a Updated planning (markdown) 2014-01-24 17:02:35 +00:00
Jens Rommel 4c57048473 Updated finding a design agency (markdown) 2014-01-13 11:07:19 +00:00
Jens Rommel 6794553a95 Updated finding a design agency (markdown) 2014-01-13 11:04:10 +00:00
Jens Rommel 8a9a137fd7 Updated finding a design agency (markdown) 2014-01-13 10:58:07 +00:00
Jens Rommel 89256557fb Updated smartphonetracking (markdown) 2013-12-05 09:34:17 +00:00
Jens Rommel 523bd55543 Fixed prerequisite checked for Windfix dialog, added check for array not empty. 2013-11-18 15:20:05 +01:00
Jens Rommel fc6a63c1d6 Changed mongo host and tractract tunnel host from hard-wired IP adress of local hudson server to "localhost".
This change became necessary after local hudson server could no longer be used for tunneling.
2013-11-14 13:31:42 +01:00
Jens Rommel a0ad7621c2 Merge remote-tracking branch 'refs/remotes/external/master' into jens--fix-expedition-import-gps-time 2013-11-14 10:03:21 +01:00
Jens Rommel 6280cff8d8 Merge remote-tracking branch 'refs/remotes/external/master' into jens--fix-expedition-import-gps-time 2013-11-13 18:09:48 +01:00
Jens Rommel 04c15f533b Merge remote-tracking branch 'refs/remotes/external/master' into jens--fix-expedition-import-gps-time 2013-11-13 17:53:42 +01:00
Jens Rommel df9445499b - changed time stamp source from UTC (system time) to GPS Time
- replaced hard-wired column numbers by order given by header line
- fixed issue with Excel date conversion. Now settings miliseconds to zero.
2013-11-13 17:53:12 +01:00
Jens Rommel 7c220dd601 Updated smartphonetracking (markdown) 2013-10-29 16:08:07 +01:00
Jens Rommel 5ab39defdf Updated smartphonetracking (markdown) 2013-10-29 16:08:07 +01:00
Jens Rommel 58a104a423 Updated smartphonetracking (markdown) 2013-10-29 16:08:07 +01:00
Jens Rommel 6f3f686c7f Updated smartphonetracking (markdown) 2013-10-29 16:08:06 +01:00
Jens Rommel ef5be15476 Created smartphonetracking (markdown) 2013-10-29 16:08:06 +01:00
Jens Rommel e2a6c5193f Re-converted tabs to space. 2013-10-16 16:11:31 +02:00
Jens Rommel 9ea8066d3f Fixed erronous occurence of SafeHTML in StringMessages 2013-10-16 15:38:48 +02:00
Jens Rommel bdd3961bda Added localisation. 2013-10-15 14:07:47 +02:00
Jens Rommel 36a0fc7e84 Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-10-15 12:36:08 +02:00
Jens Rommel abd3f0dd44 Expanded read-only TrackedRace return type of get*Race() methods to mutable DynamicTrackedRace where appropriate.
According to Axel, the originally intended separation of read-onyl and mutable API via this approach turned out not to be as successful as expected.
2013-10-15 12:27:28 +02:00
Jens Rommel 48a1a6c187 Added seletion-aware wind import 2013-10-15 11:25:40 +02:00
Jens Rommel 9d9c90134c Added missing wrapper class WindImportResult 2013-10-14 17:31:19 +02:00
Jens Rommel 229823303b Added trimming to boat id handling. 2013-10-14 09:59:52 +02:00
Jens Rommel 4128a36882 Slightly enhanced layout.
Still missing: apply wind to selected race(s) only.
2013-10-11 17:55:54 +02:00
Jens Rommel 7f111e2392 Working expedition wind import.
Still missing:
- import for selected subset of races
- UI beautification
2013-10-11 17:05:25 +02:00
Jens Rommel 612700d7f3 Initial working UI, includes parsing and sending boat id .
Still missing:
- apply to selected races only
2013-10-10 12:11:52 +02:00
Jens Rommel 0604091d48 Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-10-09 14:27:12 +02:00
Jens Rommel 6c35fa9122 Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
2013-10-09 12:16:31 +02:00
Jens Rommel 907f9fdc08 Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-10-07 12:36:06 +02:00
Jens Rommel 5d6325ba17 Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-09-25 11:21:11 +02:00
Jens Rommel 68fc6fac76 Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-09-23 16:17:12 +02:00
Jens Rommel 0071e4edae Merge remote-tracking branch 'refs/remotes/external/master' into master-ext 2013-09-19 08:59:30 +02:00
Jens Rommel 959b97ae34 Merge remote-tracking branch 'refs/remotes/external/master' into jens--bug-1521 2013-09-18 17:38:18 +02:00
Jens Rommel 979f87414e Fixed bug 1521. 2013-09-18 17:34:01 +02:00
Jens Rommel 44a2a52a3e Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-09-18 09:02:00 +02:00
Jens Rommel 56e398a943 Adding races affected by wind import to servlet response. 2013-09-18 09:01:32 +02:00
Jens Rommel eb047e4c9e Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-09-13 16:30:09 +02:00
Jens Rommel 2359585691 Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-autoplay 2013-09-13 16:04:52 +02:00
Jens Rommel ced68297ea Added URL parameter "autoSelectMedia" for auto-selection support for media files 2013-09-13 16:04:25 +02:00
Jens Rommel 3ed17d3766 - Made recordWind return a flag wether a wind fix has been considered for a tracked race
- Made Expedition importer tolerant for partially filled rows, collecting partial data until a fix is complete
2013-09-13 09:41:23 +02:00
Jens Rommel 31e98d34cb Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-09-12 11:24:15 +02:00
Jens Rommel f6d089090c Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import 2013-09-11 10:39:57 +02:00
Jens Rommel e3ea28a1c8 Updated sailing webservices (markdown) 2013-08-21 16:28:09 +02:00
Jens Rommel a112e35f90 Fixed but with pausing a player during Window-close caused null-access exception in Javascript due to missing/already cleaned up DOM elements. 2013-07-10 20:39:32 +02:00
Jens Rommel f626db6992 Fixed ugly bug with Youtube videos not being loaded a second time.
Reason was the call sequence which kept the video container panel invisible for the Youtube API.
Changed the sequence making the panel visible before calling the Youtube API.
2013-07-09 16:47:23 +02:00
Jens Rommel a60c6ac660 Fixed ugly bug with Youtube videos not being loaded a second time.
Reason was the call sequence which kept the video container panel invisible for the Youtube API.
Changed the sequence by making the panel visible before calling the Youtube API.
2013-07-09 16:11:13 +02:00
Jens Rommel 9ddae2f591 Added missing bundle to (Proxy) launch config. 2013-07-04 13:27:52 +02:00
Jens Rommel 7822627f8d Merge branch 'refs/heads/jens--media-synch-consolidated' into master-ext 2013-07-04 13:15:38 +02:00
Jens Rommel 78a2b9577e Running version. Known bug: Multiple Youtube videos on the same Raceboard are not yet supported. 2013-07-04 10:56:08 +02:00
Jens Rommel 5d6989d9c5 Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch-consolidated 2013-07-02 13:46:52 +02:00
Jens Rommel 34e3350177 Merge commit '599313c856e9ae22ffa3fd7809b6ce84683879af' into jens--media-synch-consolidated 2013-07-02 13:45:42 +02:00
Jens Rommel 599313c856 Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch.
--> Conflict came to my surprise as I didn't touch any of the conflicting files.

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/utils/FlagAlphabetInterpretationTemplate.java
	java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceLogAnalyzerTest.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/ConfirmedFinishPositioningListFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/FinishPositioningListFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/FinishedTimeFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/FinishingTimeFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/GateLineOpeningTimeFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/IndividualRecallFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/LastPublishedCourseDesignFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/LastWindFixFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/PathfinderFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/RaceStatusAnalyzer.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/StartProcedureTypeAnalyzer.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/analyzing/impl/StartTimeFinder.java
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/EntryPointLinkFactory.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/MediaSelector.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/FlagAlphabetInterpreter.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/FlagImageCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java
	java/com.sap.sailing.www/postrace/normalize.css
	java/com.sap.sailing.www/postrace/post-race-analytics-info.css
	java/com.sap.sailing.www/postrace/post-race-analytics-info.html
	java/com.sap.sailing.www/postrace/sap.ico
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RegattaDataPerRaceAction.java
	java/pom.xml
	mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
	mobile/com.sap.sailing.racecommittee.app/lint.xml
	mobile/com.sap.sailing.racecommittee.app/res/layout/protest_time_view.xml
	mobile/com.sap.sailing.racecommittee.app/res/layout/results_capturing_view.xml
	mobile/com.sap.sailing.racecommittee.app/res/layout/settings_view.xml
	mobile/com.sap.sailing.racecommittee.app/res/layout/wind_view.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/BoatClassType.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignComputer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseLayouts.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/NumberOfRounds.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/PositionedMarkImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/TrapezoidCourseDesignFactoryImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/TrapezoidCourseLayouts.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/WindWardLeeWardCourseDesignFactoryImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/WindWardLeeWardCourseLayouts.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/ExtremeSailingSeriesStartProcedure.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/RRS26StartProcedure.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/RaceStateChangedListener.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/ResultsCapturingActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/NamedArrayAdapter.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/PhotoAdapter.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/RaceFilter.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/RaceListDataTypeRace.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceInfoFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ActivityAttachedDialogFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ClassicCourseDesignDialogFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/FragmentAttachedDialogFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/CourseAreaListFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/NamedListFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/FinishedRaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/FinishingRaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/GateStartRunningRaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RRS26RunningRaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/SetStartTimeRaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/GateStartPhaseFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/CompassView.java
2013-06-24 14:22:56 +02:00
Jens Rommel f10426cfc8 Merge from master
Resolved conflict annoying GWT Remote Profiling launch config by using "theirs".
2013-06-20 10:37:52 +02:00
Jens Rommel b935f00fd5 Fixed ugly bug with regexp. 2013-06-18 17:09:14 +02:00
Jens Rommel 980b434eac Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch 2013-06-18 13:25:32 +02:00
Jens Rommel 29d88ee3fd Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch 2013-06-17 13:04:28 +02:00
Jens Rommel 41a6165b02 Manually added CSS changes from mak-media-synch-02. 2013-06-17 12:04:41 +02:00
Jens Rommel 0559e9a28b Emergency fix. Undo once bug 1442 has been resolved. 2013-06-14 18:38:26 +02:00
Jens Rommel ff776ef02a Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch 2013-06-14 18:32:43 +02:00
Jens Rommel 27dcaf6bd5 - New popout icon (already from previous commit)
- Fixed GWT dependecy issues with domain.common.media
- removed obsolete comment in MediaSelector
2013-06-14 17:40:38 +02:00
Jens Rommel d5d612dc73 Fixed file modes 2013-06-14 08:44:26 +02:00
Jens Rommel 4e2d85ed77 Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
Conflicts:
	java/pom.xml
2013-06-13 18:44:51 +02:00