Commit graph

13 commits

Author SHA1 Message Date
Margaux Clerc
4a8ce7f061 Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime
Conflicts:
	build/android/Android.mk
	coreapi/chat.c
	coreapi/help/filetransfer.c
	tester/message_tester.c
2014-09-25 17:52:30 +02:00
Gautier Pelloux-Prayer
717db9fd8d Improved strict compilation flags 2014-09-11 15:46:05 +02:00
Ghislain MARY
3dc5801283 Follow naming conventions of linphone core callbacks. 2014-08-01 14:40:38 +02:00
Johan Pascal
97050ac654 File Transfer: manage i/o error during file download from server
- note : not functional, test is bugged and commented. To be fixed.
2014-07-30 17:14:56 +02:00
Jehan Monnier
421bde2e37 fix filetransfer 2014-06-30 21:19:04 +02:00
Jehan Monnier
819ca3bb78 Merge remote-tracking branch 'origin/master' into dev_lime
Conflicts:
	coreapi/chat.c
	coreapi/help/filetransfer.c
	tester/message_tester.c
2014-06-30 20:26:21 +02:00
Jehan Monnier
e78765d33f fix compilation issue on mingw 2014-06-12 08:26:59 +02:00
Johan Pascal
6bdc649624 Add encrypted file transfer message
+ test for the encrypted text message
+ fix bug introduced in last merge
2014-06-12 00:49:36 +02:00
Simon Morlat
649a5a5fe8 fix memory leaks 2014-06-09 22:14:06 +02:00
Johan Pascal
94ce7ad1bf File transfer move server to https:linphone.org 2014-06-09 12:48:44 +02:00
Johan Pascal
509b105bb6 File transfer: fix memory leak 2014-06-02 06:58:19 +02:00
Johan Pascal
c10b5f652b File transfer implemented following RCS5.1 recommendation
- memory leaks to be fixed
2014-05-29 00:10:49 +02:00
Jehan Monnier
3e754fb44b add a third cb dedicated to progress 2014-05-14 17:50:17 +02:00