Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:03:02 +01:00
Code Issues Projects Releases Wiki Activity
1,784 Commits 20 Branches 34 Tags 18 MiB
43d9623877
Commit Graph

69 Commits

Author SHA1 Message Date
Jfreegman
1d1c051a44 Merge branch 'master' into new_groupchats 2015-12-01 17:57:45 -05:00
Jfreegman
74c1eef1d1
Bump version to 0.7.0 2015-11-12 17:18:37 -05:00
Jfreegman
ab99c1ac73
Fix building on FreeBSD (courtesy of thierry-FreeBSD) 2015-11-12 05:04:37 -05:00
Jfreegman
9b1592b335
Merge new_av from upstream 2015-11-07 00:21:42 -05:00
Jfreegman
6cc1525daa
Fix some build issues 2015-11-03 23:04:05 -05:00
Jfreegman
4ab99c73a0
Merge with master 2015-11-02 15:22:52 -05:00
Jfreegman
7025a33097
Merge with upstream 2015-11-01 21:07:22 -05:00
Jfreegman
8584feab80
Replace DNS-based username lookups with HTTPS & drop utox.org support 2015-10-28 17:14:17 -04:00
Jfreegman
462cfca175
Merge new AV branch 2015-10-20 17:57:54 -04:00
Jfreegman
171024428b
Merge with master branch 2015-10-16 21:01:49 -04:00
Jfreegman
ffcc804efe
Moved version up 2015-09-01 13:00:56 -04:00
cnhenry
4e2db756be Merge remote-tracking branch 'upstream/master' 2015-08-21 00:52:27 -05:00
cnhenry
1606d01158 Implemented video calls for OSX 2015-08-21 00:44:25 -05:00
cnhenry
c8a9ac21f3 Implemented OSX device listing 2015-08-21 00:44:25 -05:00
cnhenry
c2c612b85a Fixed v4l2 capture crash, and refactored to prepare for new features 2015-08-21 00:40:09 -05:00
cnhenry
8f28f1d748 Progress on implementing v4l2 in video_device.* 2015-08-21 00:36:28 -05:00
cnhenry
a33e5f4bec Fixes to av.mk 2015-08-21 00:36:13 -05:00
cnhenry
9863dfc2ae Began implementing video_device.* 2015-08-21 00:35:55 -05:00
cnhenry
c755247434 Added video_device.h file 2015-08-21 00:35:55 -05:00
Mykola Orliuk
60b4d62657 Makefile: allow overriding pkg-config 2015-08-21 00:35:55 -05:00
Jfreegman
8301ab1bc2 Revert commit 312d0c3 (localization/gettext) 
There were serious problems with branch merging that need to be resolved first
 2015-08-21 00:35:40 -05:00
Ansa89
0a2ad23c15 Add localization system (gettext) 2015-08-21 00:24:02 -05:00
cnhenry
43bda5f7d9 Refactoring and fix related to invite callback not being fired 2015-08-21 00:14:03 -05:00
cnhenry
6e90072fb8 Implemented OpenCV demo to demonstrate video device listing and set up code structure for video 2015-08-21 00:14:03 -05:00
Ansa89
b2ed8c0ead Makefile: try to fix Tox/toxic#307 
@henriqueleng please test it and report back if it works for you.
 2015-08-21 00:14:02 -05:00
Ansa89
fd85d8f87b Makefile: add uninstall target 2015-08-21 00:14:02 -05:00
Jfreegman
0597152352
merge with master 2015-07-14 02:19:10 -04:00
Mykola Orliuk
e83b397494 Makefile: allow overriding pkg-config 2015-07-14 08:27:07 +03:00
Jfreegman
40b220c821 Revert "Merge branch 'Ansa89-add_translation'" 
This reverts commit 312d0c3f42, reversing
changes made to 409e4ddd96.
 2015-07-08 21:08:55 -04:00
Jfreegman
035420e5c7
Revert commit 312d0c3 (localization/gettext) 
There were serious problems with branch merging that need to be resolved first
 2015-07-04 01:19:16 -04:00
Ansa89
85d3c18ba6 Add localization system (gettext) 2015-05-28 15:50:55 +02:00
Ansa89
5a2c341259 Makefile: try to fix Tox/toxic#307 
@henriqueleng please test it and report back if it works for you.
 2015-04-06 11:44:02 +02:00
Ansa89
bbb639c5aa Makefile: add uninstall target 2015-04-03 13:04:28 +02:00
Jfreegman
2d3c5c9450
Mostly finished with new API port 
- File transfers currently don't support pausing/resuming
- Avatars are not yet done
 2015-03-28 02:56:54 -04:00
Ansa89
a11289de79 Move makefile into root directory 
Requested by @mannol.
 2015-03-21 18:35:40 +01:00
Ansa89
59e1114997 Some cosmetics changes 2015-03-16 13:16:03 +01:00
fr33domlover
0c39e7b158 Add support for auto-away based on screen attach/detach 2015-03-09 01:38:30 +02:00
Dominyk Tiller
d1036c8538 Darwin Build 
Explains/Better Enables building on the OS X Platform. I’ve written a
Darwin.mk file for the purpose, given one is referenced in the Makefile
but doesn’t actually exist yet. I presume this is due to Toxic’s recent
move away from configure scripts?

Anyhow. It’s not perfect, and it could be prettier, but it should fix
 2014-12-18 03:49:52 +00:00
Ansa89
a4e8cb3971 Fix Tox/toxic#276 2014-10-30 15:23:47 +01:00
Ansa89
317fa42b20 Makefile: revert back to mkdir 2014-10-21 11:51:02 +02:00
Ansa89
f5090532fb Makefile: add toxic.desktop to install target 2014-10-21 10:31:30 +02:00
Ansa89
431290d47a Version: fix revision calculation 2014-10-16 20:26:00 +02:00
Ansa89
1b9fd7f936 Install: check if manpages exist 2014-10-15 14:25:14 +02:00
Ansa89
0a1457acde Version: add revision only if git is available 2014-10-15 10:39:49 +02:00
Jfreegman
e83356faef Merge branch 'new' of https://github.com/louipc/toxic into louipc-new 2014-10-13 00:14:29 -04:00
Loui Chang
0a132b0eb5 doc: Unlink docs from the rest of the build process. 
Since generated man pages are also included, we can't
guarantee proper timestamps. This should fix issues that trigger doc
building when it isn't needed.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
 2014-10-12 23:21:48 -04:00
mannol
75dd26518f Finished drag and drop support 2014-10-12 23:26:28 +02:00
Jfreegman
fa64fa8b93 replace call sounds 
Signed-off-by: Jfreegman <jfreegman@gmail.com>
 2014-10-01 19:38:09 -04:00
Jfreegman
5af561c811 new default sounds; rm unused sounds 2014-10-01 01:16:17 -04:00
Jfreegman
97a8ecd115
small fix and bump version to 0.5.2 2014-09-29 13:56:17 -04:00