Kacper Ziubryniewicz 0395598efb Merge branch 'develop' into api-v2 ...

# Conflicts:
#	app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java

2019-10-21 16:52:52 +02:00

..

api/v2

[APIv2/Vulcan] Add getting homework

2019-10-21 00:28:27 +02:00

data

Merge branch 'develop' into api-v2

2019-10-21 16:52:52 +02:00

network

[APIv2] Notifications - DB entity, move to APIv2. Add Server event sync and web push.

2019-10-18 22:12:40 +02:00

receivers

[APIv2] Fix receivers and other weird things

2019-10-04 20:24:47 +02:00

sync

[APIv2] Notifications - DB entity, move to APIv2. Add Server event sync and web push.

2019-10-18 22:12:40 +02:00

ui

Merge branch 'develop' into api-v2

2019-10-21 16:52:52 +02:00

utils

[APIv2] Notifications - DB entity, move to APIv2. Add Server event sync and web push.

2019-10-18 22:12:40 +02:00

widgets

Merge branch 'develop' into api-v2

2019-10-03 21:07:17 +02:00

App.java

[APIv2] Add Grades. Update Firebase push receivers.

2019-10-11 16:24:45 +02:00

Extensions.kt

[APIv2/Vulcan] Add getting grades

2019-10-20 14:08:06 +02:00

GenericFileProvider.java

you've been waiting for this moment for so long

2019-09-18 22:29:09 +02:00

MainActivity.kt

[UI] Change bottom bar color to window background

2019-10-09 18:22:33 +02:00

Notifier.java

[APIv2] Notifications - DB entity, move to APIv2. Add Server event sync and web push.

2019-10-18 22:12:40 +02:00

WidgetTimetable.java

Merge branch 'develop' into api-v2

2019-10-03 21:07:17 +02:00