Peter Siegmund
c6e0d9b579
Merge branch 'master' into android_apps
...
Conflicts:
mobile/com.sap.sailing.android.shared/.classpath
mobile/com.sap.sailing.android.shared/res/values/strings.xml
mobile/com.sap.sailing.android.tracking.app/pom.xml
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/sending/MessageSendingService.java
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/racelog/impl/RaceLogEventsCallback.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventRestorer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ByMapCourseDesignDialog.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/lists/ManagedRaceListFragment.java
2015-01-13 15:04:22 +01:00
Peter Siegmund
e973d349ed
added myself into jetty realm
2014-10-24 09:16:54 +02:00
Nils
2af4a150cb
code refactoring
2014-09-16 15:30:44 +02:00
wagnst
3833e36886
added user for d059727 (steffen.tobias.wagner@sap.com)
2014-07-16 12:48:58 +02:00
fmittag
0ec12e125e
added user role 'eventmanager' to reduce set of visisble features in the admin console for this role
...
added eva, mario and jacob (danish league) to user store with the new eventmanager role
2014-05-28 13:29:59 +02:00
Armin Zamani
4816dd2428
added new item in realm.properties
2013-03-02 00:23:03 +01:00
Jens Rommel
b4e5a33e98
Implemented database access of media management in Admin Console. Add/create, query and delete already work, update missing, yet.
2012-09-28 12:21:22 +02:00
fmittag
ac700f2367
fixed typo in Riccardos name for user login
2012-05-04 17:38:29 +02:00
fmittag
15a57ca459
added new users to the default jetty based user store: nils, christopher, ricardo, stefan, milan
2012-03-21 18:03:37 +01:00
fmittag
f7d35ffeff
-Added simple usermanagement service to enable creation of user role specific settings for the raceboard
...
-Added simple security roles for the AdminConsole.html and LeaderboardEditing.html -> the users and roles are defined in the realm.properties in the jetty config directory
2012-02-07 13:59:17 +01:00
fmittag
6a7749a405
added default jetty configuration files
2011-12-08 11:55:51 +01:00
Peter Siegmund
Nils
wagnst
fmittag
Armin Zamani
Jens Rommel