eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity
65,148 Commits 269 Branches 211 Tags
9384613751be34befc9cb476d800ab06cef53016
Commit Graph
804 Commits
Author SHA1 Message Date
Thomas Wiese 1a6441693f Merge branch 'permission-vertical' into bug4709_pv 
Conflicts:
	java/com.sap.sailing.server.gateway/resources/shiro.ini
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
 2018-11-23 16:05:09 +01:00
Kai Börnert 1fe28a232d wip for defaultTenant switching 2018-11-21 17:26:28 +01:00
Thomas Wiese d9d5bc847f remove exception traps to get stack trace 2018-11-16 08:33:26 +01:00
Thomas Wiese 49ccd56500 Merge branch 'permission-vertical' into bug4709_pv 2018-11-15 13:17:13 +01:00
Thomas Wiese 76b70ffed8 Revert "fix tests for MasterDataImport" 
This reverts commit 01b4423470.
 2018-11-15 13:16:39 +01:00
Thomas Wiese 13bc361f43 fix tests for MasterDataImport 2018-11-15 12:00:03 +01:00
Thomas Wiese 01b4423470 fix tests for MasterDataImport 2018-11-15 11:39:32 +01:00
Thomas Wiese 33f0f9a4f1 Merge branch 'permission-vertical' into bug4709_pv 2018-11-15 11:02:32 +01:00
Kai Börnert 6a2916bead fixed missing dependencies for tests 2018-11-14 16:18:35 +01:00
Kai Börnert 6204f410a6 fix for SecurityManager exception and for TaggingServiceTest 2018-11-13 16:43:00 +01:00
Kai Börnert 140b9abafc fixed search and tagging tests 2018-11-13 15:59:24 +01:00
Kai Börnert 12df19092f fixed and simplified further tests 2018-11-13 15:40:36 +01:00
Kai Börnert f923088e5b permission vertical related fix for MasterDataImportTest 2018-11-13 15:16:00 +01:00
Kai Börnert 4c7eac55e8 simplified and fixed default tenant handling for createUser 2018-11-12 16:56:40 +01:00
Thomas Wiese 2985b6fca4 Merge branch 'permission-vertical' into bug4709_pv 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/resources/shiro.ini
 2018-11-08 09:18:39 +01:00
Robin Kuck 21d9a1261c Merge remote-tracking branch 'origin/master' into bug4469 2018-11-06 20:42:15 +01:00
Axel Uhl 8f3c787ef2 Merge remote-tracking branch 'server/permission-vertical' into permission-vertical 
Change-Id: Ibda36c345398eed5a673aba163d6817443569b07
 2018-11-06 15:34:26 +01:00
Axel Uhl c04d5383f5 moved access to non-API features to testsupport package which can be friends with com.sap.sse.security 
Change-Id: If7e4f726db1743b2b6ee3029e40f98e4ab2b7b94
 2018-11-06 15:27:46 +01:00
Kai Börnert 703478aff0 preparation for ownership setting on masterdata import 2018-11-06 14:26:32 +01:00
Thomas Wiese 949e6cf75d Merge branch 'permission-vertical' into bug4709_pv 2018-11-05 09:46:06 +01:00
Kai Börnert 20e98730df Merge branch 'master' into permission-vertical 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTable.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
 2018-10-31 11:14:56 +01:00
Thomas Wiese cc2c751223 Merge branch 'bug4709' into bug4709_pv 
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SlicingTest.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CreateRegattaCallback.java
	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/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
	java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
 2018-10-24 15:20:27 +02:00
Steffen Schäfer 9c2ff665a7 Merge branch 'master' into permission-vertical 
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
	java/com.sap.sailing.server.gateway/webservices/api/v1/index.html
	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java
	java/com.sap.sse.security/META-INF/MANIFEST.MF
 2018-10-23 13:10:46 +02:00
Axel Uhl bae28e950b fixed encoding 
Change-Id: If0c068f69534e7a14354d2e37672ea3df89f713b
 2018-10-11 18:09:58 +02:00
Axel Uhl 4f126f4710 create temporary UserStoreImpl to trigger bundle loading in OSGi test environment 
Change-Id: I44d47a8c96a0b19fdb14884feb30679efbbd609a
 2018-10-11 17:49:29 +02:00
Axel Uhl 230a5a4c1c fixed typo in comment; added logging 
Change-Id: Ic4308772f659d80617509c68c5f5781b8bead657
 2018-10-11 13:43:59 +02:00
Thomas Wiese 7b14c71207 add attribute registrationLinkSecret to regatta 2018-10-11 10:50:34 +02:00
Kai Börnert c08e8b4369 bug4768 added multiple parts that will explicitly set permissions, 
created an interface to allow most ownable objects to directly return
the QualifiedObjectIdentifier
 2018-10-10 13:16:16 +02:00
Thomas Wiese b254806a10 Revert "Move CompetitorRegistrationType from com.sap.sailing.domain.common to com.sap.sailing.domain.base" 
This reverts commit b1bb9af5b6.
 2018-10-04 14:01:38 +02:00
Thomas Wiese b1bb9af5b6 Move CompetitorRegistrationType from com.sap.sailing.domain.common to com.sap.sailing.domain.base 2018-10-04 10:03:59 +02:00
D067890 e5d35e0397 Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into 
bug4104

Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TagDTODeSerializer.java
 2018-10-01 10:59:00 +02:00
Henri Kohlberg 4e58a37592 Bug 4104: Added timeout for SecurityService in JUnit test. Just for testing purposes, should not be used in production! 2018-09-28 13:00:52 +02:00
Henri Kohlberg 8c145ef3bd Bug 4104: Use service tracker also for JUnit tests in OSGi environment. 2018-09-28 11:18:22 +02:00
Henri Kohlberg cc59efcf49 Bug 4104: Adapted TaggingService and TaggingServiceTest to check their environment whether it is OSGi enabled or not and get security service from correct source (service tracker in OSGi, static reference of Activator in non-OSGi) 2018-09-28 08:28:34 +02:00
Henri Kohlberg e0249a7f64 Bug 4104: Try to fix problem with multplie userstores during hudson build (works locally) 2018-09-27 11:46:22 +02:00
Henri Kohlberg c50dbd1aa7 Bug 4104: Added tests for TagDTODeSerializer, changed output of timepoint serialization in case given timepoint is null to prevent NullPointerException and replaced toString() on JSON objects by getJSONString(). 2018-09-27 11:38:46 +02:00
D067890 f20fbcb38e Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into 
bug4104

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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFooterPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagModificationPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPanelResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TagDTODeSerializer.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
 2018-09-27 10:12:28 +02:00
Henri Kohlberg 764e8b660f Bug 4104: Drop PREFERENCES-collection when resetting environment for next unit test. 2018-09-27 09:58:59 +02:00
Henri Kohlberg 679e175a3b Bug 4104: Adapted unit test for TaggingService with more detailed log messages to identify failing tests. 2018-09-27 09:50:53 +02:00
Henri Kohlberg 0dd4cd75b5 Bug 4104: Added first version of unit tests for tagging backend functionality. 2018-09-26 14:57:41 +02:00
Thomas Wiese 22d06882c3 rename regatta attribute canCompetitorRegisterToOpenRegatta to competitorRegistrationType and swicht over to enum datatype 2018-09-21 17:41:57 +02:00
Thomas Wiese d992a3e9a0 Add parameter for user regsitration to regatta 2018-09-18 16:09:41 +02:00
Joshua Schulz c47625fdff Merge remote-tracking branch 'origin/master' into bug4469 
Conflicts:
	java/com.sap.sse.security.ui/Security UI sdm.launch
	java/com.sap.sse.security.ui/Security UI.launch
 2018-08-20 10:08:56 +02:00
Manuel Zedel d1a061533a more test fixes 2018-08-13 10:03:56 +02:00
Kai Börnert 95d71cdb9f bug4661 formating/code style only change 2018-07-17 09:16:03 +02:00
Kai Börnert 879c0c3504 move score factor calculation to ScoringScheme if not explizitly set 2018-07-13 14:38:06 +02:00
Robin Kuck a27c8b725a Merge remote-tracking branch 'origin/master' into bug4469 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/pairinglist/PairingListEntryPoint.java
 2018-07-02 21:20:23 +02:00
Kai Börnert 57067b2d37 bug4343 added test for encoding of leaderboards, improved leaderboard 
encoding to capture all cases
 2018-06-20 11:42:29 +02:00
Robin Kuck 753897a917 Merge remote-tracking branch 'origin/master' into bug4469 2018-06-12 23:54:28 +02:00
Robin Kuck 97d6eb4655 Merge remote-tracking branch 'origin/master' into bug4469 2018-05-29 22:34:52 +02:00