1. 20 Apr, 2019 1 commit
  2. 10 Apr, 2019 2 commits
  3. 09 Apr, 2019 2 commits
  4. 08 Apr, 2019 1 commit
  5. 05 Apr, 2019 1 commit
  6. 03 Apr, 2019 2 commits
  7. 01 Apr, 2019 15 commits
  8. 29 Mar, 2019 2 commits
  9. 28 Mar, 2019 3 commits
  10. 27 Mar, 2019 3 commits
    • Rufus's avatar
      updates URL to pretalx · eaec48c8
      Rufus authored
      Deletes old and unused files
      quickfix: sets info about speakers to invisible because the URL scheme from pretalx does not match with FRAB.
      adds todos regarding mapping of buildings and rooms
      replaces FOSDEM with GLT Logo
      Removes dates so that they do not have to be updated
      FHJ->TUG
      eaec48c8
    • Florian Klien's avatar
      minor url changes · ef706fd0
      Florian Klien authored
      ef706fd0
    • Florian Klien's avatar
      Merge pull request #10 from Rufus125/master · b3314d92
      Florian Klien authored
      Merge 2019 updates to GLT Companion
      b3314d92
  11. 07 Mar, 2019 2 commits
  12. 19 Feb, 2019 2 commits
    • Rufus's avatar
      Merge branch 'master' of https://github.com/cbeyls/fosdem-companion-android · 645afab0
      Rufus authored
      Set URL to test
      
      # Conflicts:
      #	README.md
      #	app/build.gradle
      #	app/src/main/AndroidManifest.xml
      #	app/src/main/java/at/linuxtage/companion/GLTApplication.java
      #	app/src/main/java/at/linuxtage/companion/activities/AppCompatPreferenceActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/BaseActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/EventDetailsActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/MainActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/PersonInfoActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/RoomImageDialogActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/SearchResultActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/SettingsActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/TrackScheduleActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/TrackScheduleEventActivity.java
      #	app/src/main/java/at/linuxtage/companion/adapters/BookmarksAdapter.java
      #	app/src/main/java/at/linuxtage/companion/adapters/EventsAdapter.java
      #	app/src/main/java/at/linuxtage/companion/adapters/RecyclerViewCursorAdapter.java
      #	app/src/main/java/at/linuxtage/companion/alarms/FosdemAlarmManager.java
      #	app/src/main/java/at/linuxtage/companion/api/GLTApi.java
      #	app/src/main/java/at/linuxtage/companion/api/LiveRoomStatusesLiveData.java
      #	app/src/main/java/at/linuxtage/companion/api/RoomStatusesLiveData.java
      #	app/src/main/java/at/linuxtage/companion/db/DatabaseHelper.java
      #	app/src/main/java/at/linuxtage/companion/db/DatabaseManager.java
      #	app/src/main/java/at/linuxtage/companion/db/LocalBroadcastCursor.java
      #	app/src/main/java/at/linuxtage/companion/fragments/BaseLiveListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/BookmarksListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/EventDetailsFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/LiveFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/MapFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/MessageDialogFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/NextLiveListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/NowLiveListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/PersonInfoListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/PersonsListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/RecyclerViewFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/RoomImageDialogFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/SearchResultListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/SmoothListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/TrackScheduleListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/TracksFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/TracksListFragment.java
      #	app/src/main/java/at/linuxtage/companion/livedata/AsyncTaskLiveData.java
      #	app/src/main/java/at/linuxtage/companion/loaders/BaseLiveLoader.java
      #	app/src/main/java/at/linuxtage/companion/loaders/SimpleCursorLoader.java
      #	app/src/main/java/at/linuxtage/companion/loaders/TrackScheduleLoader.java
      #	app/src/main/java/at/linuxtage/companion/model/Day.java
      #	app/src/main/java/at/linuxtage/companion/model/Event.java
      #	app/src/main/java/at/linuxtage/companion/model/Person.java
      #	app/src/main/java/at/linuxtage/companion/model/RoomStatus.java
      #	app/src/main/java/at/linuxtage/companion/model/Track.java
      #	app/src/main/java/at/linuxtage/companion/parsers/EventsParser.java
      #	app/src/main/java/at/linuxtage/companion/providers/BookmarksExportProvider.java
      #	app/src/main/java/at/linuxtage/companion/providers/SearchSuggestionProvider.java
      #	app/src/main/java/at/linuxtage/companion/services/AlarmIntentService.java
      #	app/src/main/java/at/linuxtage/companion/utils/ArrayUtils.java
      #	app/src/main/java/at/linuxtage/companion/utils/ThemeUtils.java
      #	app/src/main/java/at/linuxtage/companion/viewmodels/EventDetailsViewModel.java
      #	app/src/main/java/at/linuxtage/companion/viewmodels/EventViewModel.java
      #	app/src/main/java/at/linuxtage/companion/widgets/AdapterLinearLayout.java
      #	app/src/main/java/at/linuxtage/companion/widgets/ScrimInsetsFrameLayout.java
      #	app/src/main/java/at/linuxtage/companion/widgets/SlidingTabLayout.java
      #	app/src/main/java/be/digitalia/fosdem/utils/DateUtils.java
      #	app/src/main/java/be/digitalia/fosdem/widgets/ForegroundLinearLayout.java
      #	app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java
      #	app/src/main/res/drawable-hdpi/campusmap.png
      #	app/src/main/res/layout/fragment_event_details.xml
      #	app/src/main/res/layout/fragment_live.xml
      #	app/src/main/res/layout/fragment_tracks.xml
      #	app/src/main/res/layout/include_navigation_drawer.xml
      #	app/src/main/res/layout/item_event.xml
      #	app/src/main/res/layout/item_schedule_event.xml
      #	app/src/main/res/layout/main.xml
      645afab0
    • Rufus's avatar
      Merge branch 'master' of https://github.com/cbeyls/fosdem-companion-android · 85ba21df
      Rufus authored
      Set URL to test
      
      # Conflicts:
      #	README.md
      #	app/build.gradle
      #	app/src/main/AndroidManifest.xml
      #	app/src/main/java/at/linuxtage/companion/GLTApplication.java
      #	app/src/main/java/at/linuxtage/companion/activities/AppCompatPreferenceActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/BaseActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/EventDetailsActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/MainActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/PersonInfoActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/RoomImageDialogActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/SearchResultActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/SettingsActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/TrackScheduleActivity.java
      #	app/src/main/java/at/linuxtage/companion/activities/TrackScheduleEventActivity.java
      #	app/src/main/java/at/linuxtage/companion/adapters/BookmarksAdapter.java
      #	app/src/main/java/at/linuxtage/companion/adapters/EventsAdapter.java
      #	app/src/main/java/at/linuxtage/companion/adapters/RecyclerViewCursorAdapter.java
      #	app/src/main/java/at/linuxtage/companion/alarms/FosdemAlarmManager.java
      #	app/src/main/java/at/linuxtage/companion/api/GLTApi.java
      #	app/src/main/java/at/linuxtage/companion/api/LiveRoomStatusesLiveData.java
      #	app/src/main/java/at/linuxtage/companion/api/RoomStatusesLiveData.java
      #	app/src/main/java/at/linuxtage/companion/db/DatabaseHelper.java
      #	app/src/main/java/at/linuxtage/companion/db/DatabaseManager.java
      #	app/src/main/java/at/linuxtage/companion/db/LocalBroadcastCursor.java
      #	app/src/main/java/at/linuxtage/companion/fragments/BaseLiveListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/BookmarksListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/EventDetailsFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/LiveFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/MapFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/MessageDialogFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/NextLiveListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/NowLiveListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/PersonInfoListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/PersonsListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/RecyclerViewFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/RoomImageDialogFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/SearchResultListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/SmoothListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/TrackScheduleListFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/TracksFragment.java
      #	app/src/main/java/at/linuxtage/companion/fragments/TracksListFragment.java
      #	app/src/main/java/at/linuxtage/companion/livedata/AsyncTaskLiveData.java
      #	app/src/main/java/at/linuxtage/companion/loaders/BaseLiveLoader.java
      #	app/src/main/java/at/linuxtage/companion/loaders/SimpleCursorLoader.java
      #	app/src/main/java/at/linuxtage/companion/loaders/TrackScheduleLoader.java
      #	app/src/main/java/at/linuxtage/companion/model/Day.java
      #	app/src/main/java/at/linuxtage/companion/model/Event.java
      #	app/src/main/java/at/linuxtage/companion/model/Person.java
      #	app/src/main/java/at/linuxtage/companion/model/RoomStatus.java
      #	app/src/main/java/at/linuxtage/companion/model/Track.java
      #	app/src/main/java/at/linuxtage/companion/parsers/EventsParser.java
      #	app/src/main/java/at/linuxtage/companion/providers/BookmarksExportProvider.java
      #	app/src/main/java/at/linuxtage/companion/providers/SearchSuggestionProvider.java
      #	app/src/main/java/at/linuxtage/companion/services/AlarmIntentService.java
      #	app/src/main/java/at/linuxtage/companion/utils/ArrayUtils.java
      #	app/src/main/java/at/linuxtage/companion/utils/ThemeUtils.java
      #	app/src/main/java/at/linuxtage/companion/viewmodels/EventDetailsViewModel.java
      #	app/src/main/java/at/linuxtage/companion/viewmodels/EventViewModel.java
      #	app/src/main/java/at/linuxtage/companion/widgets/AdapterLinearLayout.java
      #	app/src/main/java/at/linuxtage/companion/widgets/ScrimInsetsFrameLayout.java
      #	app/src/main/java/at/linuxtage/companion/widgets/SlidingTabLayout.java
      #	app/src/main/java/be/digitalia/fosdem/utils/DateUtils.java
      #	app/src/main/java/be/digitalia/fosdem/widgets/ForegroundLinearLayout.java
      #	app/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java
      #	app/src/main/res/drawable-hdpi/campusmap.png
      #	app/src/main/res/layout/fragment_event_details.xml
      #	app/src/main/res/layout/fragment_live.xml
      #	app/src/main/res/layout/fragment_tracks.xml
      #	app/src/main/res/layout/include_navigation_drawer.xml
      #	app/src/main/res/layout/item_event.xml
      #	app/src/main/res/layout/item_schedule_event.xml
      #	app/src/main/res/layout/main.xml
      85ba21df
  13. 08 Feb, 2019 1 commit
  14. 05 Feb, 2019 2 commits
  15. 04 Feb, 2019 1 commit