Commit Graph
19688 Commits
Author SHA1 Message Date
Simon Pamies f937967555 Merge remote-tracking branch 'origin/master' 2014-10-31 15:54:02 +02:00
Simon Pamies ce47994cda Added a more descriptive text for scoring schemes that is displayed on Home.html 2014-10-31 15:53:17 +02:00
Simon Pamies 2dde236ebc Added clean action 2014-10-31 15:44:09 +02:00
fmittag 454c93bcfb Merge remote-tracking branch 'origin/master' 2014-10-31 12:24:05 +01:00
fmittag 7255bc25e1 removed usage of org.eclipse.osgi bundle import in some manifest files 2014-10-31 12:23:48 +01:00
fmittag 5b48104389 added missing .gitignore for WEB-INF/deploy folder in security ui bundle 2014-10-31 12:23:01 +01:00
Peter Siegmund fc925305ec corrected first json response - now it's valid 2014-10-31 11:15:35 +00:00
Samuel Oey 69acd47267 Updated tracking app api v1 draft (markdown) 2014-10-30 18:30:28 +00:00
Guy Saldanha ac6bb2e755 removed short URL, removed web sockets, made one request for sending locations, fixed numbers (removed quotation marks) 2014-10-30 16:53:24 +00:00
Guy Saldanha 656bdb1f4a Updated push notifications (markdown) 2014-10-30 13:42:43 +00:00
Guy Saldanha a46a4ed57d Updated push notifications (markdown) 2014-10-30 13:42:01 +00:00
Guy Saldanha 5c259457e6 Created push notifications (markdown) 2014-10-30 13:35:50 +00:00
fmittag 2517b8fb9d fixed default event preventation for regatta details link 2014-10-30 13:27:10 +01:00
fmittag 0a9aa35e71 fixed regatta detail navigation and compact header navigation for event page 2014-10-30 12:33:03 +01:00
Axel Uhl a4db5aafad improved logging for ShortTimeWindCache 2014-10-30 12:28:43 +01:00
Axel Uhl ee261a5477 fixed issues with Collections.unmodifiableCollection's equals/hashCode, affecting ShortTimeWindCache's key structure regarding excluded wind sources 2014-10-30 10:36:59 +01:00
Axel Uhl 09b85ec2de Merge remote-tracking branch 'server/master'
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2014-10-30 10:05:22 +01:00
Axel Uhl 0872f24ccf added test case demonstrating equality/hashCode issues with Collections.unmodifiableCollection 2014-10-30 10:03:41 +01:00
Peter Siegmund 43f4ef14f7 FileLogging is now into the app specific cache folder - because this folder is managed by Android (clean up at app uninstall, storage low or the user can clean this in the app settings) 2014-10-30 09:16:00 +01:00
Peter Siegmund d75b3dd60c minimal API Level is now 14 (Android 4.x) 2014-10-30 09:13:24 +01:00
Axel Uhl 6cab4631da turn CSS obfuscation back on for AdminConsole; should fix Selenium tests regarding selection CSS class name again 2014-10-29 23:48:57 +01:00
Axel Uhl d316431daf Merge branch 'master' into axel-usermanagement 2014-10-29 17:48:23 +01:00
Axel Uhl 595e1d9a1b whitespace changes only 2014-10-29 17:47:26 +01:00
Guy Saldanha 7346806b70 Updated tracking app api (markdown) 2014-10-29 13:26:28 +00:00
Axel Uhl 833c67fb86 added OAuth login panel to LoginPanel.html entry point 2014-10-29 12:52:35 +01:00
Axel Uhl dd4a49bcec Merge branch 'master' into axel-usermanagement 2014-10-29 12:52:12 +01:00
Axel Uhl 1c693cf0c0 added styling of LoginPanel which is now a horizontal panel, and the OAuthLoginPanel showing the logos horizontally and small 2014-10-29 12:34:34 +01:00
fmittag be35bff802 Merge remote-tracking branch 'origin/master' into bug2200 2014-10-29 12:30:17 +01:00
fmittag 57a4cda870 Merge remote-tracking branch 'origin/master' 2014-10-29 12:27:55 +01:00
fmittag d6ecbf696b removed broken db-config for no proxy launch config 2014-10-29 12:27:29 +01:00
Simon Pamies cb5a6b2b89 Created big data numbers (markdown) 2014-10-29 10:49:43 +00:00
Simon Pamies b64dc89733 Updated home (markdown) 2014-10-29 10:46:44 +00:00
Simon Pamies 9bda5612fc Updated home (markdown) 2014-10-29 10:46:00 +00:00
Generic Wiki User 3f6f89e51e Merge branch 'master' of ssh://127.0.0.1/home/trac/git 2014-10-29 09:10:01 +00:00
Guy Saldanha 92f6714b01 Renamed tracking-app-api to /wiki/tracking-app-api 2014-10-29 09:04:16 +00:00
Guy Saldanha 03a0a370d9 Renamed tracking-app-api-v1-draft to /wiki/tracking-app-api-v1-draft 2014-10-29 09:03:54 +00:00
Guy Saldanha ff7d8eb123 moved tracking app API doc and draft to wiki directory 2014-10-29 10:00:48 +01:00
fmittag aaf363f958 Merge remote-tracking branch 'origin/master' into bug2200 2014-10-28 22:55:02 +01:00
Peter Siegmund a874d57b26 unsent message are stored into a SQLite database 2014-10-28 17:23:58 +01:00
Peter Siegmund e36fa5a448 Merge branch 'master' into feature/android_akkutest 2014-10-28 16:42:18 +01:00
Axel Uhl baeb7fdd91 Merge branch 'master' into axel-usermanagement
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	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
2014-10-28 16:11:47 +01:00
Axel Uhl 86bd9af33b Merge branch 'master' into dataMining 2014-10-28 15:56:56 +01:00
Axel Uhl 3591cc3deb Merge branch 'master' into axel-usermanagement 2014-10-28 15:49:10 +01:00
Axel Uhl 86e005d32c solution for bug 2437: clear the replica's state before registering for operation updates which needs to happen before requesting the initial load 2014-10-28 15:47:51 +01:00
Guy Saldanha 4ab2c86bdd Updated tracking app api (markdown) 2014-10-28 13:57:27 +00:00
Peter Siegmund e7009f215e Merge branch 'master' into feature/android_akkutest 2014-10-28 14:14:32 +01:00
Guy Saldanha 959634a84c Updated tracking app api (markdown) 2014-10-28 12:45:37 +00:00
Guy Saldanha 2f74fdd83a Updated tracking app api (markdown) 2014-10-28 11:01:13 +00:00
Guy Saldanha ae16c6e091 Updated tracking app api (markdown) 2014-10-28 10:58:34 +00:00
Guy Saldanha c4099e1cd9 Updated tracking app api (markdown) 2014-10-28 10:56:24 +00:00