fmittag
73023129c5
Merge remote-tracking branch 'origin/master' into design2015
2015-02-12 13:04:23 +01:00
fmittag
ebf6ad882b
Merge remote-tracking branch 'origin/master'
2015-02-12 12:51:10 +01:00
fmittag
b69b31120d
Merge remote-tracking branch 'origin/master' into gwt27_allinone
...
Conflicts:
java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-12 12:36:43 +01:00
Axel Uhl
92f4ba8941
Merge remote-tracking branch 'server/master'
2015-02-12 11:03:49 +01:00
Axel Uhl
f29adc1aa8
removed method from SailingService that wasn't used through RPC
2015-02-12 10:49:18 +01:00
Axel Uhl
65a6ee7025
fixed sorting order in no-race low-point comparison
2015-02-12 10:49:00 +01:00
fmittag
4a5620ca64
back to the future... changed date from 2054 -> 2015 for a news headline :-)
2015-02-12 10:42:50 +01:00
Axel Uhl
8841360f8d
implementing a sorting rule that puts competitors with no races scored behind those that scored at least one race
2015-02-12 10:38:34 +01:00
Axel Uhl
495e1f1f96
minor string message fixes; added entry to admin console release notes about changes
2015-02-11 18:45:44 +01:00
Axel Uhl
7b8b01fd21
Merge branch 'master' into bug_2645
2015-02-11 18:27:56 +01:00
Alexander Ries
1348cf5236
Added Link to Event Overview to EventDetailsComposite
2015-02-11 15:24:45 +01:00
Axel Uhl
2beba1f5d1
Merge remote-tracking branch 'server/master'
2015-02-11 14:48:06 +01:00
Alexander Ries
f4e43d9674
Event in AdminConsole => Events links now to Event View in Home.html
2015-02-11 14:43:27 +01:00
Axel Uhl
6e6a49467f
added release notes entry for nnew "Start delay" leaderboard column
2015-02-11 12:04:49 +01:00
Fredrik Teschke
0c284eed0b
Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms'
2015-02-11 11:55:39 +01:00
Axel Uhl
bc3437892e
added column to leaderboard showing the time since race start in seconds
2015-02-11 11:45:50 +01:00
Axel Uhl
5e4a77cf28
Merge branch 'master' into ribdashboard
...
Conflicts:
java/com.sap.sailing.gwt.ui/pom.xml
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2015-02-11 11:06:51 +01:00
Axel Uhl
120bef131e
activated obfuscation again, hoping that the "wait for PENDING_AJAX_CALLS" cuts it
2015-02-11 08:52:33 +01:00
Axel Uhl
f807849f2a
wait for PENDING_AJAX_CALLS to appear, catching and logging exception when it's not yet there, then continue to wait
2015-02-11 08:51:43 +01:00
Axel Uhl
6c413b7afe
generate PRETTY GWT output for gwt.ui for now; does this impact Selenium test cases and the availability of the PENDING_AJAX_CALLS variable?
2015-02-11 08:35:37 +01:00
Axel Uhl
1632e7d37c
trying again with PRETTY GWT output; does this really affect the PENDING_AJAX_CALLS variable's availability?
2015-02-11 08:33:26 +01:00
Axel Uhl
fffb06c7f2
re-enable obfuscation for gwt.ui GWT compile
2015-02-10 23:36:33 +01:00
Axel Uhl
6cd449928b
fixed winddbTest launch configs, re-enabling the accidentally disabled gateway.testsupport bundle as auto-start
2015-02-10 23:32:32 +01:00
Axel Uhl
d66bbda63b
export org.json from org.openqa.selenium.osgi bundle
2015-02-10 23:29:56 +01:00
Axel Uhl
8646840cec
harmonized launch configurations
2015-02-10 23:17:35 +01:00
Axel Uhl
b728d2f85a
export org.json from org.openqa.selenium.osgi bundle
2015-02-10 22:34:08 +01:00
Axel Uhl
f3f1c90417
Merge branch 'master' into ribdashboard
2015-02-10 16:02:52 +01:00
Axel Uhl
69e29365f8
fixing bug 2643 by making result comparison more intelligent
2015-02-10 16:01:08 +01:00
Axel Uhl
7ac80d71e3
Merge branch 'master' into ribdashboard; introduced gwt.workers property in maven build
...
Conflicts:
configuration/buildAndUpdateProduct.sh
2015-02-10 15:27:01 +01:00
Axel Uhl
4e55e61c51
fixed merge problems in launch configs, adding file storage bundle everywhere
2015-02-10 14:37:41 +01:00
Axel Uhl
66d8b8fc4d
added gwtbootstrap Maven dependency to dashboards project
2015-02-10 14:28:00 +01:00
Axel Uhl
bcac803264
re-add WEB-INF/classes to .gitignore so only .dummy file will be checked out
2015-02-10 14:19:04 +01:00
Axel Uhl
cf58c8babf
re-formatted dashboard pom.xml files; introduced .dummy file in WEB-INF/classes to ensure directory is there after check-out
2015-02-10 14:18:28 +01:00
Axel Uhl
cc4d9e320e
re-formatted java/pom.xml
2015-02-10 14:14:08 +01:00
Axel Uhl
012ed3b242
added filestorage bundle to feature.xml (probably resolving an ill-resolved merge conflict)
2015-02-10 13:50:45 +01:00
Axel Uhl
2af95c003c
added inherits for AdminConsole.gwt.xml
2015-02-10 13:40:46 +01:00
Axel Uhl
96f27612aa
Merge branch 'master' into ribdashboard
2015-02-10 13:22:06 +01:00
Axel Uhl
4694814938
avoid NPE after de-serializing a TrackedRaceImpl by moving shortTimeWindCache creation to the front of readObject(...)
2015-02-10 13:21:03 +01:00
Axel Uhl
1ed846859c
Merge branch 'master' into ribdashboard
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-10 13:00:48 +01:00
Axel Uhl
34873bb0eb
Merge remote-tracking branch 'server/master'
2015-02-10 12:40:17 +01:00
Axel Uhl
5ba401dbb1
exclude the currently defective com.sap.sse.gwt.test fragment from the build; we first need to fit it into the Maven environment properly
2015-02-10 12:38:40 +01:00
Simon Pamies
c699662075
Removed exclusion of a test in com.sap.sse.gwt
2015-02-10 06:56:54 +01:00
Fredrik Teschke
c861fcbd74
upgrade poms of shared and common bundles to 1.7 compiler level
2015-02-10 03:09:27 +01:00
Fredrik Teschke
f4db3f7a30
Merge branch 'ftes-file-storage-i18n'
2015-02-09 21:23:44 +01:00
Axel Uhl
fd56e1866b
avoid build.properties warnings in new com.sap.sse.gwt.test project by adding resources/
2015-02-09 17:41:56 +01:00
Axel Uhl
f40b1d0d72
Merge remote-tracking branch 'server/master'
2015-02-09 17:19:39 +01:00
Axel Uhl
accfa9851b
minor patch to avoid ConcurrentModificationException during GWT DevMode where true concurrency can happen
2015-02-09 17:19:12 +01:00
Papick Garcia Taboada
3cdc04cddd
Merge branch 'design2015' of ssh://trac@sapsailing.com/home/trac/git
...
into design2015
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event2/EventView.java
2015-02-09 15:57:28 +01:00
Papick Garcia Taboada
addba7d0ea
Added leaderboard placeholder, minor refactorings
2015-02-09 15:54:29 +01:00
Steffen Schaefer
f87706eee8
Removed -XstartOnFirstThread
2015-02-09 12:25:03 +01:00
fmittag
Axel Uhl
Alexander Ries
Fredrik Teschke
Simon Pamies
Papick Garcia Taboada
Steffen Schaefer