 Axel Uhl
|
7c23d21f57
|
working on cleaning up the merge issues after trying to merge master into usermanagement
|
2014-10-01 17:20:09 +02:00 |
|
|
Axel Uhl
|
819ca7b182
|
interims state after merge; doesn't compileMerge branch 'master' into usermanagement
Conflicts:
home.md
java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/AbstractTestWithIgtimiConnection.java
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/GlobalNavigationPanel.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/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.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/tv/TVViewController.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/usermanagement/UserManagementPage.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
|
2014-10-01 17:19:36 +02:00 |
|
|
Axel Uhl
|
b11c76de1d
|
fixed i18n for search page
|
2014-09-28 01:26:38 +02:00 |
|
 U-GLOBAL\D060338
|
e22d7c1024
|
new Branche
|
2014-09-02 16:17:53 +02:00 |
|
|
Axel Uhl
|
e3aab7ef18
|
starting with profiling the client; some formatting changes
|
2014-08-14 12:49:55 +02:00 |
|