1. 01 Apr, 2019 2 commits
  2. 19 Feb, 2019 1 commit
    • 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
  3. 27 Jan, 2019 1 commit
  4. 07 Jan, 2019 1 commit
  5. 05 Jan, 2019 1 commit
  6. 17 Oct, 2018 1 commit
  7. 30 Jan, 2018 2 commits
  8. 13 Jan, 2017 1 commit
  9. 20 Mar, 2015 1 commit
  10. 19 Mar, 2015 1 commit
  11. 16 Mar, 2015 1 commit
  12. 10 Dec, 2014 1 commit
  13. 31 Mar, 2014 1 commit
  14. 31 Jan, 2014 1 commit
  15. 21 Jan, 2014 1 commit
  16. 15 Jan, 2014 2 commits
  17. 14 Jan, 2014 1 commit