Frederik Petersen
db968e5937
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2014-11-05 12:06:54 +01:00
Axel Uhl
93e818056f
fixed test WindEstimationOnConstructedTracksTest.testWindEstimationPreferringLargerClusters;
...
the test was affected by the now working caching in ShortTimeWindCache, and the "uncached" variant of the non-public API
of DynamicTrackedRaceImpl had to be used instead
2014-11-03 13:44:51 +01:00
Axel Uhl
43b9a0144f
Merge remote-tracking branch 'server/master'
2014-11-03 13:05:34 +01:00
Axel Uhl
4a4172f460
register user management service in AbstractApplicationClientFactory
2014-11-03 13:03:04 +01:00
Simon Pamies
ce47994cda
Added a more descriptive text for scoring schemes that is displayed on Home.html
2014-10-31 15:53:17 +02:00
Axel Uhl
09b85ec2de
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2014-10-30 10:05:22 +01:00
Axel Uhl
0872f24ccf
added test case demonstrating equality/hashCode issues with Collections.unmodifiableCollection
2014-10-30 10:03:41 +01:00
Axel Uhl
6cab4631da
turn CSS obfuscation back on for AdminConsole; should fix Selenium tests regarding selection CSS class name again
2014-10-29 23:48:57 +01:00
Axel Uhl
1c693cf0c0
added styling of LoginPanel which is now a horizontal panel, and the OAuthLoginPanel showing the logos horizontally and small
2014-10-29 12:34:34 +01:00
Frederik Petersen
0b9ec80734
Merge branch 'polar-api' of ssh://sapsailing.com/home/trac/git into polar-api
2014-10-29 12:10:56 +01:00
Frederik Petersen
2307f8a3a9
Added new histogram to polar sheets panel showing datacount over angle
2014-10-29 10:19:30 +01:00
Axel Uhl
baeb7fdd91
Merge branch 'master' into axel-usermanagement
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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/client/StringMessages_ru.properties
2014-10-28 16:11:47 +01:00
Axel Uhl
86bd9af33b
Merge branch 'master' into dataMining
2014-10-28 15:56:56 +01:00
Axel Uhl
d396a39dbc
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
2014-10-28 15:54:09 +01:00
Axel Uhl
a54b22ce47
require role admin/eventmanager/mediaeditor for media editing in RaceBoard
2014-10-28 10:23:39 +01:00
Axel Uhl
2052941172
added preferences support to user store; see bug 2429
2014-10-27 20:22:06 +01:00
Axel Uhl
8b45395fcc
Merge remote-tracking branch 'server/master' into axel-usermanagement
...
Conflicts:
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
2014-10-27 16:40:30 +01:00
EC2 Server
664ed53021
Merge remote branch 'origin/master'
2014-10-27 15:03:45 +00:00
EC2 Server
ac983a80fc
fixing performance issue for maneuver queries in TrackedLegOfCompetitor;
...
The problem was that the calls required the latest results from the manuever cache.
With lots of load on the server, this can cause significant wait times for each
competitor, summing up for the hundreds of competitors that a big race can have.
This commit introduced a waitForLatest:boolean parameter to the corresponding
methods on TrackedLegOfCompetitor which is set to false by the currently existing
using client methods.
2014-10-27 15:02:03 +00:00
EC2 Server
9002b8be11
updated profiling-oriented launch configurations
2014-10-27 15:01:46 +00:00
Frederik Petersen
0b9843cb56
Only estimated wind is used for bearing in backend polars
2014-10-26 10:12:26 +01:00
Axel Uhl
f557de91f4
Merge branch 'master' into axel-usermanagement
...
Conflicts:
java/com.sap.sse.gwt/.classpath
2014-10-23 18:18:47 +02:00
Axel Uhl
5419792aa4
reverted security stuff from SailingGWT.launch again...
2014-10-23 18:17:31 +02:00
Axel Uhl
d5083b8e01
downgraded execution environment of com.sap.sse.gwt from 1.8 to 1.7
2014-10-23 18:13:18 +02:00
Lennart Hensler
a73ca80966
Merge branch 'master' into dataMining
...
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/client/StringMessages_ru.properties
2014-10-23 11:19:02 +02:00
Lennart Hensler
557ee3bff8
Merge branch 'bug2242' into dataMining
2014-10-23 10:27:42 +02:00
Axel Uhl
080972402d
don't fire user update events when the user roles are only displayed because of a selection change; update the user info only when the *current* user has changed
2014-10-22 17:29:24 +02:00
fmittag
f90d107152
removed usage of old BoatTypes enum with usage of BoatClassMasterdata enum in CompetitorEditDialog
2014-10-22 16:57:44 +02:00
Axel Uhl
d4d1c2fdf7
fixed SailingGWT launch config again
2014-10-22 13:47:17 +02:00
Axel Uhl
f1daf11a33
added parameter withtack to competitor positions REST API, defaulting to false (INCOMPATIBLE CHANGE), avoiding very expensive calculations on the server
2014-10-22 13:42:48 +02:00
Frederik Petersen
afe364a78d
Fixed server launch configs
2014-10-22 11:55:53 +02:00
Frederik Petersen
fc75b17ace
Merge branch 'master' into polar-api
2014-10-22 10:16:37 +02:00
Axel Uhl
f9bfddfd72
introduced AnyOfRolesFilter as OR-variant of roles[...] shiro filter
2014-10-21 23:52:36 +02:00
Axel Uhl
dc9555448b
updated permissions for gwt.ui pages; fixed role checks for admin console
2014-10-21 18:29:42 +02:00
Axel Uhl
7f0efc4a53
Merge remote-tracking branch 'server/master'
2014-10-21 16:20:04 +02:00
Axel Uhl
af7d2e5e24
Merge remote-tracking branch 'server/master' into axel-usermanagement
2014-10-21 16:17:34 +02:00
Axel Uhl
b52e4bf3e7
removed security stuff again from master after accidental merge
2014-10-21 16:15:32 +02:00
fmittag
cafa5889ee
fix for bug2421: Stage should show last events in chronological order if no live or future events exist
2014-10-21 14:06:11 +02:00
Axel Uhl
79970cdd7a
removed the removed userstore bundle from feature.xml
2014-10-21 08:59:11 +02:00
Fredrik Teschke
40aace7f3f
Merge branch 'master' of sapsailing.com:/home/trac/git
2014-10-21 08:52:53 +02:00
Fredrik Teschke
c190e8023e
remove trailing slash of server url in device mapping QRCode
2014-10-21 08:52:40 +02:00
Axel Uhl
c3af251aa3
Merge branch 'master' into axel-usermanagement
2014-10-20 21:09:32 +02:00
Axel Uhl
585637a736
Merge remote-tracking branch 'server/master'
2014-10-20 21:08:49 +02:00
Axel Uhl
356391b1cb
fixed SailingGWT.launch configuration after entry point renaming
2014-10-20 18:57:09 +02:00
Axel Uhl
aba53e9747
working towards a solution for bug 2420: computing the email validation base URL on the client, passing it to the server
2014-10-20 18:20:32 +02:00
Axel Uhl
ac5f9ec819
as we'll do that for bug 2378 for the user management MongoDB collections, this does it also for the SwissTiming and TracTrac persistence bundles
2014-10-20 16:17:00 +02:00
Lennart Hensler
f7cc736b41
The filter dimensions are now corresponding to the retriever chain
2014-10-20 15:41:44 +02:00
fmittag
f6882ba810
fix for bug 2231: Dependency of newhome code on static resources on web server
2014-10-20 15:16:18 +02:00
Axel Uhl
f66a60893a
wait for admin console tab before trying to click it
2014-10-18 13:48:32 +02:00
Axel Uhl
aa81b40d58
catch mail exception when setting/changing user email and log it instead of escalating; changed security.properties again to use 127.0.0.1 as mail server
2014-10-18 10:09:20 +02:00