Axel Uhl
|
8e7d44f67f
|
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
|
2016-04-20 13:11:58 +02:00 |
|
Peter Siegmund
|
8bbd025e6e
|
updated Android Studio version
|
2016-04-20 13:03:50 +02:00 |
|
Peter Siegmund
|
6bc4759c14
|
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
|
2016-04-20 13:02:21 +02:00 |
|
Peter Siegmund
|
b0db06a196
|
fixed missing listener because of no unregister old races
|
2016-04-20 13:00:44 +02:00 |
|
Benjamin Barth
|
c9f1ef0258
|
Fixed competitor filter in races tab, which crashed when typing an empty
string
|
2016-04-20 10:42:20 +02:00 |
|
Axel Uhl
|
3d52c3628e
|
upgraded versions of Android apps
Change-Id: I393f5a77eff683c56e8e2dd1ff31f26629fb883a
|
2016-04-19 19:38:46 +02:00 |
|
Axel Uhl
|
075e329065
|
Merge branch 'ubilabs--rcapp--master'
|
2016-04-19 15:16:42 +02:00 |
|
Peter Siegmund
|
8908b06424
|
fixed crash
|
2016-04-19 15:08:17 +02:00 |
|
Axel Uhl
|
671b266e2d
|
Merge branch 'ubilabs--rcapp--master'
|
2016-04-19 14:18:14 +02:00 |
|
Axel Uhl
|
4bf415e864
|
Merge remote-tracking branch 'server/fix_autoupdate_for_playstore' into ubilabs--rcapp--develop
|
2016-04-19 13:19:32 +02:00 |
|
Peter Siegmund
|
4fa09eb223
|
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
|
2016-04-19 08:51:17 +02:00 |
|
Peter Siegmund
|
e282374e1e
|
cleaner approach for handling ManagedRaces loaded by the OnlineDataLoader
|
2016-04-19 08:51:03 +02:00 |
|
Axel Uhl
|
dff84353ac
|
removed preference for ws: over wss: in Igtimi connector because Jetty 9.2.2 can handle wss: just fine
Change-Id: I5fb059daf27278a16fb3256d04b73a94cd7f28c8
|
2016-04-19 00:48:23 +02:00 |
|
Axel Uhl
|
37158839b5
|
shuffle Igtimi server list so a fail-over will eventually end up at a working server
Change-Id: Id29af12d9c57060b6a2d8463db2f3173f0762a03
|
2016-04-19 00:18:22 +02:00 |
|
Axel Uhl
|
5da5e4738c
|
removed unused logging TAG declaration
Change-Id: I8ff27b5f627f9fc6c504bb6cd617a459a312887c
|
2016-04-18 23:46:00 +02:00 |
|
Axel Uhl
|
f00e91075f
|
use constants for exception message construction and matching
Change-Id: I3df736af045d46f1f39dbc0a36a9c0824122b6a8
|
2016-04-18 23:44:51 +02:00 |
|
Axel Uhl
|
f1fedb1d0e
|
fixed exception message text
Change-Id: I18ef82f89058202bed4806bc43e95d5fca0c1ed7
|
2016-04-18 23:43:10 +02:00 |
|
Axel Uhl
|
c73462c3d0
|
Updated mail relaying (markdown)
|
2016-04-18 21:27:41 +00:00 |
|
Peter Siegmund
|
44bb552661
|
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
|
2016-04-18 22:17:21 +02:00 |
|
Peter Siegmund
|
f2df9d96ba
|
fixed ConcurrentModificationException
|
2016-04-18 22:16:34 +02:00 |
|
Peter Siegmund
|
d9f6eddf89
|
Merge branch 'ubilabs--rcapp--bug-3440' into ubilabs--rcapp--develop
|
2016-04-18 21:48:51 +02:00 |
|
Peter Siegmund
|
453c393137
|
set text color with fixed value from custom style (because of API <= 19)
|
2016-04-18 21:48:14 +02:00 |
|
Peter Siegmund
|
7ea37257d3
|
Merge branch 'ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
|
2016-04-18 21:46:58 +02:00 |
|
Peter Siegmund
|
6e8137628b
|
set text color with fixed value from custom style (because of API <= 19)
|
2016-04-18 21:45:36 +02:00 |
|
Axel Uhl
|
255c4c198c
|
Merge branch 'translation' into ubilabs--rcapp--develop
|
2016-04-18 21:27:17 +02:00 |
|
Axel Uhl
|
3d69ff2cd4
|
removed another redundant _en file
Change-Id: I0708a52b978bc35ce814356f4eb74287b94242f2
|
2016-04-18 21:22:02 +02:00 |
|
Axel Uhl
|
29453c91e5
|
removed redundant _en file
Change-Id: Iade51020e0aa71dcad50bd39c3124c3ded279760
|
2016-04-18 21:21:24 +02:00 |
|
Axel Uhl
|
358adc0865
|
re-introduced Unicode escapes where we had them
Change-Id: I57750746cd79c32945584bec1234923d123d3a7c
|
2016-04-18 21:19:49 +02:00 |
|
Axel Uhl
|
9ccd8a8714
|
removed redundant StringMessages_en.properties
Change-Id: I48fc3210c1a9eab465053068713b205ac4c33690
|
2016-04-18 21:11:22 +02:00 |
|
Axel Uhl
|
aa36952e12
|
removed redundant TextMessages_en.properties; it duplicates TextMessages.properties and kills proper Unicode escapes
Change-Id: Ia84f86f8f6cc21899e1b7ec916e1fc684d6245fb
|
2016-04-18 21:06:38 +02:00 |
|
Axel Uhl
|
38d65f22ba
|
Merge branch 'master' into translation
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
Change-Id: I3ff3966a8ebb007d14f37ea96fc6cdcc46a17dd5
|
2016-04-18 20:58:27 +02:00 |
|
Axel Uhl
|
b62c21b1fd
|
Merge remote-tracking branch 'server/master'
|
2016-04-18 20:51:52 +02:00 |
|
Axel Uhl
|
cdd1441bef
|
fixed german translations of a few AdminConsole strings, in particular swapped before/after labels for waypoint addition buttons
Change-Id: I2864f67224105633d9532046b3985681b900177e
|
2016-04-18 20:48:44 +02:00 |
|
Peter Siegmund
|
821ad4ac18
|
Merge branch 'ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
|
2016-04-18 18:59:42 +02:00 |
|
Peter Siegmund
|
b98ffe6568
|
removed unused translation
|
2016-04-18 18:59:16 +02:00 |
|
Peter Siegmund
|
55f956db9b
|
removed unused method
|
2016-04-18 18:58:41 +02:00 |
|
Axel Uhl
|
5b2d063c40
|
added missing imports for ViewCompat
Change-Id: I6986902e1d5870477e0883d43ac8a62861a2d95a
|
2016-04-18 18:44:38 +02:00 |
|
Axel Uhl
|
1dc83816b8
|
added race column factor and explicit factor to RaceCell including its (de-)serialization; belong to bug 1267
Change-Id: I55b343e2447c2837ce678dbc32e1921ce9a2ffa9
|
2016-04-18 18:41:57 +02:00 |
|
Axel Uhl
|
e255120996
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2016-04-18 18:27:54 +02:00 |
|
Axel Uhl
|
4e8ac24419
|
fixed MarkPositionTImeFilterTest after introducing default methods for recordFix with overloads
Change-Id: I8b229022004fe1ebadfc795d03a1aad9ca6f86e0
|
2016-04-18 18:27:24 +02:00 |
|
Axel Uhl
|
1e3a282461
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
Change-Id: I829d43c85301fc7c4cdfe3ab49d1f78e39940b2e
|
2016-04-18 17:48:32 +02:00 |
|
Axel Uhl
|
d88852ac3b
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3595' into ubilabs--rcapp--develop
|
2016-04-18 17:45:36 +02:00 |
|
Axel Uhl
|
86a63366a2
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
Change-Id: Ibc180ab51e659a0c452d64f1756b5d7008ffbfb6
|
2016-04-18 17:35:47 +02:00 |
|
Axel Uhl
|
4ef21a5ccb
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3440' into ubilabs--rcapp--develop
Conflicts:
mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
Change-Id: I4e741f66667c9946b0aa36e25ea759cce47b9c9d
|
2016-04-18 17:31:09 +02:00 |
|
Axel Uhl
|
5f96787626
|
Merge branch 'master' into ubilabs--rcapp--bug-3595
|
2016-04-18 17:03:09 +02:00 |
|
service.tip.git
|
c1e5c60539
|
Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com.
|
2016-04-18 13:56:56 +00:00 |
|
service.tip.git
|
29708e3e0c
|
Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com.
|
2016-04-18 13:56:39 +00:00 |
|
service.tip.git
|
cb2120c819
|
Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com.
|
2016-04-18 13:56:17 +00:00 |
|
Benjamin Barth
|
044d452c68
|
Fixed sign in button which is shown if you access the user details page
when not signed in
|
2016-04-18 14:27:54 +02:00 |
|
Axel Uhl
|
0e16d0a9ee
|
removed the excessive output of ReceiveTrackingDataTest altogether; there may be a connection to bug 3610 (JUnit tests not getting executed)
Change-Id: I019e3097ac35824a3ea7bac9320be952c5183be2
|
2016-04-18 09:49:14 +02:00 |
|