Commit Graph
100 Commits
Author SHA1 Message Date
Steffen Schäfer 3801dbc4f5 Normalized line endings 2017-06-21 11:30:30 +02:00
Steffen Schäfer e3c9305a92 Merge branch 'bug2822_boatcolors' into
bug2822_boatcolors_merged_with_eol_changes

# Conflicts:
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
2017-06-20 13:02:02 +02:00
Steffen Schäfer 5c21356e67 Merge branch 'master' into bug3961
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
2017-05-29 09:28:28 +02:00
Steffen Schäfer 25708b5386 Merge branch 'master' into bug3961 2017-05-29 09:16:58 +02:00
Steffen Schäfer 67c73f9e55 Merge branch 'master' into bug4131 2017-05-22 16:30:43 +02:00
Steffen Schäfer dbe8587aa7 Merge branch 'master' into bug4131 2017-05-22 16:30:13 +02:00
Steffen Schäfer cc5d134c60 Merge branch 'master' into bug3572 2017-05-17 15:03:48 +02:00
Steffen Schäfer 7ba18778a9 Merge branch 'master' into bug3572 2017-05-17 15:01:43 +02:00
Steffen Schäfer 93c6447956 Merge branch 'master' into bug3572
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/raceviewerlaunchpad/RaceviewerLaunchPadCell.java
2017-05-17 14:53:00 +02:00
Steffen Schäfer 1542a36109 Merge branch 'master' into bug2822_boatcolors 2017-05-16 16:12:16 +02:00
Steffen Schäfer 67d310df4b Merge branch 'master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
#	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Steffen Schäfer 8303f594b3 Merge branch 'master' into bug3992_new_concept 2017-05-16 14:43:37 +02:00
Steffen Schäfer d3f36c5b2d Merge branch 'master' into bug3992_new_concept 2017-05-16 14:42:43 +02:00
Steffen Schäfer 3d054d5d17 Merge branch 'master' into bug4105 2017-05-16 14:17:25 +02:00
Steffen Schäfer 3f1e9376ca Merge branch 'master' into bug4105
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
2017-05-16 14:14:20 +02:00
Steffen Schäfer 26bcd969f0 Merge branch 'master' into bug3887-no-separate-column 2017-05-16 13:30:11 +02:00
Steffen Schäfer c700a84dae Merge branch 'master' into bug3951 2017-05-16 12:37:55 +02:00
Steffen Schäfer ea435f5968 Merge branch 'master' into bug3951
# 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
2017-05-16 12:36:47 +02:00
Steffen Schäfer a83bdf1bde Merge branch 'master' into bug4100 2017-05-16 11:06:01 +02:00
Steffen Schäfer af04fbe88a Merge branch 'master' into bug3934 2017-05-16 10:50:08 +02:00
Steffen Schäfer fdce7c9294 Merge branch 'master' into 60_inch 2017-05-16 10:25:30 +02:00
Steffen Schäfer 439f968ec4 Merge branch 'master' into 60_inch 2017-05-16 10:18:26 +02:00
Steffen Schäfer 8d2898d453 Removed the last remaining pieces of breadcrumb integration in TabPanel
widget that wasn't used lately
2016-02-18 11:13:43 +01:00
Steffen Schäfer 9dab47a64f JavaDocs and code format for BreadcrumbPane widget 2016-02-18 10:53:35 +01:00
Steffen Schäfer fdeb7200ad Moved BreadcrumbPane widget to com.sap.sse.gwt for better reusability 2016-02-18 08:52:53 +01:00
Steffen Schäfer 08b2a4d7d1 Added JavaDocs to LinkUtil 2016-02-18 08:38:07 +01:00
Steffen Schäfer 33d90fb5d6 Moved LinkUtil to com.sap.sse.gwt to make it reusable 2016-02-18 08:29:54 +01:00
Steffen Schäfer cc6b990b85 Merge branch 'design2015' into design2015-user-management
# Conflicts:
#	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/client/StringMessages_ru.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
2016-02-18 08:19:06 +01:00
Steffen Schäfer c7c21d5bca Merge branch 'master' into design2015 2016-02-18 08:13:30 +01:00
Steffen Schäfer 32ab350dec Removed merge marker fragment from StringMessages_de.properties 2016-02-18 08:12:07 +01:00
Steffen Schäfer 3179acef1f Merge branch 'master' into design2015 2016-02-18 08:00:53 +01:00
Steffen Schäfer c04fed2dd4 Added more JavaDocs 2016-02-16 15:26:15 +01:00
Steffen Schäfer 652498ed11 RegattaOverview uses fixed positioning of the authentication flyout
because the header is also fixed on top of the page
2016-02-16 15:23:05 +01:00
Steffen Schäfer 2f5dc63f91 Refactored generic implementations of AuthenticationView related to
SAPHeaderWithAuthentication to com.sap.sse.security.ui
2016-02-16 15:22:17 +01:00
Steffen Schäfer 4214507312 Simplications of the SAPHeaderWithAuthentication styles 2016-02-16 15:15:47 +01:00
Steffen Schäfer 7dc8d1bed3 Added basic JavaDocs for SAPHeader and SAPHeaderWithAuthentication 2016-02-16 15:09:10 +01:00
Steffen Schäfer be63d73c34 Added JavaDocs for UserHeader 2016-02-16 14:45:00 +01:00
Steffen Schäfer e041099f00 Refactored abstract base class for UserHeader to reduce code duplication
of desktop and mobile versions of the partial
2016-02-16 14:40:29 +01:00
Steffen Schäfer f21d6c02d4 Added more JavaDocs 2016-02-16 10:53:41 +01:00
Steffen Schäfer 87705abfd4 Added more authentication framework related JavaDocs 2016-02-16 10:34:29 +01:00
Steffen Schäfer c269f0b4c8 Added more JavaDocs 2016-02-16 09:52:50 +01:00
Steffen Schäfer 6211f97c54 Added more authentication framework related JavaDocs 2016-02-16 09:49:30 +01:00
Steffen Schäfer 08c71cdec5 Added JavaDocs 2016-02-16 09:34:16 +01:00
Steffen Schäfer 127d6b2c1e Only one header widget is allowed for TabPanel in UiBinder 2016-02-16 09:01:01 +01:00
Steffen Schäfer ae415f7267 Using NeedsAuthenticationContext on more places / Ensuring a more
consistent method naming
2016-02-16 08:38:26 +01:00
Steffen Schäfer cdb3afe480 Implemented MVP in UserProfileDetailsTabView 2016-02-16 08:30:19 +01:00
Steffen Schäfer 961bb6bfa6 Using NeedsAuthenticationContext in AuthorizedContentDecorator 2016-02-16 08:29:41 +01:00
Steffen Schäfer 555c33bbbd Added NeedsAuthenticationContext interface to reduce duplication of
setAuthenticationContext methods on several places
2016-02-16 08:29:24 +01:00
Steffen Schäfer 7c69472884 Merge branch 'design2015' into design2015-user-management 2016-02-16 07:48:21 +01:00
Steffen Schäfer 1fe3d34df1 Merge branch 'master' into design2015 2016-02-16 07:47:45 +01:00
Steffen Schäfer cd2e9e9c5d Added more JavaDocs 2016-02-11 15:37:37 +01:00
Steffen Schäfer 9c17d1fc8b Refactored common presenter for the UserDetailsView to reduce code
duplication
2016-02-11 14:30:19 +01:00
Steffen Schäfer 2fd4e207c0 I18n of AdminConsole title 2016-02-11 13:21:09 +01:00
Steffen Schäfer 7b10a2f048 Refactored base class for User Details desktop/mobile versions 2016-02-11 12:53:23 +01:00
Steffen Schäfer 4e177a57ff Added more release notes regarding user management 2016-02-11 12:14:33 +01:00
Steffen Schäfer 3de5a1c66e Removed login redirects for Adminconsole and LeaderboardEditing because
now there is a UI in the herder to authenticate and the page contents
are only shown if you have the required permissions
2016-02-11 12:08:10 +01:00
Steffen Schäfer 0369d90305 Added permission MANAGE_LEADERBOARD_RESULTS for LeaderboardEditing to
not need checks for role eventmanager anymore
2016-02-11 11:16:43 +01:00
Steffen Schäfer c1543d0c7f AuthorizedContentDecorator will now show a specific message if the user
is authenticated but don't has the required permission to show some
content
2016-02-11 11:06:16 +01:00
Steffen Schäfer b669ae1a7b Removed login control from the AdminConsole footer 2016-02-11 10:50:18 +01:00
Steffen Schäfer 9d279b3078 Optimized GenericNotLoggedInView to not stick in the upper left corner
without any margins
2016-02-11 10:25:22 +01:00
Steffen Schäfer a6ffaffd0b Adjusted AdminConsole Header/Authentication styling to be consistent
with the other modules
2016-02-11 10:10:39 +01:00
Steffen Schäfer 33602a7466 Initial implementation of authentication via Header in AdminConsole 2016-02-11 09:24:26 +01:00
Steffen Schäfer 81e21741ad Merge branch 'design2015' into design2015-user-management 2016-02-11 08:13:11 +01:00
Steffen Schäfer 95c8a153ee Merge branch 'master' into design2015 2016-02-11 08:12:12 +01:00
Steffen Schäfer 832512a849 Merge branch 'design2015' into design2015-user-management 2016-02-04 16:27:56 +01:00
Steffen Schäfer 07795c9f44 Added additional information regarding user management changes to
release_notes_admin.html
2016-02-04 16:15:54 +01:00
Steffen Schäfer 9a709f0fed Handling of the case when the user isn't logged in when opening
LeaderboardEditing. Repetitive Login/Logout when the UI is open
shouldn't be a problem at the moment
2016-02-04 15:46:00 +01:00
Steffen Schäfer 2a7a44a365 Added the possibility to AuthorizedContentDecorator to not only check
for logged in state but also for a specific permission
2016-02-04 15:18:56 +01:00
Steffen Schäfer 35a4ffc735 Initial implementation to handle unauthenticated state in
LeaderboardEditing
2016-02-04 14:12:32 +01:00
Steffen Schäfer 3c94dfa2b9 Moved AuthorizedContentDecorator to com.sap.sse.security.ui 2016-02-04 13:25:58 +01:00
Steffen Schäfer bf8228eda7 Initially added authentication to LeaderboardEditing 2016-02-04 12:10:14 +01:00
Steffen Schäfer 6d3f249ea4 Merge branch 'design2015' into design2015-user-management 2016-02-04 11:03:39 +01:00
Steffen Schäfer 3f92ee8dee Implemented FixedSailingAuthenticationView with inner scroll if there
isn't enough space
2016-02-04 10:52:57 +01:00
Steffen Schäfer 5b45093299 Initial support to make login flyout work for fixed header 2016-02-04 10:04:40 +01:00
Steffen Schäfer 8f23a32d43 Adjusted LeaderboardEditing to not need z-index anymore 2016-02-04 09:24:09 +01:00
Steffen Schäfer d692eb4659 Adjusted positioning of the login icon in SAPHeaderWithAuthentication 2016-02-04 08:51:17 +01:00
Steffen Schäfer 34d1c22cc0 Using a more consistent naming 2016-02-03 17:20:11 +01:00
Steffen Schäfer ff21b20b38 Adaption of authentication in RegattaOverview by using
SAPHeaderWithAuthentication
2016-02-03 17:09:59 +01:00
Steffen Schäfer f9c00a04bb Implemented a generic version of authentication for sailing modules 2016-02-03 17:08:30 +01:00
Steffen Schäfer e3ca05d5c3 Initial implementation of SAPHeader2 with authentication menu as
SAPHeaderWithAuthentication
2016-02-03 17:07:43 +01:00
Steffen Schäfer 32cf593ad8 Removed unused fields from SAPHeader2 2016-02-03 17:05:11 +01:00
Steffen Schäfer ebf40ac6a8 Reduced code duplication by using default styles of
CommonSharedResources in RaceBoard
2016-02-03 17:04:32 +01:00
Steffen Schäfer 0e963428d7 Added default style for CommonSharedResources 2016-02-03 17:03:53 +01:00
Steffen Schäfer f14d4bcefc Adjusted indentation in SAPHeader2 to consistently use spaces 2016-02-03 15:51:54 +01:00
Steffen Schäfer d5921feb7b Removed unused flag from SAPHeader2 2016-02-03 15:50:51 +01:00
Steffen Schäfer c798c8bffb Merge branch 'design2015-user-management' into design2015 2016-02-03 15:14:41 +01:00
Steffen Schäfer 5a7b44f8c7 Updated release_notes_admin.html regarding user management changes 2016-02-03 15:05:13 +01:00
Steffen Schäfer 6bb463af27 Updated SailingAnalyticsNotes.html regarding user management changes 2016-02-03 14:47:57 +01:00
Steffen Schäfer 466b76e882 Added sailing roles/permissions to suggests in AdminConsole 2016-02-03 13:13:49 +01:00
Steffen Schäfer 5dc26731cf Checking for Permission.MANAGE_MEDIA to show video edit controls in
RaceBoard instead of checking for several Roles
2016-02-03 12:47:15 +01:00
Steffen Schäfer 24366e7274 Roles.eventmanager and Roles.mediaeditor now grant
Permission.MANAGE_MEDIA
2016-02-03 12:46:29 +01:00
Steffen Schäfer 397049b09b Deactivating user management on design2015 2016-02-03 09:53:28 +01:00
Steffen Schäfer 9f4dc66d6c Merge branch 'design2015-user-management' into design2015 2016-02-03 09:52:16 +01:00
Steffen Schäfer 41c00d7400 Adjusted Youtube dialog positioning to not overlap timeslider for users
with MANAGE_MEDIA permission
2016-02-03 09:28:07 +01:00
Steffen Schäfer 6c905359d9 Activated user management UI on user management branch 2016-02-03 09:14:35 +01:00
Steffen Schäfer 7f2c9acdbe Merge branch 'design2015' into design2015-user-management 2016-02-03 08:31:57 +01:00
Steffen Schäfer 82cefc997a Merge branch 'master' into design2015 2016-02-03 08:29:50 +01:00
Steffen Schäfer 2bf898bfad Extracted common base class for FlyoutAuthenticationView 2016-02-03 08:23:48 +01:00
Steffen Schäfer 4854a086e0 Deactivating user management on design2015 2016-02-02 15:47:08 +01:00
Steffen Schäfer cd84086b14 Merge branch 'design2015-user-management' into design2015 2016-02-02 15:42:47 +01:00