Commit Graph
19688 Commits
Author SHA1 Message Date
Peter Siegmund 0dc570805e insert ContentProvider for SQLite 2014-10-23 13:46:51 +02:00
Lennart Hensler a73ca80966 Merge branch 'master' into dataMining
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
2014-10-23 11:19:02 +02:00
Axel Uhl da1474acd0 Updated usermanagement (markdown) 2014-10-23 09:14:29 +00:00
Axel Uhl 872d958df9 Updated usermanagement (markdown) 2014-10-23 09:13:30 +00:00
Lennart Hensler 557ee3bff8 Merge branch 'bug2242' into dataMining 2014-10-23 10:27:42 +02:00
Lennart Hensler 5f5316ebf3 Moved the algorithm to get the dimensions of a retriever chain to the
FunctionProvider
2014-10-23 10:24:31 +02:00
Peter Siegmund 15d5d8b4df Merge branch 'master' into feature/android_akkutest 2014-10-22 18:05:09 +02:00
Axel Uhl 080972402d don't fire user update events when the user roles are only displayed because of a selection change; update the user info only when the *current* user has changed 2014-10-22 17:29:24 +02:00
fmittag dd7be021c1 Merge remote-tracking branch 'origin/master' 2014-10-22 17:26:14 +02:00
Axel Uhl 090a1b34c7 Updated usermanagement (markdown) 2014-10-22 15:19:41 +00:00
Axel Uhl 72139b14ee Updated usermanagement (markdown) 2014-10-22 15:03:53 +00:00
fmittag f90d107152 removed usage of old BoatTypes enum with usage of BoatClassMasterdata enum in CompetitorEditDialog 2014-10-22 16:57:44 +02:00
Axel Uhl 7b3cb87da5 Updated usermanagement (markdown) 2014-10-22 14:56:31 +00:00
Lennart Hensler ce8f556a48 Minimized the resulting dimension set for a data retriever chain 2014-10-22 16:43:24 +02:00
Peter Siegmund 399892c5da updated Google Play Services to Version 6.1.11-000 2014-10-22 16:32:36 +02:00
Axel Uhl 7cd94e0acb Merge branch 'master' into axel-usermanagement 2014-10-22 15:29:48 +02:00
Axel Uhl 95726e4534 use Set instead of List for competitorId REST parameter to make lookups faster 2014-10-22 15:29:21 +02:00
Axel Uhl 47347fa934 Merge branch 'master' into axel-usermanagement 2014-10-22 15:03:14 +02:00
Axel Uhl d57db58938 added parameter competitorId to positions REST API 2014-10-22 15:02:51 +02:00
Axel Uhl d4d1c2fdf7 fixed SailingGWT launch config again 2014-10-22 13:47:17 +02:00
Axel Uhl f1daf11a33 added parameter withtack to competitor positions REST API, defaulting to false (INCOMPATIBLE CHANGE), avoiding very expensive calculations on the server 2014-10-22 13:42:48 +02:00
Axel Uhl 750dfd5031 Merge remote-tracking branch 'server/axel-usermanagement' into axel-usermanagement 2014-10-22 13:10:28 +02:00
Axel Uhl 1932e756d3 updated the launch config for profiling/no proxy 2014-10-22 13:08:17 +02:00
Axel Uhl da2fcbf154 whitespace change only 2014-10-21 23:54:34 +02:00
Axel Uhl f9bfddfd72 introduced AnyOfRolesFilter as OR-variant of roles[...] shiro filter 2014-10-21 23:52:36 +02:00
Axel Uhl dc9555448b updated permissions for gwt.ui pages; fixed role checks for admin console 2014-10-21 18:29:42 +02:00
Axel Uhl e0fbe56abd replaced e-mail settings in security.property to use default sapsailing.com stuff 2014-10-21 17:40:49 +02:00
Axel Uhl 53848ed5dd added security.properties to the build/install/release process 2014-10-21 17:27:44 +02:00
Axel Uhl b79d70517d Merge branch 'master' into axel-usermanagement 2014-10-21 16:28:34 +02:00
Axel Uhl 7f0efc4a53 Merge remote-tracking branch 'server/master' 2014-10-21 16:20:04 +02:00
Axel Uhl 620d09e69b Merge branch 'master' into axel-usermanagement 2014-10-21 16:18:03 +02:00
Axel Uhl af7d2e5e24 Merge remote-tracking branch 'server/master' into axel-usermanagement 2014-10-21 16:17:34 +02:00
Axel Uhl b52e4bf3e7 removed security stuff again from master after accidental merge 2014-10-21 16:15:32 +02:00
fmittag cafa5889ee fix for bug2421: Stage should show last events in chronological order if no live or future events exist 2014-10-21 14:06:11 +02:00
Generic Wiki User 3cbe7c0f8d Merge branch 'master' of ssh://127.0.0.1/home/trac/git 2014-10-21 07:30:02 +00:00
Axel Uhl a01966a54e Added link to usermanagement page to "architecture and infrastructure" 2014-10-21 07:26:11 +00:00
Axel Uhl ffa3df8ad6 Added link to usermanagement page to "architecture and infrastructure" 2014-10-21 07:26:07 +00:00
Fredrik Teschke 6718da2390 Merge branch 'master' of sapsailing.com:/home/trac/git 2014-10-21 09:23:12 +02:00
Fredrik Teschke 030798d3ea shared.android.test -> JavaSE-1.8 (prevent class version errors when launching tests in Eclipse) 2014-10-21 09:23:07 +02:00
Fredrik Teschke 44533435af rename preferences to include unit [ms] and fix int/string resource bug 2014-10-21 09:22:00 +02:00
Axel Uhl 57364e4e27 Updated usermanagement (markdown) 2014-10-21 07:14:47 +00:00
Axel Uhl 9e8354181a Created usermanagement (markdown) 2014-10-21 07:12:37 +00:00
Axel Uhl bbb93587ee Updated usermanagement (markdown) 2014-10-21 07:08:17 +00:00
Axel Uhl 79970cdd7a removed the removed userstore bundle from feature.xml 2014-10-21 08:59:11 +02:00
Fredrik Teschke 40aace7f3f Merge branch 'master' of sapsailing.com:/home/trac/git 2014-10-21 08:52:53 +02:00
Fredrik Teschke c190e8023e remove trailing slash of server url in device mapping QRCode 2014-10-21 08:52:40 +02:00
Axel Uhl c3af251aa3 Merge branch 'master' into axel-usermanagement 2014-10-20 21:09:32 +02:00
Axel Uhl 585637a736 Merge remote-tracking branch 'server/master' 2014-10-20 21:08:49 +02:00
Axel Uhl 93d95d52b4 GWT-compile everything of security.ui 2014-10-20 21:07:07 +02:00
Axel Uhl c0391ea4cc improved message for sign-up, pointing at validation e-mail 2014-10-20 20:57:18 +02:00