Yann Diorcet
1d3ba8e0b6
Merge branch 'master' of git.linphone.org:linphone into belle-sip
2013-02-25 09:26:55 +01:00
Simon Morlat
a8f757be70
fix crash in coreapi
2013-02-22 22:18:31 +01:00
Simon Morlat
08eb7e6fbe
add call recording feature to conference
...
fix broken gtk conference interface.
2013-02-22 17:22:27 +01:00
Jehan Monnier
0242451dde
Merge remote-tracking branch 'public/master' into belle-sip
...
Conflicts:
coreapi/linphonecore.c
coreapi/proxy.c
mediastreamer2
2013-02-18 16:15:12 +01:00
Yann Diorcet
5017c6ebba
Improve uPnP behaviour (Firewall policy change, local ip change, ...)
...
Hide uPnP firewall setting if uPnP is not available
2013-02-18 11:59:37 +01:00
Yann Diorcet
922851412e
Merge branch 'master' of git.linphone.org:linphone into belle-sip
2013-02-12 10:34:54 +01:00
Simon Morlat
b11e3b0a23
fix compilation bug
2013-02-08 11:01:26 +01:00
Yann Diorcet
d70a691001
Merge branch 'master' into belle-sip
...
Conflicts:
coreapi/sal.c
coreapi/sal.h
2013-02-07 15:18:09 +01:00
Simon Morlat
21c40caaa3
custom header api in progress
...
improve documentation and cleanups.
2013-02-07 11:43:09 +01:00
Simon Morlat
990cbb596d
- fix text_received() callback so that it can work without date header.
...
- add api to add custom header (work in progress)
- add accessors to call logs and hide the structure into private.h
2013-02-06 22:29:13 +01:00
Margaux Clerc
d157b76a91
display chat
2013-02-06 15:41:31 +01:00
Simon Morlat
0700c04d4a
implement call recording.
2013-02-06 15:06:40 +01:00
Margaux Clerc
750c28f183
add pixmaps for calllog and imporved display chat
2013-02-06 13:56:42 +01:00
Yann Diorcet
e9398144e9
Merge branch 'master' of git://git.linphone.org/linphone into belle-sip
2013-02-06 11:56:46 +01:00
Jehan Monnier
427ec85ce4
Merge remote-tracking branch 'public/master' into belle-sip
...
Conflicts:
configure.ac
coreapi/sal.c
coreapi/sal.h
2013-02-06 10:55:57 +01:00
Margaux Clerc
c0eb16613f
Add dialer pixmap
2013-02-06 10:49:05 +01:00
Margaux Clerc
0e31c3a918
ui improvement
2013-02-06 10:49:05 +01:00
Margaux Clerc
ea5e02935e
correction notification message
2013-01-31 10:18:13 +01:00
Margaux Clerc
c7946c6225
Keypad in another frame
2013-01-30 17:14:14 +01:00
Margaux Clerc
1f089fd82f
Add time in LinphoneChatMessage and SalMessage
2013-01-30 15:48:49 +01:00
Margaux Clerc
199133a740
removed keypad
2013-01-30 15:48:49 +01:00
Yann Diorcet
5c939acd69
Merge branch 'upnp'
...
Conflicts:
coreapi/callbacks.c
coreapi/linphonecore.c
gtk/Makefile.am
mediastreamer2
2013-01-25 12:01:50 +01:00
Yann Diorcet
be6d786ba2
Add upnp call stats
2013-01-24 15:59:42 +01:00
Yann Diorcet
ee49cc9029
Merge branch 'master' of git://git.linphone.org/linphone into belle-sip
2013-01-21 12:08:50 +01:00
Ghislain MARY
2c5cef3bb3
Fix library dependencies linking on Debian based systems.
2013-01-18 16:04:58 +01:00
Yann Diorcet
35d65d36f2
Merge branch 'master' of git.linphone.org:linphone into upnp
...
Conflicts:
coreapi/linphone_tunnel.cc
mediastreamer2
2013-01-17 15:34:58 +01:00
Margaux Clerc
d55c0fbf6e
fix chat picture update
2013-01-17 13:42:15 +01:00
Margaux Clerc
09016bd6cd
modified chat_picture update
2013-01-17 13:01:11 +01:00
Margaux Clerc
56470e4ddd
Add notification message sending and name in the chat tab
2013-01-17 10:58:37 +01:00
Guillaume Beraudo
3a9e33feb0
Option to store auth_info in linphonerc
...
Force value in user application after core creation in order to
prevent the passwords to be stored.
2013-01-16 14:53:24 +01:00
Margaux Clerc
8425cc5706
name of contact in tab, search bar removed
2013-01-16 09:48:24 +01:00
Yann Diorcet
d6b9b813eb
Update linphone tunnel API
2013-01-15 12:47:49 +01:00
Simon Morlat
27d916ee98
enforce "media_encryption_mandatory" policy for incoming calls too.
...
add toggle button for this into gtk interface.
2013-01-15 11:53:33 +01:00
Margaux Clerc
7a457c25e0
fix linphone quit
2013-01-10 15:55:10 +01:00
Margaux Clerc
f6e97bc33b
Fix messages and pixmaps
2013-01-10 14:51:33 +01:00
Yann Diorcet
ace4380e5c
Fix issue with assistant and memory leak
2013-01-09 17:34:42 +01:00
Yann Diorcet
3b20b89886
Merge branch 'master' of git.linphone.org:linphone into upnp
...
Conflicts:
coreapi/linphonecore.c
mediastreamer2
2013-01-09 13:58:33 +01:00
Margaux Clerc
6e5daed5fd
Disabled buttons in conf frame, callview improved, removing the search bar
2013-01-09 10:47:31 +01:00
Margaux Clerc
d32446b289
update translation files and dtmf table
2013-01-08 11:28:09 +01:00
Jehan Monnier
a3ca75f90f
Merge remote-tracking branch 'public/master' into belle-sip
2013-01-08 09:23:10 +01:00
Simon Morlat
7b9cb2b8cc
chat tab takes focus in text entry
2013-01-07 18:24:44 +01:00
Margaux Clerc
361da1ab98
update translation files(de,he,ru) and fix the language choice for linux
2013-01-07 15:06:31 +01:00
Margaux Clerc
c5b6a0ffb3
update function chat picture
2013-01-04 10:13:58 +01:00
Margaux Clerc
791e20b758
Modification incall view and fix the problem for click on the contact list
2013-01-03 15:19:57 +01:00
Margaux Clerc
b9556f1bcd
Correction messages
2013-01-03 11:04:13 +01:00
Yann Diorcet
806203ca0a
uPnP in progress
2012-12-21 16:21:41 +01:00
Yann Diorcet
8ef5af3e1b
Fix static build in gtk
2012-12-20 17:09:44 +01:00
Jehan Monnier
1f9453fea6
Merge remote-tracking branch 'public/master' into belle-sip
...
Conflicts:
.cproject
.project
Makefile.am
configure.ac
coreapi/Makefile.am
coreapi/callbacks.c
coreapi/linphonecore.c
2012-12-19 11:13:52 +01:00
Margaux Clerc
beb2d66e21
Merge branch 'master' of git.linphone.org:linphone into dev_gtk_new_ui
...
Conflicts:
gtk/parameters.ui
2012-12-14 16:36:15 +01:00
Margaux Clerc
e9d61a3e4d
new ui improvements more contact oriented :
...
-integration of the chat window in the main window
-change of the contact tab
-change of the appearance of the window call and conference
-chat messages saved during the time of the execution of the software
2012-12-14 14:41:16 +01:00
