Lukas Niemeier
|
4fd1c55b7e
|
# StartTime now carries timestamp of starttime
# Running status event now is starttime + 1
|
2013-03-04 18:02:26 +01:00 |
|
Lukas Niemeier
|
0af3d0c6dd
|
# moved some classes
|
2013-03-04 18:01:50 +01:00 |
|
Lukas Niemeier
|
79379e416a
|
Merge branch 'racecommittee_regattaoverview' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/racelog/impl/PassAwareRaceLogImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/RaceStatusAnalyzer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java
|
2013-03-04 16:59:42 +01:00 |
|
Lukas Niemeier
|
57ae38befb
|
# working on test for chooser
|
2013-03-04 16:50:10 +01:00 |
|
Lukas Niemeier
|
c1f9b0b662
|
# added serializer for RaceLogPassChangeEvent
|
2013-03-04 16:48:35 +01:00 |
|
Lukas Niemeier
|
d58a304b77
|
# moved some tests
# added test for CourseAreaChangedEventSerializer
|
2013-03-04 16:07:47 +01:00 |
|
Lukas Niemeier
|
0c893fc8ad
|
# removed unused method
|
2013-03-04 15:33:41 +01:00 |
|
Lukas Niemeier
|
751061ebfb
|
# this branch uses mockito now - please reload your target platform
# venue tests added
|
2013-03-04 15:33:28 +01:00 |
|
Lukas Niemeier
|
8a3ec3ff63
|
# remove pending intents on success
|
2013-03-04 14:33:35 +01:00 |
|
Lukas Niemeier
|
d9de62c0f1
|
# changed default server names to localhost
|
2013-03-04 14:33:19 +01:00 |
|
Lukas Niemeier
|
9c7caab73e
|
# added missing FinishedTimeFinder
|
2013-03-04 02:12:23 +01:00 |
|
Lukas Niemeier
|
9634d31392
|
# showing some info about the race in the appropriate fragments
|
2013-03-04 02:02:05 +01:00 |
|
Lukas Niemeier
|
12245b2460
|
# transition between schedulded running finishing finished done
|
2013-03-04 01:39:21 +01:00 |
|
Lukas Niemeier
|
137f5544c8
|
# working towards finishing fragment
|
2013-03-04 01:36:06 +01:00 |
|
Fabian Tschirschnitz
|
65a2ca80b5
|
added some rudimentary table to the gwt regattaoverview.
|
2013-03-04 00:56:18 +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 |
|
Fabian Tschirschnitz
|
47d7e63e1c
|
put the racelogs to each racecolumnDTO
|
2013-03-03 19:33:30 +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 |
|
Fabian Tschirschnitz
|
e062c8f8e9
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_regattaoverview
|
2013-03-02 17:12:59 +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 |
|
Fabian Tschirschnitz
|
042ce44f6b
|
started to implement RegattaOverview as GWT, started to create DTO objects for ui
|
2013-03-02 17:09:56 +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 |
|