Commit Graph
34164 Commits
Author SHA1 Message Date
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 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
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
Axel Uhl 7207e2edcb whitespace changes only
Change-Id: Ied1d1f84ed21153c57f803836a6655bbf335f819
2016-07-19 16:27:05 +02:00
Axel Uhl 1d9dd796a0 added some Javadoc to User methods
Change-Id: I10a6a550dd61cad9b6aa72f71fdf31fcc5ca00cd
2016-07-19 16:09:27 +02:00
Axel Uhl ee8d0bbe36 fixed notification message for competitor score correction
Change-Id: I334d470d3a4a10f793a979a5aa74e8a4d26d32e6
2016-07-19 16:09:10 +02:00
Axel Uhl fc31383809 renamed parameter
Change-Id: I02e35cbe8c2e8ba19ecff8128f8c34bd3e94679c
2016-07-19 16:08:37 +02:00
Peter Siegmund 8db0f8fa62 toolbar resizes to content size 2016-07-19 14:46:26 +02:00
Steffen Schaefer 70d54ffaf4 Fixed a bug that caused the suggest box to not show all entries when
logging out and logging in as another user
2016-07-19 14:14:06 +02:00
Peter Siegmund 4d86e764f7 fixed Buoy AlertDialogs 2016-07-19 13:51:51 +02:00
Peter Siegmund ee4e9cd68c fixed Tracking AlertDialogs 2016-07-19 13:51:01 +02:00
Peter Siegmund 81520c2a27 fixed shared AlertDialogs 2016-07-19 13:50:33 +02:00
Peter Siegmund adc809d131 fixed EulaHelper AlertDialog 2016-07-19 13:28:05 +02:00
Axel Uhl a6bb1d2d7d avoid creating threads for notifications; use existing scheduler in RacingEventServiceImpl instead
Change-Id: I2e590a285139294bbeb918dbedb5cea5f2c01905
2016-07-19 13:27:39 +02:00
Axel Uhl 1b1c5ea653 Merge remote-tracking branch 'server/bug3785' into bug3785 2016-07-19 13:14:48 +02:00
Axel Uhl 7eff56ad65 Merge branch 'master' into bug3785 2016-07-19 13:13:53 +02:00
Axel Uhl 8f8a9a938d Merge branch 'master' into bug3786 2016-07-19 13:04:25 +02:00
Peter Siegmund 19e4927b56 image file name is now competitor id, so it can be used across regattas 2016-07-19 13:03:18 +02:00
Peter Siegmund 68e66228fb added missing imports after merge 2016-07-19 12:44:23 +02:00
Peter Siegmund 7964665d6d Merge branch 'master' into ubilabs--tracking_app--bug-3769 2016-07-19 12:43:00 +02:00
Frank Mittag 4f8f60f04e Created liveraces (markdown) 2016-07-19 10:09:08 +00:00
Steffen Schaefer 2372bbdbbc Merge remote-tracking branch 'origin/master' into bug3785 2016-07-19 11:33:35 +02:00
Steffen Schaefer afa59fd1ce SailingNotificationService is now being stopped when RacingEventService
changes to replication state. In addition, an empty implementation of
SailingNotificationService is used to ensure that notification mails
will never be send on a replica.
2016-07-19 11:31:49 +02:00
Peter Siegmund ca1fdb0ec5 optimized screens for huge fonts (small devices) 2016-07-19 11:26:06 +02:00
Papick Garcia Taboada ece5afec28 Added missing classname point selector for visited style in mail 2016-07-19 11:25:24 +02:00
Steffen Schaefer 8e59b48216 Listeners aren't cleared anymore when clearing UserStore, but all
listeners are informed about removal of all preference objects.
2016-07-19 11:24:20 +02:00
Benjamin Barth 52eea75f26 Slightly adjustments to notification mail template 2016-07-19 11:19:36 +02:00
Steffen Schaefer fc56bd059e Using proper DateFormat for upcoming race notification 2016-07-19 10:00:36 +02:00
Peter Siegmund 6a995e79da fixed mark details fragment for huge fonts 2016-07-19 09:53:24 +02:00
Benjamin Barth 2ea3eb6783 Added sailing server i18n StringMessages to translation.json 2016-07-19 09:42:17 +02:00
Steffen Schaefer 623c939d13 Removed unnecessary duplicate drop of PREFERENCES DB collection for
tests
2016-07-19 09:37:52 +02:00
Steffen Schaefer 2db23155db Using Collection.isEmpty instead of Util.isEmpty 2016-07-19 09:34:04 +02:00
Steffen Schaefer 6e9aa7d815 Added missing final modifier 2016-07-19 09:34:01 +02:00
Steffen Schaefer 00d0a74c51 Removed Util.equals where we are sure that the returned collection types
are equal so that a simple assertEquals will work
2016-07-19 09:33:57 +02:00
Benjamin Barth e064e858f2 Slightly adjusted release notes regarding user prefs and notifications 2016-07-19 09:31:27 +02:00
Peter Siegmund 1122dbe85b set minHeight for list view row of marks 2016-07-19 08:56:21 +02:00
Peter Siegmund a423a580ad used system default button texts on AlertDialog 2016-07-19 08:55:35 +02:00
Peter Siegmund 22831672e5 switched AlertDialog to support lib for correct styling 2016-07-19 08:55:01 +02:00