Margaux Clerc
|
1b207c8dc1
|
Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
AndroidManifest.xml
res/drawable-xhdpi/topbar_avatar.png
res/drawable/assistant_button.xml
res/layout-land/call.xml
res/layout-land/call_incoming.xml
res/layout-land/call_outgoing.xml
res/layout-land/chatlist_cell.xml
res/layout-land/main.xml
res/layout/about.xml
res/layout/assistant_account_creation.xml
res/layout/assistant_linphone_login.xml
res/layout/assistant_remote_provisioning_login.xml
res/layout/assistant_topbar.xml
res/layout/call.xml
res/layout/call_incoming.xml
res/layout/call_outgoing.xml
res/layout/chat.xml
res/layout/chatlist.xml
res/layout/chatlist_cell.xml
res/layout/conference_paused_row.xml
res/layout/contact.xml
res/layout/contact_edit.xml
res/layout/contacts_list.xml
res/layout/dialog.xml
res/layout/edit_list.xml
res/layout/history.xml
res/layout/history_detail.xml
res/layout/main.xml
res/layout/side_menu_account_cell.xml
res/mipmap-hdpi/ic_launcher.png
res/mipmap-mdpi/ic_launcher.png
res/mipmap-xhdpi/ic_launcher.png
res/mipmap-xxhdpi/ic_launcher.png
res/mipmap-xxxhdpi/ic_launcher.png
res/values-ar/strings.xml
res/values-de/strings.xml
res/values-es/strings.xml
res/values-fr/custom.xml
res/values-fr/strings.xml
res/values-he/strings.xml
res/values-ja/strings.xml
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-tr/strings.xml
res/values/custom.xml
res/values/non_localizable_custom.xml
res/values/strings.xml
res/values/styles.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ChatListFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/ContactsListFragment.java
src/org/linphone/HistoryDetailFragment.java
src/org/linphone/HistoryListFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphoneManager.java
src/org/linphone/LinphoneService.java
src/org/linphone/assistant/RemoteProvisioningActivity.java
|
2016-02-18 15:56:50 +01:00 |
|
Margaux Clerc
|
f68df2c584
|
Tablet: Fix new chat conversation and display first listview element
|
2016-02-17 15:19:26 +01:00 |
|
Margaux Clerc
|
45b365ecb1
|
Fix tests
|
2016-02-15 13:57:23 +01:00 |
|
Margaux Clerc
|
56a82f7165
|
Fix new chat conversation
|
2016-02-15 11:00:04 +01:00 |
|
Margaux Clerc
|
794a39f075
|
Fix message notification
|
2016-02-12 10:46:12 +01:00 |
|
Margaux Clerc
|
2ea62bb0c9
|
Fix fragment back button and add cancel button for contact editor
|
2016-02-10 14:27:14 +01:00 |
|
Margaux Clerc
|
b691e107e3
|
Rework new conversation display
|
2016-01-21 17:08:01 +01:00 |
|
Margaux Clerc
|
6b90adf155
|
Remove back button on tablet fragment
|
2016-01-19 09:26:35 +01:00 |
|
Margaux Clerc
|
003b21102b
|
Rework topbar
|
2016-01-11 10:31:16 +01:00 |
|
Margaux Clerc
|
72328025d2
|
Fix merge
|
2015-12-08 17:13:12 +01:00 |
|
Margaux Clerc
|
96e27f63f3
|
Fix merge
|
2015-11-30 14:29:39 +01:00 |
|
Margaux Clerc
|
8793a506e3
|
Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
res/drawable-xhdpi/checkbox_checked.png
res/drawable-xhdpi/checkbox_unchecked.png
res/drawable-xhdpi/resizable_textfield.9.png
res/drawable/avatar_mask_chat.xml
res/layout/about.xml
res/layout/call.xml
res/layout/call_inactive_row.xml
res/layout/chat.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/layout/chatlist.xml
res/layout/contact.xml
res/layout/contacts_list.xml
res/layout/dialer.xml
res/layout/history.xml
res/layout/history_detail.xml
res/layout/main.xml
res/layout/search_contact_cell.xml
res/layout/side_menu_account_cell.xml
res/layout/side_menu_item_cell.xml
res/layout/side_menu_main_account.xml
res/values/non_localizable_custom.xml
res/values/strings.xml
res/values/styles.xml
src/org/linphone/ChatFragment.java
src/org/linphone/ContactsListFragment.java
src/org/linphone/DialerFragment.java
src/org/linphone/HistoryDetailFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphoneService.java
|
2015-11-30 14:29:14 +01:00 |
|
Margaux Clerc
|
bb217a3a6e
|
Fix crash in chat
|
2015-11-26 10:43:28 +01:00 |
|
Margaux Clerc
|
a836e839b3
|
Update the chat view
|
2015-11-20 16:51:50 +01:00 |
|
Margaux Clerc
|
417b7d0a6a
|
Back to dialer in settings and about
|
2015-11-17 17:27:09 +01:00 |
|
Margaux Clerc
|
410f168acf
|
Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
AndroidManifest.xml
res/drawable/status_level.xml
res/layout/call.xml
res/layout/chat.xml
res/layout/chat_bubble_outgoing.xml
res/layout/contact_control_row.xml
res/layout/search_contact_cell.xml
res/values/strings.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/LinphoneService.java
|
2015-11-16 09:06:12 +01:00 |
|
Margaux Clerc
|
18c2eef5b8
|
Improve chat view and new conversation
|
2015-11-13 15:09:45 +01:00 |
|
Margaux Clerc
|
0da770e015
|
Add chat edition for deleting chat message
fix new conversation
|
2015-11-10 17:57:26 +01:00 |
|
Margaux Clerc
|
d279336e33
|
fix small issues
|
2015-11-10 17:53:12 +01:00 |
|
Margaux Clerc
|
c86bf1e990
|
Fix chat in call and in call view
|
2015-11-09 14:46:22 +01:00 |
|
Margaux Clerc
|
b6722d7a65
|
Add chat in call and fix call problems
|
2015-11-09 14:31:40 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
a1f30e0531
|
Update Chat ui
|
2015-10-27 09:39:29 +01:00 |
|
Margaux Clerc
|
c6035e841f
|
Add chat view and otger stuff
|
2015-09-18 18:57:49 +02:00 |
|
Margaux Clerc
|
c3dc710337
|
Merge remote-tracking branch 'linphone/master' into 3.0.X
Conflicts:
AndroidManifest.xml
res/layout/chat_bubble_alt_incoming.xml
res/layout/chat_bubble_alt_outgoing.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/values/strings.xml
src/org/linphone/ContactsManager.java
src/org/linphone/compatibility/ApiFivePlus.java
src/org/linphone/ui/BubbleChat.java
|
2015-09-10 18:58:01 +02:00 |
|
Margaux Clerc
|
af3a159f8d
|
Add new items for chat
|
2015-09-01 15:12:45 +02:00 |
|
Margaux Clerc
|
3eca96e3c5
|
Rework Incall view/Chat view/Edit Contact view
|
2015-08-25 17:23:07 +02:00 |
|
Margaux Clerc
|
4713fb4c68
|
Fix crash with memory error
|
2015-08-25 12:00:55 +02:00 |
|
Margaux Clerc
|
690cfecbba
|
Fix merge
|
2015-08-14 15:31:39 +02:00 |
|
Margaux Clerc
|
6c2c9266e0
|
Merge branch 'master' into 3.0.X
Conflicts:
src/org/linphone/ChatFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/ui/BubbleChat.java
|
2015-08-14 11:28:42 +02:00 |
|
Margaux Clerc
|
6870dec8b1
|
Add relativeLayout for left menu
|
2015-08-14 11:26:22 +02:00 |
|
Margaux Clerc
|
2f57f9a6c9
|
Fix bubble chat delete
|
2015-08-14 09:44:04 +02:00 |
|
Margaux Clerc
|
c054e6bcf8
|
Fix error status bar and progress bar in chat room
|
2015-08-13 16:16:59 +02:00 |
|
Margaux Clerc
|
6f005e7e0d
|
Improve chat view and download images
|
2015-08-11 14:28:37 +02:00 |
|
Margaux Clerc
|
b5d499799a
|
Update download/upload images outside the chatfragment
|
2015-08-10 17:01:00 +02:00 |
|
Margaux Clerc
|
f3f79a7a5b
|
Chat update
|
2015-08-03 14:46:51 +02:00 |
|
Margaux Clerc
|
219b3005f8
|
Rework views history/contacts/chat with the new design
|
2015-07-30 15:46:28 +02:00 |
|
Margaux Clerc
|
2950bc1d91
|
Drop support api < 14
|
2015-07-23 13:47:05 +02:00 |
|
Margaux Clerc
|
25d2d3cb54
|
Hide keyboard with back button on chat fragment
|
2015-06-19 14:12:46 +02:00 |
|
Sylvain Berfini
|
b6771b24dc
|
Improved scrollToEnd and thumbnail bitmap for chat view
|
2015-05-18 11:02:44 +02:00 |
|
Sylvain Berfini
|
617beb7db6
|
Load bitmaps in background in chat in order to make UI smoother
|
2015-05-15 17:39:11 +02:00 |
|
Sylvain Berfini
|
28a6f800a5
|
Fix issue with upload image
|
2015-05-15 15:02:13 +02:00 |
|
Margaux Clerc
|
7702f7567a
|
Rotate camera image send
|
2015-05-12 17:33:59 +02:00 |
|
Margaux Clerc
|
d9cea544df
|
Fix send image with camera
|
2015-05-12 15:55:04 +02:00 |
|
Sylvain Berfini
|
9bba6a3b64
|
Fix crash when rotating the phone while uploading a picture
|
2015-05-05 15:20:21 +02:00 |
|
Margaux Clerc
|
aa650803c7
|
fix draft in chat message
|
2015-04-27 16:29:19 +02:00 |
|
Margaux Clerc
|
25144d93b7
|
Fix chat notifications on lollipop
|
2015-04-27 15:44:35 +02:00 |
|
Margaux Clerc
|
3d4234e05f
|
Send image with camera fix
|
2015-04-24 17:11:03 +02:00 |
|
Margaux Clerc
|
14c8510398
|
Fix contact picture
|
2015-04-23 14:28:57 +02:00 |
|
Sylvain Berfini
|
159e9ccfe5
|
Fix for black screen when trying to upload a large file
|
2015-03-17 16:48:13 +01:00 |
|