Axel Uhl eb53b06e30 Merge branch 'master' into axel-usermanagement ...

Conflicts:
	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

2014-10-15 08:50:26 +02:00

..

.settings

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +02:00

fonts

…

highcharts/js

…

images

- Added title edit field to interactive media synch dialog

2014-09-25 12:30:43 +02:00

js

…

META-INF

Merge branch 'master' into usermanagement

2014-10-06 01:28:47 +02:00

qrcode

…

src/main

Merge branch 'master' into axel-usermanagement

2014-10-15 08:50:26 +02:00

WEB-INF

Use default Shiro web environment, not sharing shiro.ini anymore. Added some Javadoc to SecurityWebSessionManager

2014-10-14 08:55:11 +02:00

.classpath

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +02:00

.gitignore

…

.project

…

AdminConsole.css

…

AdminConsole.html

…

AdminConsoleDateTimePicker.css

…

AdminConsoleProgressBar.css

…

base.css

…

BrowserUnsupported.html

…

build.properties

…

CommonControls.css

…

crossdomain.xml

…

DataMining.css

…

DataMining.html

…

fontface.css

…

Home.css

…

Home.html

first version of charts in newhome (regatta rank)

2014-09-03 21:50:03 +02:00

Leaderboard.css

…

Leaderboard.html

…

LeaderboardEditing.html

…

LeaderboardNewHome.css

…

PolarSheets.css

…

PolarSheets.html

…

pom.xml

interims state after merge; doesn't compileMerge branch 'master' into usermanagement

2014-10-01 17:19:36 +02:00

Profile SailingGWT.launch

addressing bug 2345 by upgrading all launch configurations from JavaSE-1.7 to JavaSE-1.8 as their execution environment

2014-10-01 15:57:50 +02:00

RaceBoard.css

Merge remote-tracking branch 'origin/master' into raceboard-simulation

2014-10-08 16:42:59 +02:00

RaceBoard.html

…

RegattaOverview.css

…

RegattaOverview.html

…

reset.css

…

SailingGWT Remote Profiling (Run-Mode only).launch

working on cleaning up the merge issues after trying to merge master into usermanagement

2014-10-01 17:20:09 +02:00

SailingGWT.launch

AdminConsole displays tabs and hides them based on user roles; enabled Security.gwt.xml module for com.sap.sse.security bundle

2014-10-14 12:31:44 +02:00

Search.html

…

Simulator.css

…

Simulator.html

…

Spectator.css

…

Spectator.html

…

TvView.html

…

UserManagement.html

…

VideoPopup.css

…

VideoPopup.html

Added html web page icons.

2014-10-02 17:22:39 +02:00

ViewerToolbar.css

…

YoutubePopup.html

Added html web page icons.

2014-10-02 17:22:39 +02:00