1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-14 17:26:35 +01:00
Commit Graph

278 Commits

Author SHA1 Message Date
Jfreegman
c6f2a9cb59 Merge with master branch 2016-09-24 23:31:20 -04:00
Jfreegman
2194b9e259 Use time_t instead of uint64_t for timestamps
Also call time() directly from get_unix_time() instead of manually updating the time val.
2016-09-22 18:31:52 -04:00
Jfreegman
c24e1bd2b8 Fix a few A/V race conditions 2016-09-22 18:00:14 -04:00
Marvin Ewald
5b1b420ac0 Add further explanation to the beep_on* options
This also renames beep_on* to bell_on*.
2016-07-21 11:35:09 +02:00
Marvin Ewald
d3effa26b5 Add options to enable terminal bell on certain events
Some terminals can mark the terminal window as urgent on bell.
This is useful for window managers that provide a shortcut to jump to an
urgent client.
2016-07-17 19:22:40 +02:00
Jfreegman
43d9623877 Fix merge conflicts 2016-06-12 18:27:54 -04:00
Marvin Ewald
04576fea7e Add paste-mode to allow multiline text pasting
Ctrl-T toggles paste mode.
Useful when pasting multiline text because it avoids triggering an
enter keypress after linebreaks.
Instead, every \r is translated to \n which is again translated to a
pilcrow (see previous commit).
The pasted text can then be sent as a whole instead of splitting up in
multiple messages.
2016-02-28 21:40:41 +01:00
Marvin Ewald
e6f839f9ac Enable multiline input
Adds a nonl() call to avoid translation from \r to \n when pressing
enter.
C-J -> \n
Enter -> \r
To allow multiline input, \n chars (e.g. when pressing C-J) are replaced
with a pilcrow. After hitting enter, every pilcrow is substituted with
\n again.
2016-02-28 02:35:36 +01:00
Jfreegman
6e7b0a5430 Fix groupchat creation bug
Users can no longer create new groupchat windows if they have been kicked from a group and haven't closed the window
2015-12-07 02:33:54 -05:00
Jfreegman
fbd22003a8 Merge with upstream master 2015-11-10 23:52:54 -05:00
Jfreegman
39c4b7ecdd Add ability to print your Tox ID's QR code to a file 2015-11-08 22:51:46 -05:00
Jfreegman
fa0e645a79 Fix a bunch of misc bugs and corner cases 2015-11-08 03:57:01 -05:00
Jfreegman
9b1592b335 Merge new_av from upstream 2015-11-07 00:21:42 -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
6b97df2615 Add command to change the Tox ID nospam value 2015-10-22 19:44:05 -04:00
Jfreegman
abfdbfe468 Fix some new AV api changes 2015-10-20 17:59:14 -04:00
Jfreegman
462cfca175 Merge new AV branch 2015-10-20 17:57:54 -04:00
Jfreegman
2e4c86be4b Add last seen and public key fields for group peers and add whois command 2015-09-13 23:15:58 -04:00
Jfreegman
97d5fb84fc Add command to print your own group public key 2015-09-13 19:38:49 -04:00
Jfreegman
b2c512687a Sort group peerlist by role/name 2015-09-01 17:27:17 -04:00
Jfreegman
8526d4d77e Refactor group peerlist to match API refactor
Peerlists are now similar to the friendlist, which makes managing them much easier, and
improves efficiency
2015-09-01 02:29:25 -04:00
Jfreegman
ed1429afa1 Merge with upstream 2015-08-27 21:36:20 -04:00
Jfreegman
11701d22a1 Lots of bug fixes and general code cleanup 2015-08-27 03:38:08 -04:00
Jfreegman
19cfe3d393 Display a user warning when log fails to initialize 2015-08-21 00:44:40 -05:00
Jfreegman
ed0a4fb3b8 simplify timeout function 2015-08-21 00:44:40 -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
Jfreegman
06c268417f Fix some possible race conditions related to line printing 2015-08-21 00:29:33 -05:00
Ansa89
0a2ad23c15 Add localization system (gettext) 2015-08-21 00:24:02 -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
Jfreegman
92d76c7f99 Display a user warning when log fails to initialize 2015-08-19 00:42:28 -04:00
Jfreegman
327259c4c8 simplify timeout function 2015-08-18 01:46:22 -04:00
Jfreegman
8e23ce1b83 Group API changes 2015-07-22 14:55:52 -04:00
Jfreegman
15ef50e46c Refactor groupchats 2015-07-16 17:10:04 -04:00
Jfreegman
23bb980173 Add group callbacks for password, peerlimit and privacy state changes 2015-07-14 02:07:52 -04:00
Jfreegman
a846c38695 Port to new group API 2015-07-13 22:12:13 -04: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
Jfreegman
84a0276668 Fix some possible race conditions related to line printing 2015-06-30 22:40:45 -04:00
Jfreegman
374b78c763 manually fix merge conflicts 2015-06-29 03:11:21 -04:00
Jfreegman
cb4a631df0 strcasecmp should be strcmp 2015-06-12 23:16:00 -04:00
Jfreegman
b36ada0f5b remove obsolete prune command 2015-06-04 16:46:30 -04:00
Jfreegman
9cd2158c72 add group silencing and improve group help menu 2015-06-04 04:08:11 -04:00
Jfreegman
928134da7a implement banning/unbanning 2015-06-03 04:32:59 -04:00
Jfreegman
7e7087e94e add mod-list prune command 2015-05-30 23:57:30 -04:00
Ansa89
51a1c660b4 Add localization system (gettext) 2015-05-30 11:55:59 +02:00
Jfreegman
9cd8afe90a add mod and unmod commands 2015-05-29 02:00:18 -04:00
Ansa89
85d3c18ba6 Add localization system (gettext) 2015-05-28 15:50:55 +02:00
Jfreegman
526bd02189 Add group peer kicking && update related callback 2015-05-26 01:23:09 -04:00
Jfreegman
a6d7e9b839 add ability for founder to set group peer limit 2015-05-24 03:27:50 -04:00