anotherim/src/main/java/eu/siacs/conversations/ui
iNPUTmice 35bf13f5ef Merge branch 'feature/file_transfer' into development
Conflicts:
	src/main/res/values/strings.xml
2014-11-15 15:52:15 +01:00
..
adapter handled more error cases 2014-11-15 15:34:12 +01:00
AboutActivity.java Convert about dialog to activity 2014-11-04 12:48:46 -05:00
AboutPreference.java Convert about dialog to activity 2014-11-04 12:48:46 -05:00
ChooseContactActivity.java Rework `Account.getJid()' to return full JIDs 2014-11-09 10:57:22 -05:00
ConferenceDetailsActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
ContactDetailsActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
ConversationActivity.java some mime and pgp fixes for file transfer 2014-11-15 15:34:12 +01:00
ConversationFragment.java Merge branch 'feature/file_transfer' into development 2014-11-15 15:52:15 +01:00
EditAccountActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
EditMessage.java Make conversations the root project 2014-10-22 15:47:11 -04:00
ManageAccountActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
PublishProfilePictureActivity.java Rework `Account.getJid()' to return full JIDs 2014-11-09 10:57:22 -05:00
SettingsActivity.java turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
SettingsFragment.java Make conversations the root project 2014-10-22 15:47:11 -04:00
ShareWithActivity.java Update more files to use JID objects 2014-11-09 07:00:40 -05:00
StartConversationActivity.java auto register/unregister listeners 2014-11-11 17:39:28 +01:00
UiCallback.java Make conversations the root project 2014-10-22 15:47:11 -04:00
VerifyOTRActivity.java check if account is online before doing smp 2014-11-12 12:45:59 +01:00
XmppActivity.java initial smp support 2014-11-11 17:40:51 +01:00