 Peter Siegmund
|
11e0a29b11
|
Merge branch 'master' of ssh://sapsailing.com/home/trac/git
|
2016-01-26 10:46:25 +01:00 |
|
|
Peter Siegmund
|
41a3ceba4b
|
different EULA html
|
2016-01-26 10:46:03 +01:00 |
|
|
Peter Siegmund
|
1e0e93f5d2
|
Merge branch 'ubilabs--rcapp--master'
|
2015-10-19 17:17:13 +02:00 |
|
|
Peter Siegmund
|
c3222519f5
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-10-19 09:14:47 +02:00 |
|
|
Peter Siegmund
|
876a046be4
|
removed getClass check for RaceFlagViewerFragment
|
2015-10-16 13:43:35 +02:00 |
|
|
Peter Siegmund
|
5247877986
|
Merge branch 'ubilabs--rcapp--master'
|
2015-09-12 11:00:02 +02:00 |
|
|
Peter Siegmund
|
8693de6be1
|
fixing Lint error because of new API in API 23 (Marshmallow)
|
2015-09-10 12:14:41 +02:00 |
|
|
Peter Siegmund
|
b1fa4c26cc
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--master
|
2015-09-10 10:41:17 +02:00 |
|
|
Peter Siegmund
|
ab6225983a
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-09-10 10:38:52 +02:00 |
|
|
Peter Siegmund
|
f19030f5d1
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-09-10 10:38:46 +02:00 |
|
|
Peter Siegmund
|
97a93d42a8
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-09-09 08:57:53 +02:00 |
|
|
Peter Siegmund
|
532c8cbfc4
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-09-09 08:57:28 +02:00 |
|
|
Peter Siegmund
|
abcee0779b
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-09-04 08:59:52 +02:00 |
|
|
Peter Siegmund
|
d301e5f3fa
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-09-04 08:59:47 +02:00 |
|
|
Peter Siegmund
|
91a975baa7
|
Bug 3251 - RCApp constantly crashes when receiving updates
|
2015-09-01 10:47:28 +02:00 |
|
|
Peter Siegmund
|
c07e16ee24
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-09-01 08:45:58 +02:00 |
|
|
Peter Siegmund
|
2b5c8508f9
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-09-01 08:45:52 +02:00 |
|
|
Peter Siegmund
|
28712b646d
|
updating gradle wrapper
|
2015-08-24 09:28:41 +02:00 |
|
|
Peter Siegmund
|
a4ce01dccb
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-24 09:11:31 +02:00 |
|
|
Peter Siegmund
|
def5fc943f
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-20 17:13:22 +02:00 |
|
|
Peter Siegmund
|
fab658450a
|
return also in By-Course (not 100% implemented, but if the setting is wrong)
|
2015-08-13 11:42:22 +02:00 |
|
|
Peter Siegmund
|
91a30b62ab
|
back from By-Marks Course Designer while race setup
|
2015-08-13 11:38:44 +02:00 |
|
|
Peter Siegmund
|
957fe53224
|
Bug 3204 - Lollipop protest time chooser
|
2015-08-13 11:21:29 +02:00 |
|
|
Peter Siegmund
|
4a5bc79cd4
|
Removed warning (sorry for the @SuppressWarnings("unchecked") in LoginBackdrop - it's because of the usage of reflection)
|
2015-08-12 20:12:36 +02:00 |
|
|
Peter Siegmund
|
7f0fb0f89b
|
Merge branch 'ubilabs--rcapp--feature--phone-login' into ubilabs--rcapp--develop
|
2015-08-12 14:29:46 +02:00 |
|
|
Peter Siegmund
|
9dd5367d49
|
Bug 3205 - Font size in NavDrawer on Lollipop broken
|
2015-08-12 14:02:07 +02:00 |
|
|
Peter Siegmund
|
969d14b46c
|
Bug 3204 - Lollipop protest time chooser
|
2015-08-12 13:49:56 +02:00 |
|
|
Peter Siegmund
|
07105c2005
|
ripples in popup menu (not working yet)
|
2015-08-12 13:27:23 +02:00 |
|
|
Peter Siegmund
|
83461cb120
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 10:53:55 +02:00 |
|
|
Peter Siegmund
|
dc1e1b8c54
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-08-12 10:53:48 +02:00 |
|
|
Peter Siegmund
|
9a6e5e6fbc
|
Merge branch 'ubilabs--rcapp--master' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--master
|
2015-08-12 10:53:18 +02:00 |
|
|
Peter Siegmund
|
dc09162343
|
&& was correct - fixed it back
|
2015-08-12 10:52:51 +02:00 |
|
|
Peter Siegmund
|
0143d24e2c
|
fixed popup normal color
|
2015-08-12 10:34:53 +02:00 |
|
|
Peter Siegmund
|
403378f2a6
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 09:22:30 +02:00 |
|
|
Peter Siegmund
|
22a145b23e
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-08-12 09:22:15 +02:00 |
|
|
Peter Siegmund
|
95e0ad5d4d
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-08-12 09:21:57 +02:00 |
|
|
Peter Siegmund
|
d845bc3743
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-12 09:21:50 +02:00 |
|
|
Peter Siegmund
|
c4c91739e2
|
wrong comparison (&& instead of ||)
|
2015-08-12 09:20:41 +02:00 |
|
|
Peter Siegmund
|
16f8c6bed5
|
tablet portrait (login) is same as landscape - it's okay with that layout
|
2015-08-11 16:52:39 +02:00 |
|
|
Peter Siegmund
|
077042ac30
|
changed layout folder (from sw600dp to w900dp) for tablets
|
2015-08-11 16:34:02 +02:00 |
|
|
Peter Siegmund
|
8995fda313
|
login screen for phone layout (portrait) should be finished
|
2015-08-11 12:26:43 +02:00 |
|
|
Peter Siegmund
|
a7a7489e65
|
login screen for phone and tablet
|
2015-08-10 16:34:47 +02:00 |
|
|
Peter Siegmund
|
a9afece0c8
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-08-10 08:54:26 +02:00 |
|
|
Peter Siegmund
|
b3634fb3a2
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-10 08:54:18 +02:00 |
|
|
Peter Siegmund
|
5c6ac976be
|
Merge branch 'ubilabs--rcapp--bug_3188' into ubilabs--rcapp--develop
|
2015-08-04 09:45:21 +02:00 |
|
|
Peter Siegmund
|
de8b23279c
|
Merge branch 'ubilabs--rcapp--bug_3150' into ubilabs--rcapp--develop
|
2015-08-04 09:45:04 +02:00 |
|
|
Peter Siegmund
|
de03467180
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-08-04 09:40:19 +02:00 |
|
|
Peter Siegmund
|
cdcc372de9
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-04 09:40:14 +02:00 |
|
|
Peter Siegmund
|
1a83abc3a4
|
renamed ViewHolder into ViewHelper
|
2015-08-04 08:58:36 +02:00 |
|
|
Peter Siegmund
|
3572312382
|
refactored AppUtils
|
2015-08-04 08:56:39 +02:00 |
|
|
Peter Siegmund
|
25147f381c
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-31 13:37:42 +02:00 |
|
|
Peter Siegmund
|
6af5f06518
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-31 13:37:14 +02:00 |
|
|
Peter Siegmund
|
48da623868
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-29 09:23:55 +02:00 |
|
|
Peter Siegmund
|
4df5d575d4
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-29 09:23:46 +02:00 |
|
|
Peter Siegmund
|
bac1e7378b
|
Merge branch 'bug3160' into ubilabs--rcapp--master
|
2015-07-29 09:23:41 +02:00 |
|
|
Peter Siegmund
|
99fea4e443
|
only one view type for SpinnerAdapter
|
2015-07-24 09:00:28 +02:00 |
|
|
Peter Siegmund
|
83ed1cb3c8
|
fixed refactoring
|
2015-07-22 13:49:42 +02:00 |
|
|
Peter Siegmund
|
ab331b9995
|
used cached StartTimeFinderResult from ManagedRace
|
2015-07-22 13:11:05 +02:00 |
|
|
Peter Siegmund
|
3d57e88a4c
|
new background for spinner (drop box)
|
2015-07-22 13:09:00 +02:00 |
|
|
Peter Siegmund
|
6b3eed7279
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-22 10:38:52 +02:00 |
|
|
Peter Siegmund
|
ea5c90fd15
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-21 16:01:01 +02:00 |
|
|
Peter Siegmund
|
041d2479a9
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-21 15:08:55 +02:00 |
|
|
Peter Siegmund
|
6430814827
|
removed unused method
|
2015-07-21 15:08:36 +02:00 |
|
|
Peter Siegmund
|
7b4c55c424
|
preselect current dependent race
|
2015-07-21 14:32:09 +02:00 |
|
|
Peter Siegmund
|
3043aa89f0
|
second draft:
- colored background for spinner (needs 9-patch-background-image)
- leaderboard display name
- current race not visible
|
2015-07-20 21:32:58 +02:00 |
|
|
Peter Siegmund
|
eb799cdc7a
|
first draft - still unstable
|
2015-07-20 17:54:13 +02:00 |
|
|
Peter Siegmund
|
4d4c7b21ac
|
save all current arguments (also in sub fragments)
|
2015-07-20 15:13:58 +02:00 |
|
|
Peter Siegmund
|
db1c66d940
|
save all current arguments
|
2015-07-20 11:32:56 +02:00 |
|
|
Peter Siegmund
|
545a334de5
|
main change is in RaceLogRaceStatus - PRESCHEDULED is now an active status, like SCHEDULED
|
2015-07-20 10:33:43 +02:00 |
|
|
Peter Siegmund
|
3b9f89714a
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-20 09:42:41 +02:00 |
|
|
Peter Siegmund
|
6e1177e269
|
activate "intent 'case' branches"
|
2015-07-17 15:03:43 +02:00 |
|
|
Peter Siegmund
|
2503a39791
|
fixed Start Time Text with no dependent race
|
2015-07-17 14:12:50 +02:00 |
|
|
Peter Siegmund
|
7548e60068
|
PRESCHEDULED in Nav Drawer
|
2015-07-17 14:08:01 +02:00 |
|
|
Peter Siegmund
|
590e3e68b6
|
added startTimeDifference for dependent races with no start time
|
2015-07-17 13:28:11 +02:00 |
|
|
Peter Siegmund
|
0e3695bcb4
|
use PRESCHEDULED race state
|
2015-07-17 13:27:38 +02:00 |
|
|
Peter Siegmund
|
b22c66eb11
|
still NPE (dependent races)
|
2015-07-17 13:25:54 +02:00 |
|
|
Peter Siegmund
|
9bf1d16bd3
|
add PRESCHEDULE race state (dependent race with no start time)
|
2015-07-17 13:25:12 +02:00 |
|
|
Peter Siegmund
|
f1c44172a9
|
changed IntelliJ IDEA Code Styles
- static imports at first
|
2015-07-15 15:38:47 +02:00 |
|
|
Peter Siegmund
|
befa648776
|
added startTimeDiff to StartTimeFinderResult (incl. changed junit tests)
|
2015-07-15 15:33:36 +02:00 |
|
|
Peter Siegmund
|
11aa48476f
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-15 12:26:31 +02:00 |
|
|
Peter Siegmund
|
fa6f099506
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-15 12:26:25 +02:00 |
|
|
Peter Siegmund
|
7ecff8b32b
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-15 09:14:52 +02:00 |
|
|
Peter Siegmund
|
354138affc
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-15 09:14:44 +02:00 |
|
|
Peter Siegmund
|
ccb660fd14
|
changed link image in NavigationDrawer from 18dp to 24dp
|
2015-07-14 17:08:45 +02:00 |
|
|
Peter Siegmund
|
5fc87c7b71
|
refactored RaceState calculation for ManagedRace
|
2015-07-14 17:07:39 +02:00 |
|
|
Peter Siegmund
|
ead591510a
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-14 14:37:22 +02:00 |
|
|
Peter Siegmund
|
17c6b1dcd4
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-14 14:37:12 +02:00 |
|
|
Peter Siegmund
|
944ea47e1a
|
Merge branch 'ubilabs--rcapp--hotfix-3067' into ubilabs--rcapp--master
|
2015-07-14 14:33:03 +02:00 |
|
|
Peter Siegmund
|
a9814599f9
|
generate RaceState after adding to DataStore
|
2015-07-14 14:09:45 +02:00 |
|
|
Peter Siegmund
|
a96fd86c43
|
add setState to ManagedRace
|
2015-07-14 13:29:38 +02:00 |
|
|
Peter Siegmund
|
46c47cc082
|
optimize build scripts
|
2015-07-14 10:51:04 +02:00 |
|
|
Peter Siegmund
|
7f3e708a24
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--2467
|
2015-07-14 09:38:03 +02:00 |
|
|
Peter Siegmund
|
b60c8ae25a
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-14 09:37:56 +02:00 |
|
|
Peter Siegmund
|
cd06670494
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-14 09:37:47 +02:00 |
|
|
Peter Siegmund
|
cb274e8da2
|
added linked icon in TimePanelFragment next to the start time
|
2015-07-14 09:37:10 +02:00 |
|
|
Peter Siegmund
|
e75e48bfc7
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--2467
|
2015-07-10 10:18:36 +02:00 |
|
|
Peter Siegmund
|
be94f228c7
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-10 10:11:17 +02:00 |
|
|
Peter Siegmund
|
9b4199306a
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-10 10:11:11 +02:00 |
|
|
Peter Siegmund
|
83bfc9d553
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--2467
|
2015-07-10 09:21:08 +02:00 |
|
|
Peter Siegmund
|
68c6a94f65
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-10 09:21:02 +02:00 |
|