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
Jens Rommel
5f22524c6b
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
2013-06-13 17:34:42 +02:00
Jens Rommel
34564c6b7a
- Fixed dbId issue which got broken during previous merge from master.
...
- Changed GWT plugin position in simulator class path to prevent from Eclipse warning "GWT SDK not found"
2013-06-13 14:27:06 +02:00
Jens Rommel
4003af6aa7
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/media/MediaDB.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/media/impl/MediaDBImpl.java
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/RaceBoard.css
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackYoutubeDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelectionDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopupWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubeWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractMediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AudioPlayer.java
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/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/MediaServiceImpl.java
java/pom.xml
2013-06-11 17:26:01 +02:00
Jens Rommel
8c2d451916
Added missing bundle dependencies.
2013-06-11 14:56:22 +02:00
Jens Rommel
cf4c27d808
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-06-11 13:29:10 +02:00
Jens Rommel
ca025404e7
Merge remote-tracking branch 'refs/remotes/external/master' into jens--swisstiming-competitor-conflict
2013-06-11 12:22:36 +02:00
Jens Rommel
2abab6fa8d
Fixed issue with conflicting competitor identification. For some olympic races, competitor ID (= nation code) + boat class are not sufficiently differentiating as RS:X and 470 have same boat class for men and women.
...
Now, the SwissTiming race code, e.g. SAM002 for Finn races, is taken into account, discriminating men from women races.
2013-06-11 11:09:46 +02:00
Jens Rommel
541290a7d5
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-06-10 12:28:33 +02:00
Jens Rommel
bf50611852
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
...
Conflicts:
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
2013-06-07 14:14:12 +02:00
Jens Rommel
219073ca52
Changed waiting time to 1000ms, helped to avoid test errors :-\
2013-06-07 14:07:54 +02:00
Jens Rommel
51d5f8d23d
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-06-03 12:25:51 +02:00
Jens Rommel
34a0178200
Removed obsolete export.
2013-06-03 12:25:12 +02:00
Jens Rommel
e0227edcd4
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-05-27 17:02:00 +02:00
Jens Rommel
a03d41ae09
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
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
2013-05-27 17:00:42 +02:00
Jens Rommel
760acff309
Fixed severe bug in course of replication alignment - forgot to add media tracks during initial load.
2013-05-17 12:08:51 +02:00
Jens Rommel
718ef21fe4
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-05-17 10:15:18 +02:00
Jens Rommel
b5c9386f12
Aligned media replication with the usual way in other parts.
2013-05-17 10:13:12 +02:00
Jens Rommel
946eaf7aa0
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-05-16 12:26:38 +02:00
Jens Rommel
11f9e16198
Added caching to MediaLibrary
2013-05-16 12:06:13 +02:00
Jens Rommel
f2f05d21bf
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-05-14 16:17:26 +02:00
Jens Rommel
d525046dd5
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
2013-05-06 18:08:42 +02:00
Jens Rommel
64b842e690
Merge remote-tracking branch 'refs/remotes/external/mak-media-synch' into jens--media-synch
2013-05-06 18:08:11 +02:00
Jens Rommel
094d81e7b6
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-replication
2013-05-03 18:12:03 +02:00
Jens Rommel
2aeef5426c
Supposedly final.
...
- With from master pending.
- Merge to master deferred after weekend with three events
2013-05-03 18:11:20 +02:00
Jens Rommel
5d94089dc1
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
2013-05-02 16:02:17 +02:00
Jens Rommel
b513ba2789
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
2013-04-30 09:25:19 +02:00
Jens Rommel
72d185a7b5
Support adding video even when no other video has been added before (--> always show add button when admin-user is logged on)
2013-04-29 16:33:37 +02:00
Jens Rommel
60f76ee748
Merge remote-tracking branch 'refs/remotes/external/master' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java --> Solved in favor of master (mostly)
2013-04-29 11:25:58 +02:00
Jens Rommel
4034b429a6
Work commit featuring
...
- video popouts for plain video and youtube
- interactive add/delete/adjust support for videos
Missing:
- proper consideration of audio, e.g. no delete buttons yet, no effect on audio when adding, deleting new video or when popping out
2013-04-26 17:39:03 +02:00
Jens Rommel
818d941f55
- Merged youtube & plain video/audio dialog
...
- Added youtube URL parser to extract youtube id from typical youtube URLs
2013-04-26 12:57:04 +02:00
Jens Rommel
cc300e09cc
Merge remote-tracking branch 'refs/remotes/external/master' into jens--youtube-url-parser
...
Conflicts:
java/com.sap.sailing.gwt.ui/RaceBoard.css
2013-04-25 18:35:10 +02:00
Jens Rommel
1f600236e5
Consolidating launch configs.
2013-04-25 18:00:50 +02:00
Jens Rommel
b21686c6bc
Fixed issue with Youtube popout which had been handled as plain video.
2013-04-25 13:29:13 +02:00
Jens Rommel
800dd9639a
Merge branch 'master-ext' into jens--media-synch
2013-04-24 17:46:40 +02:00
Jens Rommel
02fe9f0939
Work commit for Marcus Kammer to fix CSS issues.
2013-04-24 12:54:46 +02:00
Jens Rommel
f02ddeae41
Merge remote-tracking branch 'origin/jens--media-synch' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2013-04-19 11:19:56 +02:00
Jens Rommel
3f6700210c
Merge branch 'master' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackYoutubeDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelectionDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/AbstractPopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopupWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubePopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubeWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/DialogBoxExt.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractMediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AudioPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2013-04-19 11:15:35 +02:00
Jens Rommel
6d3d8711d2
Merge branch 'master' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackYoutubeDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelectionDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/AbstractPopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopupWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubePopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubeWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/DialogBoxExt.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractMediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AudioPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2013-04-19 11:14:57 +02:00
Jens Rommel
bbb74c58b5
First running version of interactive video synch. Supports
...
- HTML5 video
- Youtube video
Pending:
- Interactive add Youtube video
- Interactive remove video
- Interactive audio synch
2013-04-18 17:36:09 +02:00
Jens Rommel
e62547bb4c
First running version of interactive video synch. Supports
...
- HTML5 video
- Youtube video
Pending:
- Interactive add Youtube video
- Interactive remove video
- Interactive audio synch
2013-04-18 17:34:33 +02:00
Jens Rommel
6eea85c5a3
Merge remote-tracking branch 'external/master' into jens--media-synch
...
umn from SettableScoreCorrection to ScoreCorrection
2013-04-10 10:08:08 +02:00
Jens Rommel
8f2a1e3ce6
Merged sapsailing.com/master
...
moved up hasScoreCorrection for an entire leaderboard column / RaceColumn from SettableScoreCorrection to ScoreCorrection
2013-04-09 17:01:08 +02:00
Jens Rommel
cd0a20c724
Added a new check for reachability of tracks --> listen for error event, then set UNREACHABLE, else leave UNDEFINED
...
Implemented a more relaxed way which tracks to offer in race board --> UNDEFINEDs are also offered.
2013-03-31 12:53:31 +02:00
Jens Rommel
7c818a7d28
Updated onboarding (markdown)
2013-03-09 16:54:36 +01:00
Jens Rommel
f452042703
Fixed compile errors in previous (before master merge) work commit.
2013-03-05 18:29:22 +01:00
Jens Rommel
81cd6df4e0
Merge remote-tracking branch 'external/master' into jens--media-synch
2013-03-05 17:53:34 +01:00
Jens Rommel
3d52b93e55
Work commit, not yet functional
...
- initial in-place video synch
- initial embedded video window
2013-03-05 15:55:35 +01:00
Jens Rommel
76008233b5
Moved GWT dependency to avoid sporadic eclipse error complaining about missing GWT SDK.
2013-02-19 15:33:26 +01:00
Jens Rommel
e7faf4b3fb
Merge remote-tracking branch 'external/master' into master-ext
2013-02-19 15:32:27 +01:00
Jens Rommel
ce50ceee18
Added rome dependency to launch configs.
2013-02-19 15:32:11 +01:00
Jens Rommel
416b96231d
Added rome dependency to launch configs.
2013-02-19 15:31:44 +01:00
Jens Rommel
46823a0444
Created trimdatabase (markdown)
2013-02-12 13:37:05 +01:00
Jens Rommel
a90347f11a
Updated planning (markdown)
2013-02-12 13:36:41 +01:00