Commits · master · Florian Klien / glt-companion

20 Apr, 2019 1 commit
- v1.7.1 updated map · 86891948
  Florian Klien authored Apr 20, 2019
  
  86891948
10 Apr, 2019 2 commits
- version bump, Building room mapping · cd09e86c
  Florian Klien authored Apr 10, 2019
  
  cd09e86c
- detail plans for new campus added · f44318b7
  Florian Klien authored Apr 10, 2019
  
  f44318b7
09 Apr, 2019 2 commits
- Reverted the wrong merge from February that causes the time bug difference of 1 hour. · e320bdfe
  Rufus authored Apr 08, 2019 and Florian Klien committed Apr 09, 2019
  
  e320bdfe
- Revert "Fixes a comment regarding timezone" · 5ea04236
  Rufus authored Apr 08, 2019 and Florian Klien committed Apr 09, 2019
```
Found the bug, so no need for the workaround

This reverts commit ef109b09.
```
  5ea04236
08 Apr, 2019 1 commit
- Merge pull request #21 from Rufus125/master · 65ed32b8
  Florian Klien authored Apr 08, 2019
```
Merge changes from FOSDEM app
```
  65ed32b8
05 Apr, 2019 1 commit

Fixes a comment regarding timezone · ef109b09

Rufus authored Apr 05, 2019

Fixes a timezone bug: Date only returns UTC time without DST so I applied a dirty workaround by adding an hour
https://stackoverflow.com/questions/1305350/how-to-get-the-current-date-and-time-of-your-timezone-in-java

ef109b09

03 Apr, 2019 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' · 2367f4b1
  Rufus authored Apr 03, 2019
  
  2367f4b1
- Merge branch 'master' of https://github.com/cbeyls/fosdem-companion-android · 3cb2d59d
  Rufus authored Apr 03, 2019
  
  3cb2d59d
01 Apr, 2019 15 commits
- update README · b7aafadf
  Florian Klien authored Apr 01, 2019
  
  b7aafadf
- Merge pull request #20 from Rufus125/master · 572ff128
  Florian Klien authored Apr 01, 2019
```
Adds stuff so that automatic build is not failing
```
  572ff128
- Merge branch 'master' of https://github.com/linuxtage/glt-companion · b8f733d6
  Rufus authored Apr 01, 2019
  
  b8f733d6
- Update .travis.yml · 70cb3146
  Rufus authored Apr 01, 2019
  
  70cb3146
- Update build.gradle · 41bf5e4a
  Rufus authored Apr 01, 2019
  
  41bf5e4a
- Update strings.xml · 5dbd61f3
  Rufus authored Apr 01, 2019
```
Lint:  Error: "about" is translated here but not found in default locale [ExtraTranslation]
```
  5dbd61f3
- Update strings.xml · cdf151e3
  Rufus authored Apr 01, 2019
```
Lint: Error: "error_title" is translated here but not found in default locale [ExtraTranslation]
Error: "settings_notifications_delay_summary" is translated here but not found in default locale [ExtraTranslation]
```
  cdf151e3
- Update build.gradle · b5bb146a
  Rufus authored Apr 01, 2019
```
app/src/main/res/drawable/avd_bookmark_add_24dp.xml Lint: Error: <animated-vector> requires API level 21 (current min is 16)
```
  b5bb146a
- Update README.md · 80538871
  Rufus authored Apr 01, 2019
```
Adds build status
```
  80538871
- Update .travis.yml · a9becde5
  Rufus authored Apr 01, 2019
  
  a9becde5
- Update .travis.yml · e3dca2c4
  Rufus authored Apr 01, 2019
  
  e3dca2c4
- Update .travis.yml · decba8f3
  Rufus authored Apr 01, 2019
  
  decba8f3
- Create .travis.yml · 14212b07
  Rufus authored Apr 01, 2019 and Florian Klien committed Apr 01, 2019
```
Adds CI
```
  14212b07
- Adds mapping table Room - Building · a28432ce
  Rufus authored Mar 29, 2019 and Florian Klien committed Apr 01, 2019
  
  a28432ce
- Create .travis.yml · 0314ea47
  Rufus authored Apr 01, 2019
```
Adds CI
```
  0314ea47
29 Mar, 2019 2 commits
- Merge branch 'master' of https://github.com/linuxtage/glt-companion · bd5f7794
  Rufus authored Mar 29, 2019
  
  bd5f7794
- Adds mapping table Room - Building · a2a0f8e7
  Rufus authored Mar 29, 2019
  
  a2a0f8e7
28 Mar, 2019 3 commits
- steirertux kopf vector added, flo.cx path to https · 98b9f280
  Florian Klien authored Mar 28, 2019
  
  98b9f280
- Merge pull request #18 from Rufus125/master · e28dc9ac
  Florian Klien authored Mar 28, 2019
```
adresses #16, #15, #14, #13, #12
```
  e28dc9ac
- minor style fix · ea1b17fc
  Florian Klien authored Mar 28, 2019
  
  ea1b17fc
27 Mar, 2019 3 commits

updates URL to pretalx · eaec48c8

Rufus authored Mar 28, 2019

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

minor url changes · ef706fd0
Florian Klien authored Mar 27, 2019

ef706fd0
Merge pull request #10 from Rufus125/master · b3314d92
Florian Klien authored Mar 27, 2019
```
Merge 2019 updates to GLT Companion
```
b3314d92

07 Mar, 2019 2 commits
- Delay IntervalLiveData refresh to allow the previous result to be dispatched... · 2f166836
  Christophe Beyls authored Mar 08, 2019
```
Delay IntervalLiveData refresh to allow the previous result to be dispatched on active even when it's already expired
```
  2f166836
- Update Gradle plugin · aae57bd3
  Christophe Beyls authored Mar 07, 2019
  
  aae57bd3
19 Feb, 2019 2 commits

Merge branch 'master' of https://github.com/cbeyls/fosdem-companion-android · 645afab0

Rufus authored Feb 19, 2019

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

Merge branch 'master' of https://github.com/cbeyls/fosdem-companion-android · 85ba21df

Rufus authored Feb 19, 2019

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

08 Feb, 2019 1 commit
- Update Gradle plugin · 07658b54
  Christophe Beyls authored Feb 08, 2019
  
  07658b54
05 Feb, 2019 2 commits
- Replace deprecated methods with newer equivalents · 29af6e46
  Christophe Beyls authored Feb 05, 2019
  
  29af6e46
- Simpler implementation of up navigation fix from track screen to main activity · 1c926b1c
  Christophe Beyls authored Feb 05, 2019
  
  1c926b1c
04 Feb, 2019 1 commit
- Enhance up navigation from track Activity to main Activity: don't re-create the main Activity · 214a6dfe
  Christophe Beyls authored Feb 04, 2019
```
Closes #7, closes #23
```
  214a6dfe