Steffen Schaefer
6318a8e960
Merge remote-tracking branch 'origin/master' into design2015-mobile
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml
2015-06-17 15:26:22 +02:00
Simon Pamies
895cc387f6
Merge remote-tracking branch 'origin/master'
2015-06-17 14:15:46 +01:00
Simon Pamies
5d499ed8d0
2958 fixed
2015-06-17 14:15:32 +01:00
Axel Uhl
0960c79835
Merge branch 'ubilabs--rcapp--master'
2015-06-17 15:01:42 +02:00
Axel Uhl
f7d263a003
Merge remote-tracking branch 'server/master'
2015-06-17 15:00:44 +02:00
Steffen Schaefer
f13e95ffba
Fixed arrow rotation/animation for upcoming events
2015-06-17 14:53:18 +02:00
Steffen Schaefer
5f423fb672
Removed unused field
2015-06-17 14:48:14 +02:00
Papick Garcia Taboada
0ce2fedb13
Merge branch 'design2015-mobile' of ssh://sapsailing.com/home/trac/git into design2015-mobile
...
# By Steffen Schaefer (4) and Benjamin Barth (2)
# Via Benjamin Barth
* 'design2015-mobile' of ssh://sapsailing.com/home/trac/git:
Event overview mobile - Improved expandable/collapsable regattas
Event overview mobile - Added additional StringMessages
Added missing space for german translation
Adjusted linking of the event teaser image in the mobile event list
Removed unused UiBinder file
Fixed build.properties to include the new html pages for desktop and mobile
2015-06-17 14:40:57 +02:00
Papick Garcia Taboada
e16314ac26
Minor UI fixes
2015-06-17 14:40:52 +02:00
Benjamin Barth
e69c917992
Event overview mobile - Improved expandable/collapsable regattas
2015-06-17 14:13:42 +02:00
Benjamin Barth
89847405a3
Merge branch 'design2015-mobile' of ssh://trac@sapsailing.com/home/trac/git into design2015-mobile
2015-06-17 14:13:13 +02:00
Benjamin Barth
01ceee4ea7
Event overview mobile - Added additional StringMessages
2015-06-17 14:12:57 +02:00
Steffen Schaefer
25017e7519
Added missing space for german translation
2015-06-17 14:04:35 +02:00
Steffen Schaefer
aedccae509
Adjusted linking of the event teaser image in the mobile event list
2015-06-17 14:03:15 +02:00
Steffen Schaefer
d4bbb86c4a
Removed unused UiBinder file
2015-06-17 14:01:54 +02:00
Peter Siegmund
925010624f
removed warnings
2015-06-17 13:54:37 +02:00
Steffen Schaefer
7a455eab3b
Fixed build.properties to include the new html pages for desktop and
...
mobile
2015-06-17 13:47:16 +02:00
Samuel Oey
39c70dbfa8
Merge branch 'ubilabs--rcapp--bug-2969' into ubilabs--rcapp--develop
...
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
2015-06-17 13:45:22 +02:00
Samuel Oey
25f0dd730a
Merge branch 'ubilabs--rcapp--bug-2777-proposal' into ubilabs--rcapp--develop
2015-06-17 13:29:37 +02:00
Samuel Oey
ac39d97137
just some clarifications
2015-06-17 12:58:47 +02:00
Papick Garcia Taboada
fc31ac8802
Fixed wrong import
2015-06-17 12:50:04 +02:00
Samuel Oey
1b60479251
moves the forceLogout from DataHelper to SessionActivity to use centralized logout procedure
2015-06-17 12:34:41 +02:00
Samuel Oey
7a6b8e49f9
removes unneeded onReset in LoginActivity
2015-06-17 12:33:50 +02:00
Papick Garcia Taboada
2adf97702c
Fixed news navigation
2015-06-17 12:33:26 +02:00
Benjamin Barth
81802fff20
Event overview mobile - Added expandable/collapsable regattas
2015-06-17 12:28:05 +02:00
Benjamin Barth
6911d2b80b
Event overview mobile - Adjusted toggle button partial
2015-06-17 12:27:31 +02:00
Papick Garcia Taboada
4d9c148984
Fixed event media navigation
2015-06-17 12:19:37 +02:00
Steffen Schaefer
3f1038d02e
Added link to search place
2015-06-17 12:06:15 +02:00
Papick Garcia Taboada
9db7838dbb
Improved switch to desktop page
2015-06-17 12:05:31 +02:00
Steffen Schaefer
e4da575eea
Using edge to edge layout for mobile news box
2015-06-17 11:43:00 +02:00
Steffen Schaefer
87f99c7b14
Limiting news on mobile overview to 2
2015-06-17 11:32:14 +02:00
Steffen Schaefer
a79b296456
Merge branch 'design2015' into design2015-mobile
2015-06-17 11:31:19 +02:00
Steffen Schaefer
7b904b191a
Fixed limiting event news
2015-06-17 11:29:51 +02:00
Steffen Schaefer
f213c14dd8
Fixed compiler error after merge
2015-06-17 11:18:05 +02:00
Steffen Schaefer
860c736e30
Using limit for news on mobile event overview page
2015-06-17 11:16:58 +02:00
Steffen Schaefer
f9a0c6f954
Merge branch 'design2015' into design2015-mobile
2015-06-17 11:14:44 +02:00
Peter Siegmund
2e2550c938
RCApp: automatically relogin after task kill, if RaceStateService has still data in memory
2015-06-17 11:14:34 +02:00
Benjamin Barth
8fe8ecc8aa
Merge branch 'design2015-mobile' of ssh://trac@sapsailing.com/home/trac/git into design2015-mobile
2015-06-17 11:13:50 +02:00
Benjamin Barth
67a3cd7204
Event overview mobile - Added toggle button partial
2015-06-17 11:13:25 +02:00
Steffen Schaefer
3e5e577228
Merge remote-tracking branch 'origin/master' into design2015
2015-06-17 11:06:13 +02:00
Steffen Schaefer
0b62b1c9c1
Using VideoDTO for event overview video stage to fix compiler error
2015-06-17 11:05:10 +02:00
Papick Garcia Taboada
75c1b6ef91
Hiding mobile link on large screens
2015-06-17 10:56:35 +02:00
Steffen Schaefer
a0402c9eca
Implemented limit for event news
2015-06-17 10:48:42 +02:00
Benjamin Barth
0f01164448
Event overview mobile - Adjusted regatta status navigation
2015-06-17 10:32:55 +02:00
Papick Garcia Taboada
84de898c9d
Merge branch 'design2015-mobile' of ssh://sapsailing.com/home/trac/git into design2015-mobile
...
# By Benjamin Barth (3) and Steffen Schaefer (1)
# Via Steffen Schaefer
* 'design2015-mobile' of ssh://sapsailing.com/home/trac/git:
Improved regatta and race list model to gain more deterministic behaviour
Event overview mobile - Adjusted quickfinder navigation
Event overview mobile - Fixed regatta leaderboard navigation
Fixed values in leaderboard
2015-06-17 10:11:38 +02:00
Papick Garcia Taboada
11c787b80e
Finished news page
2015-06-17 10:11:33 +02:00
Steffen Schaefer
ddf3dca817
Improved regatta and race list model to gain more deterministic
...
behaviour
2015-06-17 10:09:21 +02:00
Benjamin Barth
4fa293fe95
Event overview mobile - Adjusted quickfinder navigation
2015-06-17 10:08:13 +02:00
Benjamin Barth
de789e1539
Event overview mobile - Fixed regatta leaderboard navigation
2015-06-17 10:06:43 +02:00
Benjamin Barth
16eab58a5e
Fixed values in leaderboard
2015-06-17 10:03:03 +02:00