Axel Uhl 50073115db Merge remote-tracking branch 'server/master' ...

Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs

2015-04-30 09:30:54 +02:00

..

.settings

adjusted message texts for "uploaded file" instead of "uploaded image" only

2015-04-30 00:10:50 +02:00

highcharts/js

…

images

removed offending flag image

2015-03-27 14:21:56 +01:00

js

…

META-INF

PolarDataService now uses OSGi service registry

2015-04-23 10:58:54 +02:00

qrcode

Bum qrcodejs version to fix some bugs

2015-04-08 14:24:42 +02:00

src/main

Merge remote-tracking branch 'server/master'

2015-04-30 09:30:54 +02:00

WEB-INF

added remote logging URL pattern for Home.html

2015-04-13 11:33:22 +02:00

.classpath

…

.gitignore

…

.project

…

AdminConsole.css

…

AdminConsole.html

…

AdminConsoleDateTimePicker.css

…

AdminConsoleProgressBar.css

…

AutoPlay.css

…

AutoPlay.html

…

BrowserUnsupported.html

…

build.properties

…

CommonControls.css

…

crossdomain.xml

…

DataMining.css

Improved the query definition providers controls panel

2015-04-03 18:51:25 +02:00

DataMining.html

…

Debug SailingGWT SDM on Android.launch.template

…

Debug SailingGWT SDM on Chrome.launch

…

Forward SailingGWT Ports for Android.launch.template

…

Home.css

…

Home.html

…

Leaderboard.css

…

Leaderboard.html

…

LeaderboardEditing.html

…

LeaderboardNewHome.css

…

PolarSheets.css

…

PolarSheets.html

…

pom.xml

removed EmulatedJRE from the gwt.ui pom.xml list of modules

2015-04-13 12:30:23 +02:00

RaceBoard.css

solved merge conflicts in RibDashboardServiceImpl

2015-03-19 14:02:27 +01:00

RaceBoard.html

…

RegattaOverview.css

…

RegattaOverview.html

…

SailingGWT All SDM.launch

…

SailingGWT Remote Profiling (Run-Mode only).launch

fixed merge issues such as references to the security infrastructure that changed

2015-03-26 15:01:40 +01:00

SailingGWT sdm.launch

fixed merge issues such as references to the security infrastructure that changed

2015-03-26 15:01:40 +01:00

SailingGWT.launch

fixed merge issues such as references to the security infrastructure that changed

2015-03-26 15:01:40 +01:00

SettingsDialog.css

…

Simulator.css

…

Simulator.html

…

Spectator.css

…

Spectator.html

…

VideoPopup.css

…

VideoPopup.html

…

ViewerToolbar.css

…

YoutubePopup.html

…