Commit Graph
8220 Commits
Author SHA1 Message Date
Lukas Niemeier 137f5544c8 # working towards finishing fragment 2013-03-04 01:36:06 +01:00
Lukas Niemeier dce68f9427 # resetting time works with alarms 2013-03-04 00:54:28 +01:00
Lukas Niemeier 5f764f2da3 # default setting is live-server now 2013-03-03 23:55:12 +01:00
Lukas Niemeier 9a6c2f5700 Merge branch 'racecommitte_integrated_com' into racecommittee_integrated 2013-03-03 23:46:08 +01:00
Lukas Niemeier a8713a3e29 # readded settings activity 2013-03-03 23:44:54 +01:00
Lukas Niemeier f5493d2a98 # app deserializes racelog events on startup 2013-03-03 23:26:15 +01:00
Lukas Niemeier a5d0787f24 # removed unused imports 2013-03-03 23:12:34 +01:00
Lukas Niemeier 1bec6cd816 # fixed serialization of flagevents 2013-03-03 23:12:00 +01:00
Armin Zamani 9d59848cf9 Merge branch 'racecommitte_integrated_com' into racecommittee_integrated 2013-03-03 23:07:11 +01:00
Lukas Niemeier 62f891872f # app sends events to server 2013-03-03 23:00:10 +01:00
Lukas Niemeier 9fc6643b14 # formatting 2013-03-03 21:27:57 +01:00
Lukas Niemeier fdfc27278c # working towards migration of Event Sending Services 2013-03-03 21:12:12 +01:00
Axel Uhl 054165b287 updated build script for fixing PROJECT_HOME in cygwin 2013-03-03 20:56:17 +01:00
Lukas Niemeier 42223b63f5 # formatting 2013-03-03 19:13:27 +01:00
Lukas Niemeier afc7e6c352 # formatting + naming 2013-03-03 19:12:48 +01:00
Lukas Niemeier ef71fe0455 # formatting 2013-03-03 19:10:05 +01:00
Lukas Niemeier 76120cc31a # more formatting 2013-03-03 19:09:35 +01:00
Lukas Niemeier 7fcee6437c # some formatting
# fighting the premature closing of streams in communication with server
2013-03-03 18:58:14 +01:00
Lukas Niemeier ef6a8d1700 # added serialization of racelogs in RaceGroupJsonExportServlet 2013-03-03 18:57:26 +01:00
Armin Zamani 94944464f3 Fixed some errors after merge 2013-03-03 18:24:18 +01:00
Armin Zamani 79a39ef402 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateFlexibleLeaderboard.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateRegattaLeaderboard.java
2013-03-03 17:40:51 +01:00
Armin Zamani d3d8134398 Hope that BuildConfig.java from android glue project wont appear anymore 2013-03-03 17:01:08 +01:00
Armin Zamani e812e87452 Bug fix in GWT Admin Console: Select and unselect of an event works now
without bugs, tested several times
2013-03-03 15:50:04 +01:00
Armin Zamani b7f6803829 added Javadoc for SeriesWithRows 2013-03-03 15:01:34 +01:00
fmittag be38ea453c Fixed several issues related to regatta leaderboard creation
- Replication issues
- Bug 1249 - Sort regattas in "Create regatta leaderboard" dialog
- Bug 1250 - Display name not applied by Create Regatta Leaderboard dialog
2013-03-03 14:53:19 +01:00
Armin Zamani 948569bb60 added Javadoc 2013-03-03 14:49:28 +01:00
Armin Zamani 76a249ad23 Added some Javadocs for explanation of our implementation and renamed
some methods
2013-03-03 14:02:32 +01:00
Armin Zamani 1dc5b89589 App: Changed OnlineDataManager to load URL from Shared Preferences 2013-03-02 17:54:28 +01:00
Armin Zamani 514a8864cb Added a test for storing and retrieving race log events on regattas,
set race log at regatta creation
2013-03-02 17:12:45 +01:00
Armin Zamani ad4e60fa89 added JavaDoc to Template 2013-03-02 15:36:10 +01:00
Armin Zamani 188a4a371d Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated 2013-03-02 14:04:48 +01:00
Armin Zamani 89445344ab changed sailinggwt.launch 2013-03-02 14:02:51 +01:00
Fabian Tschirschnitz 6c6212d8ef added regatta overview to launch config 2013-03-02 11:21:05 +01:00
Armin Zamani 4816dd2428 added new item in realm.properties 2013-03-02 00:23:03 +01:00
Armin Zamani 592ddf13f7 Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated 2013-03-01 22:13:17 +01:00
Armin Zamani 273c9fea04 Changed usage of Serializable as id for EventDTO in sailingService to
String usage
2013-03-01 22:12:52 +01:00
Axel Uhl ad969e44e7 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2013-03-01 13:11:54 -08:00
Axel Uhl 3b0ef2bb01 special handling for cygwin paths on Windows / Cygwin in build script 2013-03-01 13:05:31 -08:00
Axel Uhl 2357dc97db Merge remote-tracking branch 'server/racecommittee_integrated' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2013-03-01 13:00:05 -08:00
Axel Uhl 10c027565c fixing time zone in DateFormat for test so that there is no dependency on the executing computer's time zone setting 2013-03-01 12:49:45 -08:00
Armin Zamani 06c6679964 Changed german name of course area to "Regattabahn" 2013-03-01 21:22:51 +01:00
Armin Zamani df145e18e1 Fixed bug: ScoreCorrection for leaderboard must not be null 2013-03-01 21:12:16 +01:00
Armin Zamani 5b20286163 Named CourseArea id more clear in GWT ui bundle, distinct separation
between courseArea id as string in the GWT ui bundle and id as
serializable
2013-03-01 20:49:15 +01:00
Armin Zamani 6ddc28c27b GWT does not like the more readable version of launch file :( 2013-03-01 20:06:49 +01:00
Axel Uhl 71ce87aea5 Merge branch 'master' into racecommittee_integrated 2013-03-01 10:57:22 -08:00
Axel Uhl 328ef036b9 added @Override which seems to have been removed accidentally 2013-03-01 10:57:03 -08:00
Armin Zamani aaf35d1cf7 Fixed Bug 1248: Null check for event in regatta creation dialog was
missing, when no event is selected anymore
2013-03-01 19:49:25 +01:00
Simon Pamies f058b2e51d Added autmatic detection of PROJECT_HOME 2013-03-01 17:51:44 +01:00
Simon Pamies 031791e20b Added hot deploy functionality to command script 2013-03-01 17:09:26 +01:00
fmittag 6fea4e8043 Merge remote-tracking branch 'origin/leaderboard_export_timestamp' 2013-03-01 17:04:58 +01:00