mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-19 12:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3174 commits 37 branches 183 tags 128 MiB
Commit graph

394 commits

Author SHA1 Message Date
Margaux Clerc
71926ccd16 Fix UI problems and linphone friend display name 2015-12-08 17:14:24 +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
14c1609d95 Update views 2015-11-26 15:17:59 +01:00
Margaux Clerc
4dc2d80ebf Use same style for empy chatlist/contactlist/history 2015-11-26 14:28:04 +01:00
Margaux Clerc
bb217a3a6e Fix crash in chat 2015-11-26 10:43:28 +01:00
Margaux Clerc
fc96a26de9 Fix landscape graphics 2015-11-26 10:43:28 +01:00
Margaux Clerc
727033b77a Rename asset 2015-11-26 10:43:28 +01:00
Margaux Clerc
bfcb406f84 Scroll on contact view 2015-11-20 17:09:52 +01:00
Margaux Clerc
a836e839b3 Update the chat view 2015-11-20 16:51:50 +01:00
Margaux Clerc
b32ad9ab61 Add mask for incoming cat bubble 2015-11-17 17:27:10 +01:00
Margaux Clerc
417b7d0a6a Back to dialer in settings and about 2015-11-17 17:27:09 +01:00
Margaux Clerc
f2f12e1bdb Rename assets 2015-11-17 17:27:09 +01:00
Margaux Clerc
756a183436 Add topbar in settings and about menu 
add option for portrait orientation only
 2015-11-17 10:24:16 +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
3aa9f829c9 Fix account delete in side menu and status bar 2015-11-13 16:47:48 +01:00
Margaux Clerc
18c2eef5b8 Improve chat view and new conversation 2015-11-13 15:09:45 +01:00
Margaux Clerc
a106c51f0d Fix assistant and test 2015-11-13 11:07:06 +01:00
Margaux Clerc
884154ea40 Conference paused is now working 2015-11-10 17:58:59 +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
c86bf1e990 Fix chat in call and in call view 2015-11-09 14:46:22 +01:00
Margaux Clerc
a5c39de505 Fix contact with linphone friend 2015-11-09 14:33:47 +01:00
Margaux Clerc
b6722d7a65 Add chat in call and fix call problems 2015-11-09 14:31:40 +01:00
Margaux Clerc
a6447e7eaa Update ui 2015-11-09 14:27:03 +01:00
Margaux Clerc
c3072beae1 Merge remote-tracking branch 'private/3.0.X' into obiane 
Conflicts:
	src/org/linphone/CallActivity.java
 2015-11-09 14:16:42 +01:00
Margaux Clerc
f3fe215bc0 Update call view 2015-11-06 17:37:45 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
92c066d239 Add chat in call 2015-11-05 15:40:47 +01:00
Margaux Clerc
5ba6c571af Update call activity with ZRTP popup 2015-11-03 18:43:04 +01:00
Margaux Clerc
104668cd4d Add fetch remote provisioning with xmlrpc 2015-11-03 18:43:04 +01:00
Margaux Clerc
a1f30e0531 Update Chat ui 2015-10-27 09:39:29 +01:00
Margaux Clerc
3aae0ef4c3 Rework incall view 2015-10-26 19:48:37 +01:00
Margaux Clerc
a992ba8dab delete ui xml 2015-10-26 19:44:56 +01:00
Margaux Clerc
dde619359b Add delte contact in contact list 2015-10-26 19:35:22 +01:00
Margaux Clerc
3d3a1c4f23 Add new images history detail and fix history edit mode 2015-10-26 19:26:14 +01:00
Margaux Clerc
4e9151ad79 Rename ui parts 2015-10-26 19:15:11 +01:00
Margaux Clerc
b9f6cbd3b7 Add errors in assistant 2015-10-26 19:07:13 +01:00
Margaux Clerc
57f8e5dc68 Hide dialer in landscape mode 2015-10-15 18:52:46 +02:00
Margaux Clerc
fa0f35f4e0 fix numpad and incoming/outgoing view 2015-10-15 18:52:14 +02:00
Margaux Clerc
24af401775 Rework and rename incoming call and outgoing call activity 2015-10-15 17:56:27 +02:00
Margaux Clerc
23e66f1c70 Refresh accounts works and remove about/assistant from settings 2015-10-15 16:31:39 +02:00
Margaux Clerc
237487cb58 Add topbar and hide tabbar in about 2015-10-15 15:05:53 +02:00
Margaux Clerc
d7fc044957 Update ui 2015-10-15 11:36:09 +02:00
Margaux Clerc
ed380d7144 Remove old assets and colors 2015-10-15 10:59:47 +02:00
Margaux Clerc
6f180fc307 Fix conference view and add chali list view 2015-09-18 19:16:14 +02:00
Margaux Clerc
c6035e841f Add chat view and otger stuff 2015-09-18 18:57:49 +02:00
Margaux Clerc
7388723f40 Incall actiivty 2015-09-18 18:47:57 +02:00
Margaux Clerc
eae5c18e07 Missing assets 2015-09-18 18:46:56 +02:00
Margaux Clerc
c5dbf76fef Incoming and outgoing call 2015-09-18 18:44:59 +02:00