Peter Siegmund
|
c5abd3eb08
|
Merge branch 'master' into android_apps
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
|
2014-11-19 07:58:37 +01:00 |
|
Lukas Zielinski
|
62a1c4d07d
|
TRACKING APP: Display general preferences instead of headers
|
2014-11-18 19:07:12 +01:00 |
|
Lukas Zielinski
|
fde598d37a
|
TRACKING-APP: Launch with url
|
2014-11-18 17:57:12 +01:00 |
|
fmittag
|
e8d6308b0b
|
changed link for SAP logo to point to http://sapsponsorships.com
|
2014-11-18 17:32:49 +01:00 |
|
fmittag
|
5d3d628f1b
|
Merge remote-tracking branch 'origin/bug2200'
|
2014-11-18 17:13:58 +01:00 |
|
fmittag
|
5eb96fbe4c
|
Merge remote-tracking branch 'origin/master' into bug2200
|
2014-11-18 17:09:34 +01:00 |
|
Axel Uhl
|
3d11c2ea11
|
removed InterruptedException again from signature of authorize session in AbstractSeleniumTest
|
2014-11-18 16:55:18 +01:00 |
|
Axel Uhl
|
4d31181c8b
|
fixed merge conflicts
|
2014-11-18 16:54:40 +01:00 |
|
Axel Uhl
|
11a4133e76
|
Merge remote-tracking branch 'server/master'
|
2014-11-18 16:49:53 +01:00 |
|
Axel Uhl
|
aaf49f9302
|
solving the issue with UI tests sporadically failing due to authorization issues; the problem was that a request for Login.html also creates a session asynchronously, causing a race condition
|
2014-11-18 16:48:59 +01:00 |
|
Lukas Zielinski
|
41ba14e1d5
|
TRACKING APP: Multi-checkin works
|
2014-11-18 15:47:36 +01:00 |
|
Fredrik Teschke
|
03884c754a
|
Merge branch 'master' of sapsailing.com:/home/trac/git
Conflicts:
java/com.sap.sailing.feature/feature.xml
|
2014-11-18 14:51:16 +01:00 |
|
fmittag
|
3fdc88e081
|
fixed scroll to top problem on solutions page
|
2014-11-18 14:49:24 +01:00 |
|
Fredrik Teschke
|
1adaa25dfd
|
implement IsSerializable instead of Serializable
|
2014-11-18 14:47:48 +01:00 |
|
Fredrik Teschke
|
bea01d27d8
|
only pass RaceLogEvent ids that are UUIDs to browser
|
2014-11-18 14:44:12 +01:00 |
|
Fredrik Teschke
|
9d8f7313b8
|
avoid using Serializable to refer to MarkDTO/CompetitorDTO
|
2014-11-18 14:26:04 +01:00 |
|
fmittag
|
cd19c560da
|
fixed solutions navigation (this is always a local link)
|
2014-11-18 13:55:28 +01:00 |
|
Fredrik Teschke
|
3543da6230
|
fix feature.xml: com.sap.sailing.mongodb -> com.sap.sse.mongodb
|
2014-11-18 13:33:30 +01:00 |
|
fmittag
|
1075abcb91
|
Merge remote-tracking branch 'origin/master' into bug2200
|
2014-11-18 13:20:51 +01:00 |
|
fmittag
|
c260ca8f73
|
unified the way the regatta list, regatta list selection and regatta details are shown (like leaderboard, tracked races, etc.)
|
2014-11-18 13:01:02 +01:00 |
|
Lukas Zielinski
|
9a66ae9479
|
Merge branch 'android_apps' of ssh://sapsailing.com/home/trac/git into android_apps
|
2014-11-18 12:27:56 +01:00 |
|
Lukas Zielinski
|
075054e3b1
|
bugfix for batch-insert in HomeFragment.java, addeed development helper class SqlDebugHelper.java
|
2014-11-18 12:27:48 +01:00 |
|
Peter Siegmund
|
96f0635e69
|
RCApp:
- ActionBar is now a Toolbar
- Moved race selection from left pane into a navigation drawer
- refactored deprecated functions
|
2014-11-18 08:19:09 +01:00 |
|
Lukas Zielinski
|
119a8f1664
|
HomeFragment.java : data is now persisted and user is forwardet to RegattaActivity
|
2014-11-17 20:11:38 +01:00 |
|
Lukas Zielinski
|
a571a17b04
|
wip HomeFragment.java
|
2014-11-17 17:24:56 +01:00 |
|
fmittag
|
90764106a2
|
fixed initial page positioning for solutions page
|
2014-11-17 17:09:11 +01:00 |
|
fmittag
|
b062a2cb1a
|
implemented tab navigation and history management for solutions page
|
2014-11-17 16:46:17 +01:00 |
|
Lukas Zielinski
|
6134a6cdb8
|
temporary fix in HomeFragment.java
|
2014-11-17 16:23:22 +01:00 |
|
Lukas Zielinski
|
1c2f686eea
|
added missing fields in DB
|
2014-11-17 16:22:50 +01:00 |
|
Lukas Zielinski
|
e0dc338a92
|
database refactoring
|
2014-11-17 15:38:12 +01:00 |
|
Lennart Hensler
|
dd6ed1c0fe
|
Cleaned the feature.xml and the SailingGWT.launch
|
2014-11-17 15:10:50 +01:00 |
|
Lukas Zielinski
|
3456da7e35
|
wip checkin with proper data fetch
|
2014-11-17 13:42:37 +01:00 |
|
fmittag
|
a8a214558b
|
fixed url issue with adding a history entry for tab navigation
|
2014-11-17 13:31:32 +01:00 |
|
Lukas Zielinski
|
b0138f8ca8
|
wip checkin with proper data fetch
|
2014-11-17 12:06:22 +01:00 |
|
Axel Uhl
|
1eebe04880
|
Merge remote-tracking branch 'server/master'
|
2014-11-16 23:11:23 +01:00 |
|
Axel Uhl
|
03a0496a5f
|
Merge branch 'bug2425'
|
2014-11-16 22:11:20 +01:00 |
|
Axel Uhl
|
c176ff1c09
|
fixed composition of admin console entry point, skipping creation of info panel which is being handled by AdminConsolePanel now
|
2014-11-16 22:10:38 +01:00 |
|
Fredrik Teschke
|
d0de308b09
|
Merge branch 'master' of sapsailing.com:/home/trac/git
|
2014-11-16 20:14:03 +01:00 |
|
Fredrik Teschke
|
4acf842890
|
add gpsfixes endpoint in REST API and update tracking app
|
2014-11-16 20:13:28 +01:00 |
|
Fredrik Teschke
|
ebf4cc5fed
|
remove gpsfixes servlet from racelogtrackingadapter
|
2014-11-16 20:10:50 +01:00 |
|
Fredrik Teschke
|
17ba799017
|
clean up racelogtracking test support
|
2014-11-16 20:09:48 +01:00 |
|
Fredrik Teschke
|
7c9ae440c1
|
change exec env of racelogtrackingadapter-testsupport to JavaSE-1.8
|
2014-11-16 20:03:24 +01:00 |
|
Fredrik Teschke
|
7ce671ecaf
|
Updated tracking app api v1 draft (markdown)
|
2014-11-16 18:19:33 +00:00 |
|
Fredrik Teschke
|
8e24c3d643
|
Updated tracking app api v1 draft (markdown)
|
2014-11-16 18:01:22 +00:00 |
|
Fredrik Teschke
|
b8b8a6b18f
|
Updated tracking app api v1 draft (markdown)
|
2014-11-16 17:43:36 +00:00 |
|
Fredrik Teschke
|
8dea7b4afb
|
Updated tracking app api v1 draft (markdown)
|
2014-11-16 17:43:03 +00:00 |
|
Axel Uhl
|
c7ffdcb2d2
|
added check to start httpd server when REPLICATION_ON_START=True, adding "Use Event" line to 001-events.conf
|
2014-11-14 23:22:49 +01:00 |
|
Lukas Zielinski
|
c05598500b
|
wip race checkin
|
2014-11-14 22:53:10 +01:00 |
|
fmittag
|
a57d1a69d6
|
Merge remote-tracking branch 'origin/master' into bug2200
|
2014-11-14 18:07:18 +01:00 |
|
Lukas Zielinski
|
0e01f4c56d
|
documentation, updated AndroidManifest.xml
|
2014-11-14 17:57:44 +01:00 |
|