Axel Uhl
|
01f2edb2ae
|
avoid warnings in Selenium bundle; removed hard-coded file system path for Firefox executable for Selenium tests
|
2013-12-11 00:22:06 +01:00 |
|
Axel Uhl
|
cc96577372
|
manage Igtimi wind tracker stopping better
|
2013-12-10 23:50:44 +01:00 |
|
Axel Uhl
|
1fc4558dcb
|
Merge branch 'master' into igtimi
Conflicts:
java/com.sap.sailing.selenium.test/com.sap.sailing.selenium.test (No Proxy, GWT Codesvr).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-12-10 21:27:45 +01:00 |
|
Axel Uhl
|
90ca13d266
|
re-added GWT debug mode launch config without proxy for Selenium tests
|
2013-12-10 21:07:35 +01:00 |
|
Axel Uhl
|
1d52672642
|
added a first version of an "Igtimi Accounts" panel that allows users to authorize access to one or more Igtimi users by the application
|
2013-12-10 21:06:26 +01:00 |
|
Simon Pamies
|
89a60bc454
|
Fixed naming of release file
|
2013-12-10 16:19:03 +01:00 |
|
Simon Pamies
|
4fdc36c87f
|
Whitespace cleanup
|
2013-12-10 16:15:52 +01:00 |
|
Simon Pamies
|
5aadc65aba
|
dding more documentation
|
2013-12-10 16:12:27 +01:00 |
|
Simon Pamies
|
4bc6538e14
|
Added error message explaining the cause for faulty install run
|
2013-12-10 16:06:20 +01:00 |
|
Simon Pamies
|
5618ead157
|
More DEPLOY_To fixes
|
2013-12-10 16:01:47 +01:00 |
|
D049941
|
04e7c3e5c0
|
Merge remote-tracking branch 'origin'
|
2013-12-10 15:54:15 +01:00 |
|
Simon Pamies
|
68b7e8fde6
|
Fixed missing DEPLOY_TO
|
2013-12-10 15:51:51 +01:00 |
|
D049941
|
5b9d469d5b
|
Merge branch 'master-for-merge'
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java
java/com.sap.sailing.selenium.test/local-test-environment.xml
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-12-10 15:49:40 +01:00 |
|
Simon Pamies
|
d84a518e56
|
Fixed problem with variable sourcing
|
2013-12-10 15:32:37 +01:00 |
|
Simon Pamies
|
cf285e0d10
|
Minor changes to messages
|
2013-12-10 15:25:43 +01:00 |
|
Simon Pamies
|
50b7f468ff
|
Make sure to output build process
|
2013-12-10 15:21:47 +01:00 |
|
Simon Pamies
|
bcce85c7d3
|
Make sure to honor no-overwrite setting
|
2013-12-10 15:18:56 +01:00 |
|
Simon Pamies
|
6e2c9d639d
|
Make sure to copy the right scripts to target directories
|
2013-12-10 15:18:37 +01:00 |
|
Simon Pamies
|
4b045c8a65
|
Removed updateEC2Instance.sh; made sure that refreshInstance.sh can be used without running on Amazon
|
2013-12-10 15:14:15 +01:00 |
|
Simon Pamies
|
5a3d24b3a3
|
Updated description for prepare script
|
2013-12-10 14:48:59 +01:00 |
|
Simon Pamies
|
f017acd3a7
|
Added options to prepareInstanceOnAmazon to enable users to install a release manually
|
2013-12-10 14:48:59 +01:00 |
|
Simon Pamies
|
3194028837
|
Refactored env.sh logic: Removed all magic from start, stop and status scripts moved it into prepareInstanceOnAmazon.sh that rewrites env.sh
|
2013-12-10 14:48:59 +01:00 |
|
Simon Pamies
|
fd139bc27f
|
Cleaned scripts removing unneeded ones
|
2013-12-10 14:48:59 +01:00 |
|
Axel Uhl
|
5da904a79d
|
Merge branch 'master' into igtimi
|
2013-12-10 09:29:09 +01:00 |
|
Axel Uhl
|
a35c1bbc95
|
fixed competitor color serialization after switching from String to Color
|
2013-12-10 09:28:31 +01:00 |
|
Axel Uhl
|
cd2be05848
|
added link to authorize analytics through Igtimi OAuth web front-end
|
2013-12-10 01:34:19 +01:00 |
|
Axel Uhl
|
afb6bf1126
|
adding an Igtimi account via the UI works
|
2013-12-10 01:08:18 +01:00 |
|
Axel Uhl
|
6510d8643b
|
first steps towards an Igtimi accounts management panel in the AdminConsole
|
2013-12-10 00:54:28 +01:00 |
|
Axel Uhl
|
06e8413847
|
started an Igtimi AdminConsole panel to manage Igtimi accounts
|
2013-12-10 00:33:11 +01:00 |
|
Axel Uhl
|
28a7419cb6
|
Merge branch 'master' into igtimi
|
2013-12-09 23:34:36 +01:00 |
|
Axel Uhl
|
bca2a9b982
|
fixed serialization/deserialization for null colors
|
2013-12-09 23:08:02 +01:00 |
|
Axel Uhl
|
1404c18f67
|
replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO
|
2013-12-09 22:06:29 +01:00 |
|
Axel Uhl
|
2b472d1c02
|
extracted HTML-mapping of colors into abstract color class
|
2013-12-09 21:19:11 +01:00 |
|
Axel Uhl
|
e952f42176
|
removed redundant getDynamicCompetitor method
|
2013-12-09 20:49:22 +01:00 |
|
Axel Uhl
|
1e2cd16e89
|
fixed swapped name/color in CompetitorImpl.resolve
|
2013-12-09 20:42:57 +01:00 |
|
Axel Uhl
|
02fcb5e866
|
also introduced competitor color to fillDataStore in OfflineDataManager for RCApp
|
2013-12-09 17:56:56 +01:00 |
|
Axel Uhl
|
26652be077
|
added missing class AbstractWindTracker
|
2013-12-09 17:53:27 +01:00 |
|
Axel Uhl
|
fb06817a75
|
register the Expedition wind tracker factory also with the Expedition-specific class
|
2013-12-09 17:35:10 +01:00 |
|
Axel Uhl
|
b1678d914c
|
switched RacingEventServiceImpl to WindTrackerFactory discovery through OSGi service lookup
|
2013-12-09 17:33:57 +01:00 |
|
fmittag
|
11fa0b848e
|
Merge remote-tracking branch 'origin/competitorpanel_reuse'
|
2013-12-09 16:54:14 +01:00 |
|
fmittag
|
d22a59ccc6
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
|
2013-12-09 16:37:14 +01:00 |
|
Axel Uhl
|
1749cd54dd
|
removed expedition dependency from RacingEventService
|
2013-12-09 15:37:31 +01:00 |
|
Axel Uhl
|
0c760ba826
|
Merge branch 'master' into igtimi
|
2013-12-09 14:56:26 +01:00 |
|
Axel Uhl
|
007cc6d2e9
|
added Igtimi WindTracker implementation
|
2013-12-09 14:56:06 +01:00 |
|
D049941
|
be3aecf067
|
Bundle com.sap.sailing.server.gateway.test.support added to be able to
clear the state in tests.
|
2013-12-09 14:33:13 +01:00 |
|
D049941
|
3b1d491b65
|
Required bundles fixed.
|
2013-12-09 13:40:12 +01:00 |
|
D049941
|
984420ae06
|
Launch configuration with database 'winddbTest' added for the execution
of UI-Tests.
|
2013-12-09 13:11:47 +01:00 |
|
D049941
|
2ceb84348f
|
System.out.println removed
|
2013-12-09 13:05:46 +01:00 |
|
D049941
|
9c3c8cfaf3
|
Merge branch 'riccardo' into 'master-for-merge'
Conflicts:
java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java
|
2013-12-09 13:00:58 +01:00 |
|
fmittag
|
ccf2af0a54
|
fixed little color editing bug
|
2013-12-09 11:55:04 +01:00 |
|