eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity
21,998 Commits 284 Branches 275 Tags
c82e93a511501fce101521a3bdf29e51125bba16
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Axel Uhl c82e93a511 Merge branch 'ubilabs--tracking_app--develop' into ubilabs-tracking_app--bugfix--bug_2679 
Conflicts:
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
 2015-03-05 13:46:59 +01:00
Axel Uhl 33ff318794 Merge branch 'ubilabs--tracking_app--develop' into ubilabs--tracking_app--develop--hotfix--team_photo_menu_item 
Conflicts:
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
 2015-03-05 12:32:19 +01:00
Axel Uhl 6ded62882e code formatting 2015-03-05 09:31:47 +01:00
Axel Uhl d1849fdd05 Merge remote-tracking branch 'server/ubilabs--tracking_app--develop--hotfix--team_photo_menu_item' into ubilabs--tracking_app--develop 
Conflicts:
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
 2015-03-05 08:54:11 +01:00
Axel Uhl 89e138da79 added sse.security.common to settings.gradle 2015-03-05 08:22:40 +01:00
Axel Uhl 8eb67e4882 calculate file size for team image upload in web service if not provided in Content-Length header field 2015-03-05 01:44:57 +01:00
Axel Uhl 8295e89113 code formatting 2015-03-05 00:59:24 +01:00
Axel Uhl 9a33bc91f2 reformatted more code 2015-03-05 00:35:13 +01:00
Axel Uhl 7b5573497f more code formatting 2015-03-05 00:33:01 +01:00
Axel Uhl 6f735eeebe more code reformatting 2015-03-05 00:23:29 +01:00
Axel Uhl 5506c738b1 more code reformat 2015-03-05 00:15:25 +01:00
Axel Uhl 56d8ed687d code reformat 2015-03-05 00:14:59 +01:00
Axel Uhl beeb188e7a use DeviceMappingConstants instead of introducing redundant constants 2015-03-04 23:58:10 +01:00
Axel Uhl 8a06b30cf0 some code formatting 2015-03-04 23:49:55 +01:00
Axel Uhl 5381408568 reformatted code according to code formatter 2015-03-04 23:41:20 +01:00
Axel Uhl 59038d77d2 code formatting 2015-03-04 23:33:29 +01:00
Axel Uhl 582258daa5 added a build.gradle file to sse.security.common 2015-03-04 23:26:09 +01:00
Axel Uhl ffd116e5fc avoid warnings, formatting some code 2015-03-04 23:24:14 +01:00
Axel Uhl ef7fe75772 added dependency on security.common 2015-03-04 23:20:54 +01:00
Axel Uhl 5c81f3c96f Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 23:18:09 +01:00
Axel Uhl 93e4988857 avoid or log exceptions with file storage service initialization and lack thereof 2015-03-04 23:17:37 +01:00
Axel Uhl d8688730fc fixed formatting of MessageSendingService 2015-03-04 18:06:38 +01:00
Axel Uhl 407730d5ff re-added "-" in serialVersionUID which got removed accidentally 2015-03-04 18:04:32 +01:00
Axel Uhl 90aea775b8 avoid warnings in android.shared project 2015-03-04 17:56:56 +01:00
Axel Uhl 6d9864930e re-formatted code 2015-03-04 17:02:54 +01:00
Axel Uhl 0c26b2924b removed unused method 2015-03-04 17:01:46 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Axel Uhl f2c8cc96b9 removed unused field in AmazonS3TestSupport 2015-03-04 16:01:19 +01:00
Axel Uhl 8182b93bcd adjusted wind estimation from OBMR race to allow for greater variance; wind *was* really shifty that day 2015-03-04 08:02:12 +01:00
Axel Uhl f75c112959 fixed comment in buildAndUpdateProduct.sh 2015-03-04 00:37:56 +01:00
Axel Uhl e8df9a5ecf Merge remote-tracking branch 'origin/bug2663' 2015-03-03 23:11:03 +01:00
Axel Uhl b3c3cabbd7 removed additional endpoint S3 property again also from test support 2015-03-03 23:04:20 +01:00
Axel Uhl ae8cbe2f58 fixed some typos 2015-03-03 22:54:20 +01:00
Axel Uhl 641740cc21 added e-mail column to competitor table 2015-03-03 18:32:01 +01:00
Axel Uhl b2401626ff removed the now extra endpoint property again from S3 storage service 2015-03-03 18:27:44 +01:00
Axel Uhl 4c3d16b5d6 Merge branch 'bug2670' 2015-03-03 18:26:13 +01:00
Axel Uhl d4cb7b90f1 Merge remote-tracking branch 'server/master' 2015-03-03 18:25:30 +01:00
Axel Uhl 475564698f added region hostname for S3 retrieval, solving bug 2676 2015-03-03 18:25:04 +01:00
Axel Uhl 8e43c826ca Merge branch 'master' into bug2676 2015-03-03 18:08:37 +01:00
Axel Uhl 726a30d82e fixed failing test for S3 uploader, working towards bug 2676 2015-03-03 18:03:18 +01:00
Axel Uhl c48407634d added failing test case for bug 2676, S3 uploader producing incorrect URLs 2015-03-03 17:46:55 +01:00
Axel Uhl fe3ce9f107 improved file storage error messages 2015-03-03 17:46:24 +01:00
Axel Uhl 4f593b08d3 improved error message in case of file upload 2015-03-03 17:44:03 +01:00
Axel Uhl ccf217b015 properly throw OperationFailedException when something goes wrong with S3 file upload 2015-03-03 17:42:30 +01:00
Axel Uhl 12c35a7269 Merge remote-tracking branch 'server/bug2663' into bug2663 
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
 2015-03-03 16:35:34 +01:00
Axel Uhl 28db671b1a addressing bug 2663 comment #9: the SafeHtmlBuilder.appendHtmlConstant does only accept full elements 2015-03-03 16:32:39 +01:00
Axel Uhl fa41887d2b Merge branch 'master' into bug2663 2015-03-03 16:12:19 +01:00
Axel Uhl c83628dae1 i18n for no event selected 2015-03-03 16:11:41 +01:00
Axel Uhl d70c11c0dd applied selection checkbox also for other competitor tables 2015-03-03 15:24:25 +01:00
Axel Uhl 791f985d13 added missing header for checkbox column 2015-03-03 09:52:42 +01:00
Axel Uhl aef326646a made server comparison based on leaderboard groups web service more lenient 2015-03-03 00:28:23 +01:00
Axel Uhl 310dc7cc47 fixing bug2670: using selection checkbox in leaderboard group config panel 2015-03-02 23:21:00 +01:00
Axel Uhl 175b8c6d40 fixed NPE check in convertToRegattaDTO 2015-03-02 23:06:18 +01:00
Axel Uhl ff44bd90f3 tuning the compareServers script 2015-03-02 22:41:23 +01:00
Axel Uhl 9a2b4b1e65 quick fix for bug 2671; is a better solution needed for the case where the mark position is not (yet) known? 2015-03-02 21:22:17 +01:00
Axel Uhl 01e8ceb647 Merge remote-tracking branch 'server/master' 2015-03-02 21:08:45 +01:00
Axel Uhl 825da81c93 ignore case-only changes when comparing leaderboard groups for their loaded-ness state 2015-03-02 21:06:49 +01:00
Axel Uhl 427adbb8be compare JSON in pretty-printed way, using Python's json.tool 2015-03-02 18:24:37 +01:00
Axel Uhl 7e56a63744 a script that may be used to compare the contents of different servers; not yet complete 2015-03-02 16:39:59 +01:00
Axel Uhl c9b989f874 Merge branch 'master' into bug2663 2015-03-02 12:04:23 +01:00
Axel Uhl 62c0592532 fixed initialization order, avoiding a race condition leading to an NPE 2015-03-02 12:03:43 +01:00
Axel Uhl 73693e22d7 use startOfRace when no startOfTracking is set as a default for wind time range start 2015-03-02 12:03:18 +01:00
Axel Uhl 8fd6aa1629 fixed typo in constant name 2015-03-02 12:03:06 +01:00
Axel Uhl c632a3fab1 show uploaded image in competitors table; use file RESTlet so that also file:/// URLs can be displayed properly which the browser wouldn't allow 2015-02-27 23:42:47 +01:00
Axel Uhl c574a1178d don't force application/json as Content-Type for all JAX-RS RESTlets but let them choose themselves 2015-02-27 23:24:59 +01:00
Axel Uhl ee9c3a8eb6 enable null for NaturalComparator arguments 2015-02-27 22:10:31 +01:00
Axel Uhl 56b75890d2 first working version of competitor image upload 2015-02-27 22:01:30 +01:00
Axel Uhl 6004065a27 fixed client for file upload 2015-02-27 18:29:19 +01:00
Axel Uhl 0c4794d41e implement file upload using a plain servlet with Apache multipart suppot, skipping confusing Jersey with FormDataParams that don't work 2015-02-27 18:19:13 +01:00
Axel Uhl e92a688be3 using Jersey Multipart 1.17.0 which is now consistent with our Jersey version 1.17.0 coming from the Eclipse Orbit 2015-02-27 17:40:41 +01:00
Axel Uhl 0a73a43983 fixed string message stuff for competitor dialog and file upload 2015-02-27 16:27:55 +01:00
Axel Uhl e5e693beb2 fixed bug in LocalFileStorageServiceImpl.removeFile regarding the missing getValue() on localPath 2015-02-27 14:12:22 +01:00
Axel Uhl fda2a66dce on the way to a generic file storage service in the sailing gateway bundle; preparing for file upload from AdminConsole 2015-02-27 13:50:34 +01:00
Axel Uhl ad6446726b Merge remote-tracking branch 'server/master' 2015-02-26 16:24:41 +01:00
Axel Uhl cc5b99ed8f moved SailingPermissionsForRoleProvider to com.sap.sailing.domain.common so that gateway and gwt.ui can both use them in their shiro.ini 2015-02-26 16:23:10 +01:00
Axel Uhl 07dfaa5efc Merge remote-tracking branch 'server/master' 2015-02-26 14:45:45 +01:00
Axel Uhl 4fb9c3b1c0 Updated security (markdown) 2015-02-26 13:42:20 +00:00
Axel Uhl 20c2d8acef harmonized the other shiro.ini files; requiring permission manage_users for UserManagement.html 2015-02-26 13:54:07 +01:00
Axel Uhl 6bd56de7f1 cleaned up shiro.ini stuff further, added more comments 2015-02-26 13:48:51 +01:00
Axel Uhl 071bbd2764 Updated security (markdown) 2015-02-26 12:25:44 +00:00
Axel Uhl 62ddf96414 Updated security (markdown) 2015-02-26 12:21:57 +00:00
Axel Uhl 83b2e20dab Updated security (markdown) 2015-02-26 11:48:47 +00:00
Axel Uhl 1cc22d3858 added anyofroles filter declaration to default shiro.ini 2015-02-26 12:42:47 +01:00
Axel Uhl bbda88f666 Updated security (markdown) 2015-02-26 11:42:36 +00:00
Axel Uhl 97b3923fdb Merge branch 'master' into bug2589 2015-02-26 12:38:07 +01:00
Axel Uhl bd327fe876 added comments and cleaned up structure in com.sap.sse.security/resources/shiro.ini to make it a good copy template, too 2015-02-26 12:35:59 +01:00
Axel Uhl 4faf7ea686 Updated security (markdown) 2015-02-26 08:45:26 +00:00
Axel Uhl 2d26bc19f0 Updated security (markdown) 2015-02-26 08:29:50 +00:00
Axel Uhl 4d7278664c Created security (markdown) 2015-02-26 08:26:18 +00:00
Axel Uhl c196f48ad1 prepared the com.sap.sailing.server.gateway bundle for REST security, showing a commented example in shiro.ini for the /events service end point 2015-02-25 18:26:27 +01:00
Axel Uhl d053c394dd avoid NPE during logout 2015-02-25 18:25:19 +01:00
Axel Uhl 403c556f79 Merge remote-tracking branch 'server/master' 2015-02-25 17:31:34 +01:00
Axel Uhl 6c5b4e9027 added documentation for the security REST API 2015-02-25 17:22:23 +01:00
Axel Uhl 21f76c6dc4 obsolete old bearer access token when a new one is obtained for the subject 2015-02-25 14:36:01 +01:00
Axel Uhl 837fce4a6c re-use subject instead of acquiring it freshly where possible 2015-02-25 12:32:01 +01:00
Axel Uhl 6ad8d92981 don't save the username in the SOCIAL_USER field; it can always be obtained by Subject.getPrincipal() 2015-02-25 12:28:23 +01:00
Axel Uhl b6de344ee8 removed basic authentication from test environment URLs; during authenticating disable forwarding 2015-02-25 09:51:07 +01:00
Axel Uhl ae9ca81f45 fixed launch configs regarding zxing bundle; added Javadoc 2015-02-25 09:37:41 +01:00
Axel Uhl 8d76c78c48 added missing class FormAuthenticationFilterWithPublicCreateToken which is a delegate for the bearer token authentication filter 2015-02-25 08:38:53 +01:00
Axel Uhl 6076f03c60 enhanced logon procedures and fixed test cases 2015-02-25 00:53:43 +01:00