Commit graph

3037 commits

Author SHA1 Message Date
Margaux Clerc
14aacd481f Remove chat activitfy from manifest 2015-10-15 10:55:14 +02:00
Margaux Clerc
93fa4735d1 Merge remote-tracking branch 'android-master/master' into 3.0.X 2015-10-15 10:54:02 +02:00
Simon Morlat
7aee28f8a1 update linphone submodule for socket refresh feature 2015-10-14 22:15:44 +02:00
Jehan Monnier
b3dda49ec7 update belle-sip 2015-10-14 15:39:19 +02:00
Simon Morlat
05df4cc6b3 update belle-sip and linphone 2015-10-13 09:39:24 +02:00
Simon Morlat
88852a4e47 update linphone submodule 2015-10-08 15:01:05 +02:00
Simon Morlat
48636b9ef7 update belle-sip and linphone for ICE restart problem 2015-10-08 14:28:36 +02:00
Ghislain MARY
389062e420 Update linphone submodule. 2015-10-08 11:42:34 +02:00
Margaux Clerc
9ca7208a4b Fix crash bubble chat 2015-10-07 16:26:08 +02:00
Margaux Clerc
c1c045b4b1 Fix download image bug and update linphone 2015-10-07 14:28:35 +02:00
Ghislain MARY
f2afbf84f5 Update belle-sip and linphone submodules. 2015-10-07 13:34:44 +02:00
Simon Morlat
9ec85929a1 complete dependency list 2015-10-07 13:13:34 +02:00
Simon Morlat
1cbc646b6d update bzrtp that was pretty old 2015-10-05 11:35:46 +02:00
Simon Morlat
4c3ec3757d update linphone 2015-10-04 21:54:00 +02:00
Simon Morlat
e72f321103 update linphone submodule 2015-10-03 11:30:16 +02:00
Sylvain Berfini
e5ba329a2b Updated linphone to fix compil 2015-10-02 16:03:22 +02:00
Sylvain Berfini
d4b10cf52a Updated submodules 2015-10-02 15:42:49 +02:00
Ghislain MARY
b18d854e4c Update linphone submodule. 2015-09-29 15:40:36 +02:00
Gautier Pelloux-Prayer
8f26f9b2dd tests: detect instrumentation fail as crash 2015-09-29 10:54:43 +02:00
Simon Morlat
bc16411010 fix msamr.git 2015-09-28 17:42:24 +02:00
Simon Morlat
8a62352b51 set correct git uris, so that they can work if protocol is switched to http 2015-09-28 14:09:50 +02:00
Gautier Pelloux-Prayer
75673e5499 submodules: update belle-sip and linphone and fix liblinphone tester 2015-09-28 11:34:33 +02:00
Simon Morlat
af3df3f00d update to bc_tester obsoleting --config option. 2015-09-27 11:29:10 +02:00
Simon Morlat
4405857c72 update linphone & belle-sip 2015-09-25 11:53:20 +02:00
Jehan Monnier
14e34b88ce add android-support-v4.jar 2015-09-21 12:22:50 +02:00
Margaux Clerc
b5f069bf15 Fix conference view and add chali list view 2015-09-18 19:16:14 +02:00
Margaux Clerc
4c0909bea1 Add chat view and otger stuff 2015-09-18 18:57:49 +02:00
Margaux Clerc
cbae250610 Incall actiivty 2015-09-18 18:47:57 +02:00
Margaux Clerc
fc50d339fc Missing assets 2015-09-18 18:46:56 +02:00
Margaux Clerc
4bd2293f57 Incoming and outgoing call 2015-09-18 18:44:59 +02:00
Margaux Clerc
37e2d8aa06 Rework contacts 2015-09-18 18:43:59 +02:00
Margaux Clerc
9cc3c3690a Update history view 2015-09-18 18:38:10 +02:00
Margaux Clerc
0db19cefb9 Update main view 2015-09-18 18:32:25 +02:00
Margaux Clerc
2b74a15268 Fix merge with AndroidManifest 2015-09-18 18:24:35 +02:00
Margaux Clerc
27466d624f Update status fragment 2015-09-18 18:23:59 +02:00
Margaux Clerc
74d811be5e Fix default account 2015-09-18 18:23:07 +02:00
Margaux Clerc
dadf690155 Update Linphone Main with side menu/ Dialer 2015-09-18 18:08:44 +02:00
Margaux Clerc
3750ef592a Changes strings 2015-09-18 15:43:24 +02:00
Margaux Clerc
b42b45e34e fix password in assistant and remove useless code 2015-09-18 15:42:55 +02:00
Gautier Pelloux-Prayer
5077bc81da submodules: update linphone 2015-09-18 15:11:59 +02:00
Jehan Monnier
9e0d995cb5 linphone:fix ms2 sdk compilation issue on android 2015-09-17 17:34:53 +02:00
Margaux Clerc
9c7017ce29 Rename/clear assistant 2015-09-15 17:38:42 +02:00
Gautier Pelloux-Prayer
c15c575baa .gitmodules: change opus repository URL to git.linphone.org since git.opus-codec.org is down for 3 days now 2015-09-14 12:19:08 +02:00
Simon Morlat
75c5221c01 update linphone (fixe android compilation issues) 2015-09-13 16:47:46 +02:00
Simon Morlat
c122365d74 update belle-sip and linphone to start testing refactoring of states in linphone-android 2015-09-13 16:45:37 +02:00
Margaux Clerc
6614704d21 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
4d18e9b86c Fix edit mode in history 2015-09-07 17:16:32 +02:00
Margaux Clerc
ce58dff577 Update makefile for release 2015-09-07 14:49:44 +02:00
Gautier Pelloux-Prayer
b81bd24150 i18n: fix typo 2015-09-07 09:38:59 +02:00
Gautier Pelloux-Prayer
19abef7b2e i18n: update translations 2015-09-04 15:50:08 +02:00