Commit Graph

4 Commits

Author SHA1 Message Date
e8de311d7e Merge remote-tracking branch 'origin/develop' into feature/SyncAdapter
Conflicts:
	app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java
	app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java
	app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java
	app/src/main/res/values-de/strings.xml
	app/src/main/res/values/strings.xml
2015-10-18 19:00:51 +02:00
13cb804fc2 Added ongoing notification showing network status
- renamed packages to be more consistent
- somewhate refactored the way notifications are made
2015-10-18 13:40:17 +02:00
348fa8daed Some sync adapter code and bugfixes around it - not yet functional 2015-10-08 14:11:45 +02:00
dd8ac629b2 Show subscriptions (actually, all contacts) 2015-09-11 07:59:39 +02:00