Commit Graph
45320 Commits
Author SHA1 Message Date
Axel Uhl e6e322d358 Merge branch 'master' into bug4104
Change-Id: Iaa1100b38a5197a5ede4e3a175d177dbfad94dca
2018-10-09 18:01:29 +02:00
Axel Uhl 16f6ec97d8 fixed typo in release notes
Change-Id: I0eccf58008a6b80b27845d763d34f4e6e2dd5dfb
2018-10-09 17:58:53 +02:00
Axel Uhl 52c819d6e7 fixed passing on of quoted keyword queries through REST API
Change-Id: I2cb64dca46d7688ec5224dd17ef04f50249d5e45
2018-10-09 17:57:48 +02:00
Axel Uhl 165fa82faf Merge branch 'master' into bug4104
Change-Id: I983c045ad482b5089eefb161a79e6984555d2d6d
2018-10-09 17:28:52 +02:00
Axel Uhl d47028bea4 Merge branch 'translation'
Change-Id: I8ee268e9b84c5dcc380cb8de7c0f8244c5cd100c
2018-10-08 13:18:30 +02:00
service.tip.git fd98f3fe90 [INTERNAL] Translation delivery: commit by SLS
Change-Id: I2af9d5304c48d73aecefb3463b846fbc4cae95cd
2018-10-04 16:11:53 +00:00
Henri Kohlberg a1934bf5e1 Bug 4104: Adapted UI to fit new image upload form and fixed smaller bugs regarding tag buttons. 2018-10-04 15:53:27 +02:00
D067890 8b7a00ad10 bug4104: fixed resizing problem 2018-10-02 16:22:20 +02:00
Axel Uhl 0d33fbb7d9 improved wording for LowPoint scoring scheme for overall leaderboards
Change-Id: Ic362be5f936f5b4a7022819a1eb70ee9fc6877bc
2018-10-02 10:54:17 +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
D067890 35ba936e44 bug4104: Added URLFieldWithFileUpload again 2018-09-30 13:03:30 +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 c67bbdd92f Bug 4104: Shared URLs of tags don't contain player mode any longer and fixed also a bug where wrong URL was generated when the current URL already contained a shared tag. 2018-09-28 11:07:40 +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
D067890 7ac0607b7b bug4104: improved implementation of image service 2018-09-27 09:08:12 +02:00
Henri Kohlberg bb9046cdca Bug 4104: Code style 2018-09-26 16:28:38 +02:00
Henri Kohlberg e6213a934f Bug 4104: Fixed bug where other users could "take control" of other users timeslider. 2018-09-26 16:23:18 +02:00
Henri Kohlberg 7c20dbe1d2 Bug 4104: Combine all GWT Resource interfaces into one single interface. 2018-09-26 16:00:29 +02:00
Henri Kohlberg e4ea366a1e Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2018-09-26 15:10:17 +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
Henri Kohlberg 606caa590e Bug 4104: Changed TaggingService to support more filter options when requesting tags and adopted current implementations. 2018-09-26 14:57:00 +02:00
Henri Kohlberg 390f8a9bdf Bug 4104: Changed serialization of TagDTO so JSON objects will only contain set parameters. Optional parameters will not be added to json (revokedAt, comment, image URL) when they equal null 2018-09-26 14:55:48 +02:00
Kai Börnert 1081fc52d0 Merge branch 'bug4683' 2018-09-25 18:11:24 +02:00
Kai Börnert 896d6ed555 Merge branch 'master' into bug4683 2018-09-25 17:38:26 +02:00
D067890 7708222141 bug4104: First approach of implementing image service 2018-09-25 16:05:56 +02:00
Kai Börnert aeab56aac2 Merge branch 'bug4759' 2018-09-25 15:35:44 +02:00
Axel Uhl 1619e940ea Merge remote branch 'origin/master' 2018-09-25 00:36:13 +02:00
Axel Uhl a285291cea fixing issue with SwissTiming connector and restoring of races with empty feedback URL 2018-09-25 00:34:48 +02:00
Kai Börnert e6faa8ae53 Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-09-24 17:46:24 +02:00
Henri Kohlberg d265f1bf5f Bug 4104: Removed completed todos, code cleanup and moved required attributes (string messages and user service) to constructor parameters of all subcomponents of TaggingPanel. 2018-09-24 16:07:32 +02:00
Henri Kohlberg 3d82b114f6 Bug 4104: Fixed error when user was not logged in and tags were requested. 2018-09-24 16:07:09 +02:00
Henri Kohlberg 356f460673 Bug 4104: Improved functionality when sharing a tag. 2018-09-24 15:57:15 +02:00
Henri Kohlberg e093012d61 Bug 4104: Fixed bug where "missing permissions" was reported but user had required permissions 2018-09-24 15:21:26 +02:00
Leon Radeck 4ddd1c5cbe Updated aws automation (markdown) 2018-09-24 12:51:23 +00:00
Leon Radeck 2e6d51cc85 Updated aws automation (markdown) 2018-09-24 12:51:01 +00:00
Leon Radeck bc7e071f9a Updated aws automation (markdown) 2018-09-24 12:49:53 +00:00
Leon Radeck 007185f216 Updated aws automation (markdown) 2018-09-24 12:48:55 +00:00
Henri Kohlberg d92667dbaf Bug 4104: Added reload button 2018-09-24 14:16:26 +02:00
Leon Radeck caa48c6892 Added images for wiki page 'aws automation' 2018-09-24 14:14:54 +02:00
Kai Börnert 9320690c60 Merge branch 'bug4508' 2018-09-24 11:27:30 +02:00
Henri Kohlberg 8f81ed62b8 Bug 4104: Minor improvements 2018-09-24 11:15:11 +02:00
D067890 b45a8a7165 Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into bug4104 2018-09-24 09:55:29 +02:00
D067890 96f85130a6 bug4104: Updated tagCreated string message 2018-09-24 09:55:00 +02:00
Henri Kohlberg 0aee3e84d5 Bug 4104: Added new exception handling in TaggingService. 2018-09-21 17:23:54 +02:00