mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-29 09:39:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3106 commits 39 branches 185 tags 119 MiB
Commit graph

3106 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
66eb69198f Update tests 2015-11-13 16:48:11 +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
5e7b18b2ff change linphone logo 2015-11-10 17:55:47 +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
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
cc88e49a95 Change image alpha 2015-11-09 14:25:40 +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
aab7eca81e Add missing files 2015-11-05 16:24:46 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
455f7e87b6 fix incoming call answer/decline 2015-11-05 15:41:05 +01:00
Margaux Clerc
92c066d239 Add chat in call 2015-11-05 15:40:47 +01:00
Margaux Clerc
d2a6a87eff Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-04 09:03:25 +01:00
Margaux Clerc
5f2203fcd4 Update tests 2015-11-03 18:43:05 +01:00
Margaux Clerc
d724d20d3c Update contact for linphoen friend 2015-11-03 18:43:05 +01:00
Simon Morlat
54841c8d5a fix crash at startup 2015-11-03 18:43:05 +01:00
Simon Morlat
73fc6eaa47 update linphone submodule for missing java wrapper. 2015-11-03 18:43:05 +01:00
Simon Morlat
8c257d5253 fix nullpointer exceptions at startup 2015-11-03 18:43:04 +01:00
Simon Morlat
1115eb442e update linphone submodule 2015-11-03 18:43:04 +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
Simon Morlat
d6c87d61a2 fix crash in tester 2015-11-03 18:43:04 +01:00
Simon Morlat
c26c0f4315 update polarssl and linphone in order to fix SRTP-DTLS interoperability issues 2015-11-03 18:43:03 +01:00
Simon Morlat
bd62a1c53e fix remote provisioning stuff 2015-11-03 18:43:03 +01:00
Simon Morlat
c54a77a762 set sExited = false after restarting 2015-11-03 18:43:03 +01:00
Simon Morlat
6a19035397 fix restartLinphoneCore() 2015-11-03 18:43:03 +01:00
Margaux Clerc
47b76b3d43 Add restart linphone core method 2015-11-03 18:43:02 +01:00
Simon Morlat
8370093c96 update linphone 2015-11-03 18:42:22 +01:00
Margaux Clerc
a875e48b54 Add new assets 2015-11-02 13:53:59 +01:00
Margaux Clerc
f4818f8ca8 Update strings 2015-10-30 14:05:16 +01:00
Margaux Clerc
31d70f012c Merge remote-tracking branch 'android-master/master' into 3.0.X 2015-10-29 14:52:23 +01:00
Simon Morlat
143e0bf7a7 update linphone submodule 2015-10-29 13:49:31 +01:00
Margaux Clerc
3c6d05fa75 Merge remote-tracking branch 'android-master/master' into 3.0.X 
Conflicts:
	src/org/linphone/IncomingCallActivity.java
 2015-10-29 11:01:19 +01:00
Simon Morlat
9572b8d557 update linphone and belle-sip, don't use LinphoneCore.createDefaultCallParameters() anymore. 2015-10-27 18:42:18 +01:00
Margaux Clerc
2a760cce3d Merge remote-tracking branch 'private/3.0.X' into obiane 2015-10-27 10:40:06 +01:00
Margaux Clerc
b9f082496a Merge remote-tracking branch 'android-master/master' into 3.0.X 2015-10-27 09:40:46 +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
0ad181c1c3 Rename fragment 2015-10-26 19:43:34 +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