Commit Graph

24655 Commits

Author SHA1 Message Date
Anthony Minessale 3034de6e79 FS-5155 2013-03-08 08:24:50 -06:00
Ken Rice eee1755c42 printf no bueno 2013-03-07 19:04:32 -06:00
Anthony Minessale e8ecf7c887 FS-4846 --resolve 2013-03-07 16:21:37 -06:00
Anthony Minessale c7b6327cfa FS-5149 --resolve 2013-03-07 14:46:42 -06:00
Ken Rice 93e2a38efd Merge branch 'master' into v1.2.stable 2013-03-07 12:10:46 -06:00
Anthony Minessale 9fc4beeaa5 FS-3576 --resolve 2013-03-07 08:44:32 -06:00
Brian West e0066b68d7 don't use : in the file name, makes it somewhat problematic to scp these files even when quoted 2013-03-07 09:41:51 -06:00
Ken Rice 0a2e713593 Merge branch 'master' into v1.2.stable
Conflicts:
	configure.in
2013-03-06 23:40:51 -06:00
Ken Rice 1a1153e04a FS-5147 --resolve 2013-03-06 23:36:15 -06:00
Anthony Minessale 3be31405f4 bump 2013-03-06 18:03:44 -06:00
Anthony Minessale b82009c1c2 bump 2013-03-06 18:02:44 -06:00
Anthony Minessale 9ccdf30ed2 sqlite can't handle bi-directional mutexing 2013-03-06 18:02:01 -06:00
Anthony Minessale 228f9772d7 dont destroy handle when subs are inside a call's dialog 2013-03-06 18:02:01 -06:00
Michael S Collins d7a9c18865 Update to-be-recorded phrases 2013-03-06 16:42:41 -08:00
Ken Rice 73a07e41c0 release FreeSWITCH 1.2.7 2013-03-06 15:24:36 -06:00
Ken Rice 3b607284f2 Merge branch 'master' into v1.2.stable
Conflicts:
	configure.in
2013-03-06 15:20:56 -06:00
Anthony Minessale 919586552c bump 2013-03-06 14:00:21 -06:00
Anthony Minessale 522e73c856 bump 2013-03-06 13:59:34 -06:00
Anthony Minessale a70a0ca05a declinatio mortuus obfirmo 2013-03-06 13:59:02 -06:00
Anthony Minessale a5cbf1d9b9 bump 2013-03-06 13:00:41 -06:00
Anthony Minessale eb001cc844 bump 2013-03-06 12:59:21 -06:00
Anthony Minessale 9b11dbe4b9 FS-4452 --resolve 2013-03-06 12:58:30 -06:00
Michael Jerris 3e4fb4b0a2 check for vm caller id info later so if its transfered it gets the updated details 2013-03-06 13:23:28 -05:00
Ken Rice 9aa3566c66 release FreeSWITCH 1.2.6 2013-03-06 11:00:04 -06:00
Anthony Minessale b084ba9955 change fs_encode to support raw files to wav or to other raw 2013-03-05 13:33:32 -06:00
Anthony Minessale d9d238b183 FS-5139 --resolve 2013-03-05 13:33:07 -06:00
Ken Rice ab0479c35f bump rev we are almost there 2013-03-05 11:37:22 -06:00
Ken Rice f8d62a6747 Merge branch 'master' into v1.2.stable 2013-03-05 11:36:04 -06:00
Anthony Minessale 57d6495248 FS-5141 revert f8d769ae1c from FS-4289 2013-03-05 09:07:02 -06:00
Anthony Minessale 662759b8f9 FS-5141 revert f8d769ae1c from FS-4289 2013-03-05 08:50:08 -06:00
Ken Rice 0ad8d51606 Merge branch 'master' into v1.2.stable 2013-03-04 12:27:02 -06:00
Travis Cross 8bd098d59e Merge recent libzrtp autotools changes 2013-03-04 17:28:19 +00:00
Travis Cross ce365948f4 Avoid using AM_CONF_IF
Apparently this is a fairly recent feature of automake and is not
present on at least CentOS5.
2013-03-04 17:24:24 +00:00
Travis Cross 9d953e2973 Cleanup whitespace 2013-03-04 17:24:16 +00:00
Travis Cross a3b9a404a9 Correct spelling in comment 2013-03-04 17:24:05 +00:00
Ken Rice 04e6db24f1 Merge branch 'master' into v1.2.stable 2013-03-04 10:34:09 -06:00
Ken Rice 5dcc31e170 missed a spot 2013-03-04 10:33:28 -06:00
Ken Rice 58b6f6518e Merge branch 'master' into v1.2.stable 2013-03-04 09:47:38 -06:00
Michael Jerris 417ad280e0 remove unused lib 2013-03-04 10:41:18 -05:00
Ken Rice c35a41e4ca FS-3772 --resolve please no vanity comments 2013-03-01 15:48:48 -06:00
Ken Rice b63f12193d Merge branch 'master' into v1.2.stable
Conflicts:
	configure.in
2013-03-01 14:18:40 -06:00
Anthony Minessale 790abe6b0f bump 2013-03-01 11:40:13 -06:00
Anthony Minessale 3d2457eddd FS-5120 please update and test this version 2013-03-01 09:29:47 -06:00
Anthony Minessale aa8f7c975f fix bridge_early_media in transcoding situation 2013-02-28 18:44:38 -06:00
Anthony Minessale 86c1dbee2f FS-5136 set ringback and bridge_early_media=true and it should fall to playing the ringback when the 180 hits 2013-02-28 14:52:33 -06:00
Jeff Lenk a7577d7ee1 FS-5048 trivial build for windows 2013-02-28 14:30:56 -06:00
Raymond Chandler 04a2a88c98 FS-5048 --resolve refactored patch applied with author header 2013-02-28 14:32:50 -05:00
Jeff Lenk 57497c833e more vs 2010-2012 xmprpc depends 2013-02-28 11:30:05 -06:00
Anthony Minessale 864598caeb FS-5121 --resolve 2013-02-28 09:58:57 -06:00
Jeff Lenk 7ea0f8d41e correct vs 2010-2012 depends for xmlrpc at the project level 2013-02-28 10:53:16 -06:00