Axel Uhl
|
eaf5d32cf6
|
changed toggleExpansion() to changeExpansionState(boolean), queueing not toggles but desired expansion states; see bug 3797
Change-Id: I2da4ce90f48c5eecb5fea7c41c0a5756bd59bb16
|
2016-07-21 11:13:07 +02:00 |
|
Axel Uhl
|
9d9b66ae00
|
Merge remote-tracking branch 'server/bug3785' into bug3785
|
2016-07-21 09:49:48 +02:00 |
|
Axel Uhl
|
9e6fd28244
|
Merge remote-tracking branch 'server/bug3785' into bug3785
|
2016-07-21 09:48:22 +02:00 |
|
Steffen Schaefer
|
a448907f73
|
Added inline style to buttons in notification mails to improve
compatibility with mail clients
|
2016-07-21 09:20:44 +02:00 |
|
Papick Garcia Taboada
|
25cfe2fe2d
|
Inlined CSS style in HTML template, reduced logo size to fit size expected in email, added new lines for last item in message bundles
|
2016-07-21 09:08:55 +02:00 |
|
Steffen Schaefer
|
98b9b5d4b8
|
Merge branch 'master' into bug3785
|
2016-07-21 09:04:00 +02:00 |
|
Papick Garcia Taboada
|
180a224391
|
Inlined CSS style in HTML template, reduced logo size to fit size expected in email, added new lines for last item in message bundles
|
2016-07-20 23:13:25 +02:00 |
|
EC2 Server
|
34c89fd4b6
|
fixed Event-SSL macro
|
2016-07-20 21:12:46 +00:00 |
|
Axel Uhl
|
c000ac31e0
|
Merge remote-tracking branch 'server/master'
|
2016-07-20 22:46:07 +02:00 |
|
Axel Uhl
|
90d9ea47de
|
handle QUERY_STRING better in apache 000-macros.conf; locale is now properly put before fragment in rewrite rules
Change-Id: Ied02e5c7d7cedfc0707209dfaa48c8dc7fb952e0
|
2016-07-20 22:45:05 +02:00 |
|
Axel Uhl
|
2ff60fb044
|
Merge branch 'raceboardmodes'
|
2016-07-20 20:33:59 +02:00 |
|
Axel Uhl
|
382428bd3d
|
fixed notification message text
Change-Id: I54f34f6886c7bb76246790d7343fe72a2abc7e34
|
2016-07-20 18:42:06 +02:00 |
|
Axel Uhl
|
1dd5db458b
|
Merge branch 'master' into bug3785
|
2016-07-20 18:38:20 +02:00 |
|
Benjamin Barth
|
77a3bd56b3
|
Generically solve HTML encoding issues in notification mails
|
2016-07-20 17:22:08 +02:00 |
|
Benjamin Barth
|
23348dd338
|
Adjusted subscription information in notification mails
|
2016-07-20 17:21:37 +02:00 |
|
Benjamin Barth
|
48ef3f241a
|
Added salutation to notification mail content
|
2016-07-20 16:33:37 +02:00 |
|
Benjamin Barth
|
4c80959cb3
|
Fixed umlauts in notification mail subjects
|
2016-07-20 16:33:00 +02:00 |
|
Benjamin Barth
|
8df03d72d8
|
Adjusted time format to include time zone info in notification mails
|
2016-07-20 16:31:03 +02:00 |
|
Benjamin Barth
|
3dc63602ca
|
Adjusted vertical alignments of notification mail header
|
2016-07-20 16:29:42 +02:00 |
|
Benjamin Barth
|
708dd3b53e
|
Added alt text for SAP logo in notification mails
|
2016-07-20 16:28:34 +02:00 |
|
Axel Uhl
|
f952be214f
|
added a "buffer" for toggleExpansion() requests; see bug 3797 comment #7
Change-Id: Ibc123564bc6fe6be9c55c443776c786adb3500f5
|
2016-07-20 15:12:10 +02:00 |
|
Axel Uhl
|
0450b59fa0
|
formatting
Change-Id: I8deb0461f8d94f2cc7eac3f35712d7c2e95f0ced
|
2016-07-20 14:44:10 +02:00 |
|
Axel Uhl
|
6a807cff29
|
Merge branch 'raceboardmodes'
|
2016-07-20 14:43:58 +02:00 |
|
Axel Uhl
|
6f68b4921a
|
Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandableSortableColumn.java
Change-Id: I9eee210b53c442a807d51662d80e548a5105a5c5
|
2016-07-20 14:28:50 +02:00 |
|
Benjamin Barth
|
c97979ba29
|
Adjusted duplicated detail columns in leaderboard avoidance
|
2016-07-20 14:04:43 +02:00 |
|
Axel Uhl
|
f6fd637c99
|
suggestion regarding always setting the "in progress" to false and resetting the "busy" indicator
Change-Id: Ica225b6a44d1f70968d09bb37a76fc23956c0fea
|
2016-07-20 13:57:43 +02:00 |
|
Axel Uhl
|
e595841051
|
fixed test error after an incorrect test "refactoring"
Change-Id: I3e88b55a4ab590ddeba0148c6e9a04aea12ad214
|
2016-07-20 13:48:18 +02:00 |
|
Benjamin Barth
|
3f47f56985
|
Avoid duplicated detail columns in leaderboard
|
2016-07-20 12:37:27 +02:00 |
|
Axel Uhl
|
59244825e0
|
using leaderboard display name in e-mail invitations if available, plus the event name
Change-Id: I9f670dd1adc3b562e12e8fb27a9f1f47bb1ae1da
|
2016-07-20 11:45:52 +02:00 |
|
Axel Uhl
|
c3596bb5ee
|
Merge branch 'bug3794' into bug3794-failing-test
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RaceLogScoringReplicator.java
Change-Id: Ib5000c43c003dfc791f34306ea0fe9d208e0f3e4
|
2016-07-20 11:08:50 +02:00 |
|
Axel Uhl
|
352c007a49
|
a failing test case for bug3794, trying to push scores through the race log into the leaderboard's score corrections
Change-Id: I35bc58c25f032e254932b157790557c6f07d3621
|
2016-07-20 11:07:25 +02:00 |
|
Axel Uhl
|
f0c75e7a13
|
Merge branch 'master' into bug3794
|
2016-07-20 09:51:36 +02:00 |
|
Peter Siegmund
|
912892eeff
|
header in InSight and Buoy toolbar has now ... in the middle, if text is to large
|
2016-07-20 09:03:11 +02:00 |
|
Axel Uhl
|
1fa86545a8
|
Merge remote-tracking branch 'server/bug3785' into bug3785
|
2016-07-20 01:54:27 +02:00 |
|
Axel Uhl
|
f0bbff8ecf
|
added a null check in RacingEventServiceImpl where the notificationService may be null, especially in test cases
Change-Id: I508b4fc8ae083b57ab49c1c0b809a5b10df33a5c
|
2016-07-20 01:47:59 +02:00 |
|
Axel Uhl
|
9f1f12f88e
|
Merge branch 'master' into bug3785
|
2016-07-20 01:14:17 +02:00 |
|
Axel Uhl
|
2d30f19415
|
added "Juliet" in addition to "Juliett" as possible course area name
Change-Id: Ice3d56a6f1f63718d31e389be68707d95884be59
|
2016-07-20 01:12:06 +02:00 |
|
Axel Uhl
|
1951e335d0
|
added "Alfa" as the international name for a course area; fixed spelling of "Foxtrot" course area (was "Foxtrott")
Change-Id: Ib492dc2338b7bcb80d0474446c0f4695ea75daed
|
2016-07-20 01:08:06 +02:00 |
|
Axel Uhl
|
e84fd7ff01
|
removed the commented code, some formatting issues, use Util.equalsWithNull(...)
|
2016-07-19 23:49:49 +02:00 |
|
Axel Uhl
|
27ae517fca
|
Merge branch 'master' into bug3794
|
2016-07-19 22:36:33 +02:00 |
|
fmittag
|
39df4884ca
|
removed resetMaxPointsReasonIfNecessary()
I think setMaxPointsReasonInLeaderboardIfNecessary() does all what I need
|
2016-07-19 18:32:57 +02:00 |
|
fmittag
|
830e64842a
|
first try for a fix for bug3794
|
2016-07-19 18:16:57 +02:00 |
|
Peter Siegmund
|
aa27141a15
|
Exception handling for IllegalArgumentException
|
2016-07-19 17:59:22 +02:00 |
|
Papick Garcia Taboada
|
32440fec4a
|
Merge branch 'bug3785' of ssh://sapsailing.com/home/trac/git into bug3785
# Conflicts:
# java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java
|
2016-07-19 17:57:30 +02:00 |
|
Papick Garcia Taboada
|
aade87ce94
|
Added sapsailing site look and feel to html mail
|
2016-07-19 17:55:36 +02:00 |
|
Peter Siegmund
|
f72069a005
|
Merge branch 'master' into bug3791
|
2016-07-19 17:30:38 +02:00 |
|
Axel Uhl
|
e1a4058809
|
Merge remote-tracking branch 'server/bug3790'
|
2016-07-19 17:27:39 +02:00 |
|
Axel Uhl
|
dc5f42baa1
|
Merge remote-tracking branch 'server/ubilabs--tracking_app--bug-3769'
|
2016-07-19 17:02:05 +02:00 |
|
Axel Uhl
|
31e8e248ff
|
avoid warnings
Change-Id: I8794623bed951e84a9d1405d5d3fe01234f6ea52
|
2016-07-19 17:01:36 +02:00 |
|
Axel Uhl
|
5df840c0d4
|
made user store variable final in Activator
Change-Id: I0d5119b0e78809ecbfc1c22a7a942361355364e9
|
2016-07-19 16:27:47 +02:00 |
|