Axel Uhl
b45ce88800
Merge branch 'design2015'
...
Conflicts:
java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cn.properties
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml
2015-04-30 09:51:09 +02:00
Axel Uhl
5ef75e3ba5
removed empty lines
2015-04-30 09:31:00 +02:00
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
Simon Pamies
00a0a78b2a
Added ability to use a local release file
2015-04-30 10:33:14 +08:00
Simon Pamies
3c3e6d4f0a
Merge remote-tracking branch 'origin/master'
2015-04-30 09:52:07 +08:00
Axel Uhl
6d20c02f17
added theme project to launch config
2015-04-30 01:11:33 +02:00
Axel Uhl
c7d428a3a5
Merge branch 'master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs
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_cn.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2015-04-30 00:54:57 +02:00
Axel Uhl
c0794b3a69
Merge remote-tracking branch 'server/master'
2015-04-30 00:50:50 +02:00
Axel Uhl
ec6133fd72
fixing bug 2789 (device configuration caption panel e-mail uneditable)
2015-04-30 00:46:23 +02:00
Axel Uhl
43b5c971ee
adjusted message texts for "uploaded file" instead of "uploaded image" only
2015-04-30 00:10:50 +02:00
Axel Uhl
356eed8119
fixed re-opened bug 1963 comment #23 by showing the flag image, not the competitor image, in the nationality/sail number column in leaderboard if present
2015-04-29 23:56:13 +02:00
Axel Uhl
543d58720b
fixed rendering of competitor image and flag image in admin console competitor table wrapper; see bug 1963 comment #23
2015-04-29 23:36:07 +02:00
Axel Uhl
c78fc9d4e8
fixing bug 2780 by adding flag URI change handling to listener interface and CompetitorImpl setter implementation; leaderboard cache handling updated
2015-04-29 23:23:39 +02:00
Steffen Schaefer
f5eb373889
Fixed Leaderboard positioning for lower resolutions
2015-04-29 18:20:58 +02:00
Steffen Schaefer
0f916696a8
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/RibDashboardEntryPoint.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_cn.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/client/StringMessages_ru.properties
2015-04-29 18:01:38 +02:00
Steffen Schaefer
c2db0ac6e2
Fixed aligment of event overview year title
2015-04-29 17:41:21 +02:00
Steffen Schaefer
fedbaec6d3
Added design2015 messages to StringMessages_cn.properties
2015-04-29 17:08:33 +02:00
Steffen Schaefer
89fd4e4471
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/server/SailingServiceImpl.java
2015-04-29 17:00:53 +02:00
Alexander Ries
27b601c08d
Merge branch 'ribdashboard'
2015-04-29 16:55:17 +02:00
Alexander Ries
16f37f86bb
added missing dashboard StringMessageProperties to cn file and removed not used ones
2015-04-29 16:54:03 +02:00
Papick Garcia Taboada
ef56eab01e
Implemented border
2015-04-29 16:47:09 +02:00
Papick Garcia Taboada
da8159c5df
Fixed reverse lazy load
2015-04-29 16:34:04 +02:00
Steffen Schaefer
9175a0affb
Adjusted layouting of the leaderboard headline
2015-04-29 16:33:46 +02:00
Steffen Schaefer
8049afbc65
Overall leaderboard tab is default selected when switching to series
2015-04-29 16:33:09 +02:00
Steffen Schaefer
f022caad0d
Sharing message translations for DE
2015-04-29 16:24:44 +02:00
Steffen Schaefer
4ae1a43320
Changes to avoid wrapping of upcoming events header in event overview
2015-04-29 16:08:54 +02:00
Alexander Ries
10aa18cf92
Merge remote-tracking branch 'origin/master'
2015-04-29 16:06:24 +02:00
Steffen Schaefer
4c9e4f7c70
Changes to avoid wrapping of year header in event overview
2015-04-29 16:03:10 +02:00
Steffen Schaefer
eb4c173614
Added Navigation button to jump directly to a series from the event page
2015-04-29 16:02:24 +02:00
Papick Garcia Taboada
92db9b9dcd
Merge branch 'design2015' of ssh://sapsailing.com/home/trac/git into design2015
...
# By Steffen Schaefer
# Via Steffen Schaefer
* 'design2015' of ssh://sapsailing.com/home/trac/git:
Applied current version of styling
2015-04-29 16:01:23 +02:00
Papick Garcia Taboada
02a251fff0
Optimised cursor and click area
2015-04-29 16:00:12 +02:00
Christopher Ronnewinkel (D036654)
b59e8857d2
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-04-29 14:59:25 +02:00
Christopher Ronnewinkel (D036654)
bbebd762d6
handle sparse-simulation-data-exception; further improvement for finish-phase of opportunist-360;
2015-04-29 14:44:59 +02:00
Steffen Schaefer
e3123527fd
Merge branch 'design2015' of ssh://trac@sapsailing.com/home/trac/git into design2015
2015-04-29 13:41:05 +02:00
Steffen Schaefer
2d03e7e6b6
Applied current version of styling
2015-04-29 13:40:27 +02:00
Papick Garcia Taboada
35ee52f7d2
Merge branch 'design2015' of ssh://sapsailing.com/home/trac/git into design2015
...
# By Steffen Schaefer
# Via Steffen Schaefer
* 'design2015' of ssh://sapsailing.com/home/trac/git:
Implemented sharing buttons for event and series
The available space is now used more efficiently for the event/series header
2015-04-29 13:38:22 +02:00
Papick Garcia Taboada
bc663d6999
Fixed margins in leaderboard tab content
2015-04-29 13:38:16 +02:00
Axel Uhl
6a1f3c0e17
consolidated imports
2015-04-29 13:02:51 +02:00
Axel Uhl
558da0967f
Merge remote-tracking branch 'server/master'
2015-04-29 13:01:51 +02:00
Axel Uhl
ef1b348752
replaced remove icon by text to make button porpose clearer
2015-04-29 13:01:02 +02:00
Axel Uhl
143bd157ac
bug1963: also offer image upload for flag image; fixed swapping problem of competitor image and flag image
2015-04-29 12:52:01 +02:00
fmittag
1741ca6f3a
Merge remote-tracking branch 'origin/master'
2015-04-29 11:40:37 +02:00
Steffen Schaefer
4005389eb2
Implemented sharing buttons for event and series
2015-04-29 11:35:38 +02:00
Christopher Ronnewinkel (D036654)
43f1c7eeb9
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-04-29 11:24:20 +02:00
fmittag
a48ced46f5
Merge remote-tracking branch 'origin/master' into bug2483
2015-04-29 11:19:41 +02:00
Alexander Ries
c893e09455
solved merge conflict in LocationPointerAngleDistance import for Position
2015-04-29 10:29:51 +02:00
Frederik Petersen
8af7e3954e
Fixed bug2762
...
When importing, we see if there is an equal fix (if yes, no database
insertion)
2015-04-29 10:19:45 +02:00
Simon Pamies
93503a1424
Merge remote-tracking branch 'origin/master'
2015-04-29 16:04:01 +08:00
Simon Pamies
bf7b223f62
Updated chinese translation and activated Home and Leaderboard
2015-04-29 16:03:49 +08:00
Frederik Petersen
fea0577d18
Merge branch 'master' of ssh://sapsailing.com/home/trac/git
2015-04-29 09:51:51 +02:00
Axel Uhl
Simon Pamies
Steffen Schaefer
Alexander Ries
Papick Garcia Taboada
Christopher Ronnewinkel (D036654)
fmittag
Frederik Petersen