EC2 Server
2a3de7cfac
Merge remote-tracking branch 'origin/master'
2016-03-06 12:00:34 +00:00
EC2 Server
2b07fea977
added INSTANCE_INTERNAL_IP4 and use it for a default Plain-SSL mapping during instance start
2016-03-06 11:58:46 +00:00
Generic Wiki User
21540cda16
Merge branch 'master' of ssh://127.0.0.1/home/trac/git
2016-03-06 11:50:03 +00:00
Axel Uhl
adc99598ec
Updated ssl support (markdown)
2016-03-06 11:49:09 +00:00
Jonas Dann
bc2140424d
Updated theses (markdown)
2016-03-06 11:47:20 +00:00
Jonas Dann
d734f3d043
Added project thesis about buoy modeling and correction
2016-03-06 12:44:25 +01:00
EC2 Server
fa4df27ac2
use Event-SSL macro in /etc/init.d/sailing start-up script
2016-03-06 10:58:44 +00:00
Axel Uhl
286a50035f
Updated ssl support (markdown)
2016-03-06 10:42:51 +00:00
Axel Uhl
1d63fb4462
fixing the bug3510 issue (port 80 for all schemes if no port explicitly specified) also in buoy pinger's CheckinManager
...
Change-Id: I51af384ae5547a96afaf7cd699b30e831e3f8351
2016-03-04 12:46:17 +01:00
Axel Uhl
cdb9af79c3
whitespace/formatting changes only
...
Change-Id: Ia7eddd3f3285dc12b519c947ab6250d0a6ed0a19
2016-03-04 12:39:06 +01:00
Axel Uhl
e44be25c03
also skip the ":" if no port present
...
Change-Id: I121152ba16111b957c8662e3f7436680f8e8eaa5
2016-03-04 12:36:07 +01:00
Axel Uhl
52b9b25c5a
Fix for bug3510: don't use a port specification in derived URLs if original URL had none
...
Change-Id: I7e9e757d44394510d3c8bd2cd21e580c037b9da3
2016-03-04 12:34:41 +01:00
Axel Uhl
5de6070adf
removed obsolete TODO
...
Change-Id: Iac417346f877bf27fc12b1b2f1c52580c6c6a291
2016-03-04 11:35:49 +01:00
Axel Uhl
e82c490531
fixed typo in "Getting event information" string of tracking app
...
Change-Id: I6b7fe56cb8d880a0aa158f49650134a30020af74
2016-03-04 11:21:49 +01:00
Axel Uhl
a6aba8e0b7
Merge branch 'master' into bug3509
2016-03-04 11:12:08 +01:00
Axel Uhl
96c7be65df
Merge branch 'ubilabs--tracking_app--master'
2016-03-04 11:11:32 +01:00
Axel Uhl
2559074d6e
trying to replace manual event deserialization by use of EventBaseJsonDeserializer
...
Change-Id: I7df94d2a1cb9100ded62b29e79f2f4041f15089a
2016-03-04 11:10:45 +01:00
Axel Uhl
2bae2dc265
fixed token generation for QR code; required getOrCreateAccessToken instead of only getAccessToken
...
Change-Id: Id7817e8f2c7939b088689acb3ac9b9ae42638643
2016-03-03 15:15:04 +01:00
Axel Uhl
5570f4f349
Merge branch 'bug3493' into bug2589
2016-03-02 19:04:49 +01:00
Axel Uhl
d8186a9985
Merge branch 'design2015' into bug2589
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java
Change-Id: I9daa6eff11d272940f087d3704a6f34ae527bb5e
2016-03-02 18:52:22 +01:00
Axel Uhl
711db6ba9e
re-enable permission-less read access to events
...
Change-Id: Id8c3b2a78c148edb4f7a9e205fe6ade1f3d09dfe
2016-03-02 18:37:43 +01:00
Axel Uhl
e847162312
Merge branch 'master' into bug2589
2016-03-02 17:56:23 +01:00
Steffen Schaefer
a759c89ed7
Merge branch 'bug3476'
2016-03-02 17:35:29 +01:00
Steffen Schaefer
1214298c8e
Merge branch 'bug3441'
2016-03-02 17:26:28 +01:00
Peter Siegmund
1795eaaaab
show an "user is unauthorized" dialog, if server responds with 401.
2016-03-02 16:15:01 +01:00
Axel Uhl
f92eed6007
using PingResource in monitoring.properties to avoid requiring authentication for a gateway monitoring endpoint
...
Change-Id: Ic03fe48c3507ea53c49e576491b83ecb87d02f0f
2016-03-02 16:11:06 +01:00
Axel Uhl
b8bfcbe80e
Merge branch 'master' into bug2589
2016-03-02 16:10:31 +01:00
Axel Uhl
4206961087
added PingResource to allow monitoring bundle to access a service that does not require authorization
...
Change-Id: I8dcbba9d3d3169914826caf0a184fe9a864393b7
2016-03-02 16:09:58 +01:00
Axel Uhl
4ce58d7a90
fixed monitoring.properties: also had to remove monitor.endpoints entry for events bundle
...
Change-Id: I6c6fab6fe8673498826b623cd7d17b4e578e2831
2016-03-02 16:04:52 +01:00
Axel Uhl
97f0213635
Merge branch 'master' into bug2589
2016-03-02 16:04:23 +01:00
Axel Uhl
57330bbf16
added event and rc/rclog to shiro.ini
...
Change-Id: If3df396316da7086541029af75423f1ccca68b89
2016-03-02 15:45:04 +01:00
fmittag
4982cb9f9b
removed bundle com.sap.sailing.www.events from monitoring.properties as it does not exist anymore
2016-03-02 15:06:16 +01:00
Peter Siegmund
50da739b0e
Merge branch 'bug3493' of ssh://sapsailing.com/home/trac/git into bug3493
2016-03-02 15:06:01 +01:00
Axel Uhl
e618ac0cff
use & to separate fragment parameters
...
Change-Id: Idaeac854591c00c8df624d116b14393512ef0858
2016-03-02 15:00:57 +01:00
Axel Uhl
2b392c81fd
fixing check for device identifier; it doesn't have to be the first fragment parameter
...
Change-Id: Id4ad166d2359e551b94cc69bf08ba6cbc0aefa28
2016-03-02 14:59:32 +01:00
Axel Uhl
5f6c3775e8
whitespace change only
...
Change-Id: I90c2f7f4d32afe1fb762f6a5f54618d9474affc3
2016-03-02 14:56:59 +01:00
Axel Uhl
a0a8c7f4d1
Merge remote-tracking branch 'server/bug3493' into bug3493
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java
Change-Id: Iea8dc1ba061467840ea3ae0662438cd609b68a56
2016-03-02 14:56:39 +01:00
Axel Uhl
6aec12d192
fixing how the token is parsed, limiting "=" split to two elements, accepting token to contain "="
...
Change-Id: I6b5c5210e9eca4639d175a5f13efad5a9f4e6ed0
2016-03-02 14:53:56 +01:00
Peter Siegmund
3af0c2b99b
send "Authorization: Bearer XYZ" if access_token in preferences is not null
2016-03-02 14:47:16 +01:00
Axel Uhl
2f487f6dc2
shows the token as additional parameter in the device configuration QR code in AdminConsole
...
Change-Id: I6c25a776c6eb5344a18ac5948b5cff5a35986b9a
2016-03-02 14:47:05 +01:00
Peter Siegmund
74bbb96f03
Merge branch 'bug3493' of ssh://sapsailing.com/home/trac/git into bug3493
2016-03-02 14:43:20 +01:00
Peter Siegmund
461d8a75cd
save access_token from qrcode into preferences
2016-03-02 14:41:41 +01:00
Axel Uhl
be0a483a7e
don't use URLDecoder from java.net package; it's not in the GWT JRE emulation
...
Change-Id: I9877c3d0a71874aad7568d559f2c4a59556246d2
2016-03-02 14:32:02 +01:00
Axel Uhl
13b37b204d
fixed HashMap import
...
Change-Id: Ibf448c5b575a47844eb674d82e4f92c73d1a22ba
2016-03-02 14:28:01 +01:00
Steffen Schaefer
02d18e43da
bug 3476: Setting display attribute instead of visibility for
...
SimpleBusyIndicator when busy state changes because "visibility:
hidden;" just doesn't render the element but it's there, clickable and
overlapping other elements stealing their events
2016-03-02 14:07:41 +01:00
Papick Garcia Taboada
4e9680a883
Merge branch 'master' into design2015
2016-03-02 13:39:39 +01:00
Axel Uhl
e552105bbd
made compilable, using DeviceConfigurationDetails
...
Change-Id: Ia85d641e9a94aeab20cacb390ed2004a625117d7
2016-03-02 12:53:26 +01:00
Axel Uhl
dfb4b9b5b5
Merge remote-tracking branch 'server/bug3493' into bug3493
2016-03-02 12:51:50 +01:00
Axel Uhl
9fd924ddfc
fixed imports
...
Change-Id: I0db8e5580a0181d3ab102f0a8a060c9d90ef53df
2016-03-02 12:51:31 +01:00
Axel Uhl
1bc8300210
added access token to QR code
...
Change-Id: I9fb1f44c8e21da4a30df9ce78dd75519c49a5476
2016-03-02 12:49:51 +01:00