aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
2,471 Commits 32 Branches 59 Tags 24 MiB
3c00b1e451
Commit Graph

386 Commits

Author SHA1 Message Date
James Booth
5929d8450c Merge branch 'master' into plugins 
Conflicts:
	src/profanity.c
	src/server_events.c
 2014-04-02 00:01:43 +01:00
James Booth
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
404dde2810 Renamed refresh functions to update_virtual 2014-04-01 21:52:04 +01:00
James Booth
e8e5ab597a Do not scroll to end when chat room message whilst paging 2014-03-31 21:50:33 +01:00
James Booth
3fdd9944ab Do not scroll to end in message window when paging 2014-03-31 21:44:34 +01:00
James Booth
3d768527c1 Moved ui_current_page_off to ui_incoming_msg 2014-03-31 21:09:24 +01:00
James Booth
f7a7277e40 Merge branch 'master' into plugins 2014-03-15 22:28:21 +00:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +00:00
James Booth
2c7f6c16aa Merge branch 'master' into plugins 
Conflicts:
	src/main.c
	src/ui/console.c
 2014-03-09 01:22:13 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
c505b03465 Merge branch 'master' into plugins 2014-03-08 21:51:47 +00:00
James Booth
b177250f47 Refactored muc_room_is_active to only take room, rather than full jid 2014-03-08 21:20:26 +00:00
James Booth
dd1ee18c72 Added test for /join with nick option 2014-03-08 21:10:23 +00:00
James Booth
b6ceabdc8e Merge branch 'plugins' of github.com:boothj5/profanity into plugins 
Conflicts:
	.travis.yml
	Makefile.am
 2014-03-06 19:52:05 +00:00
James Booth
917a0c7867 Merge remote-tracking branch 'origin/master' into plugins 
Conflicts:
	.gitignore
	.travis.yml
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
 2014-03-06 19:46:53 +00:00
Dmitry Podgorny
0fbaa6f5ee fixed build error when make run with -jN option 
Race can occur when gitversion file isn't fully generated before
it is used.
 2014-03-06 02:06:22 +02:00
James Booth
8d464e9916 Fixed previous merge 2014-03-05 00:14:43 +00:00
James Booth
02ef4d31be Merge branch 'master' into plugins 2014-03-05 00:14:14 +00:00
James Booth
b5171cb054 Added configure checks to enable desktop notifications on OSX 2014-03-04 22:59:09 +00:00
James Booth
3f73a55cb0 Log message when cannot send desktop nofication 2014-03-04 20:16:47 +00:00
James Booth
8cfbb72337 Added OSX desktop notifications using terminal-notifier 
Requires Xcode
WIP - No configure.ac changes
 2014-03-04 20:01:19 +00:00
James Booth
e9b6e277fa Merge branch 'master' into plugins 2014-02-23 00:49:19 +00:00
James Booth
118909b07f Removed debug on error messages 2014-02-23 00:48:10 +00:00
James Booth
f4f1167188 Merge branch 'master' into plugins 2014-02-17 23:10:36 +00:00
James Booth
82ad0cd306 Added /otr myfp test 2014-02-17 21:52:42 +00:00
James Booth
40ff1a1dee Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
 2014-02-16 02:24:14 +00:00
James Booth
7e956fb347 Added tests for /otr warn 2014-02-16 02:22:29 +00:00
James Booth
34e4c1c3b2 Merge branch 'master' into plugins 2014-02-15 21:25:47 +00:00
James Booth
f010dfb004 Show message on /alias list when no aliases 2014-02-15 21:25:13 +00:00
James Booth
f5dd30c4c6 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
	src/profanity.c
	src/server_events.c
 2014-02-13 23:32:11 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
fb00889e6b Merge branch 'master' into plugins 2014-02-03 00:00:50 +00:00
James Booth
0f0cd4cdab Use wnoutrefresh, pnoutrefresh and doupdate 
Issue #298
 2014-02-02 23:58:01 +00:00
James Booth
5e15b4047b Merge branch 'master' into plugins 2014-01-30 22:22:02 +00:00
James Booth
12666b41e6 Refactored handle_presence_error, removed no longer used functions 2014-01-30 22:20:57 +00:00
James Booth
18dfef0b83 Merge branch 'master' into plugins 2014-01-27 22:13:27 +00:00
James Booth
27293ebbc2 Added fallback message error handlers 2014-01-27 22:09:16 +00:00
James Booth
cc487799cd Merge branch 'master' into plugins 2014-01-26 22:51:36 +00:00
James Booth
1a300ce7d3 Show original error message 2014-01-26 22:50:22 +00:00
James Booth
50f1a5ecc0 Changed error message when couldn't join room 2014-01-26 22:19:22 +00:00
James Booth
b92c9540c9 Merge branch 'master' into plugins 2014-01-26 18:31:16 +00:00
James Booth
292ae567aa Handle recipient not found 2014-01-26 18:30:34 +00:00
James Booth
6fb0ea91a5 Merge branch 'master' into plugins 
Conflicts:
	src/config/preferences.c
	src/profanity.c
 2014-01-24 00:16:25 +00:00
James Booth
5d85974bc0 Added aliases to autocomplete 2014-01-23 23:53:20 +00:00
James Booth
8dbe300d72 Added /alias command, writing aliases to [alias] group in profrc 2014-01-23 22:29:53 +00:00
James Booth
8ba2d26947 Added skeleton /alias command 2014-01-23 19:56:33 +00:00
James Booth
7e6e5f520f Merge branch 'master' into plugins 2014-01-21 22:57:05 +00:00
James Booth
6468f40dd9 Convert name to barejid on retrieving win in titlebar for otr messages 
fixes #289
 2014-01-21 18:14:20 +00:00
James Booth
74898961d4 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/server_events.c
 2014-01-21 00:36:47 +00:00
James Booth
0e2fbeb350 Added statuses settings to prefs output 2014-01-21 00:16:37 +00:00
James Booth
3f0addbc99 Added UI presence functions 2014-01-19 18:31:02 +00:00
James Booth
5610f70b35 Inlined ui_contact_online and ui_contact_offline 2014-01-19 17:51:32 +00:00
James Booth
692af0e9a0 Merge branch 'master' into plugins 2014-01-19 00:13:42 +00:00
James Booth
2f58b2488f Added port to /account show <account> 2014-01-19 00:09:51 +00:00
James Booth
4a97ec9293 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/command/command.c
	src/command/commands.c
	src/server_events.c
 2014-01-18 00:23:56 +00:00
James Booth
b1de8a4005 Added OTR remaining system messages and colouring 2014-01-17 00:06:08 +00:00
James Booth
45aee2e778 Tidied OTR messages 2014-01-16 23:16:37 +00:00
James Booth
4f98bc8c25 Show OTR coloured status 
Customisable within theme files e.g.:
titlebar.unencrypted=red
titlebar.encrypted=green
titlebar.trusted=red
titlebar.untrusted=green

Shows [unencrypted] for all non-OTR chat

Disable with '/otr warn off'
 2014-01-16 22:44:23 +00:00
James Booth
6c59bb26da Set boolean when typing in titlebar 2014-01-16 20:37:25 +00:00
James Booth
f0e5e585f8 Removed title_bar_draw from UI module 2014-01-16 20:09:54 +00:00
James Booth
682601d479 Use title_bar_draw in title_bar_refresh 2014-01-16 19:58:21 +00:00
James Booth
69a63bd225 Added constant for console title 2014-01-16 19:47:00 +00:00
James Booth
2911093240 Remove manual memory allocation from titlebar 2014-01-16 19:34:05 +00:00
James Booth
91b5405782 Renamed recipient -> current_recipient in titlebar 2014-01-16 19:21:17 +00:00
James Booth
754ad86e3d Inlined _title_bar_draw_title and _title_bar_draw_presence 2014-01-16 19:06:32 +00:00
James Booth
4792ac8df6 Use title_bar_draw where possible in title bar 2014-01-16 19:03:14 +00:00
James Booth
7c7af7b25f Always erase and refresh titlebar when drawing 2014-01-16 18:58:04 +00:00
James Booth
95b5d141c3 Added _title_bar_draw_title when setting presence 2014-01-16 18:52:27 +00:00
James Booth
fa8801798c Removed _title_bar_show 2014-01-16 18:43:06 +00:00
James Booth
c32caa62e0 Removed title_bar_show from UI module 2014-01-16 18:32:24 +00:00
James Booth
16bf753ad0 Renamed title bar status -> presence 2014-01-16 18:22:50 +00:00
James Booth
9f6d6d44cc Renamed title_bar_set_status -> title_bar_set_presence 2014-01-16 18:13:22 +00:00
James Booth
b0e727a7ef Renamed title_bar -> win 2014-01-16 18:08:00 +00:00
James Booth
0a04ef1510 Renamed title_bar_title -> title_bar_console 2014-01-16 18:04:25 +00:00
James Booth
af1eab7810 Removed dirty flag from titlebar 2014-01-16 17:59:24 +00:00
James Booth
60820007ee Added setting /otr log on|off|redact 2014-01-13 20:17:45 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins 
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
 2014-01-12 19:32:08 +00:00
James Booth
4e97c1e460 Merge branch 'master' into otr 2014-01-12 01:25:35 +00:00
James Booth
462e84ea82 Added /otr trust|untrust commands 2014-01-12 01:20:22 +00:00
James Booth
494aaadba4 Added /otr end command 2014-01-11 23:59:20 +00:00
James Booth
a3217bcf8c End OTR session when user closes chat window 2014-01-11 23:28:11 +00:00
James Booth
f35e485bd4 Handle window creation for incoming and outgoing OTR sessions 2014-01-11 21:44:24 +00:00
James Booth
03086c0384 Added /otr theirfp with hardcoded fingerprint 2014-01-11 19:10:00 +00:00
James Booth
b5469e2e06 Added [OTR] and (trusted/untrusted) to titlebar for OTR sessions 2014-01-11 18:24:44 +00:00
James Booth
bf494b1b07 Refactored setting window recipient 2014-01-11 18:06:46 +00:00
James Booth
9daefe170d Require '/otr start' from both parties before encryption used both ways 2014-01-11 17:03:01 +00:00
James Booth
98b1b96e59 Fixed win_handle_error_message 2014-01-08 22:20:05 +00:00
James Booth
bd79b97101 Merge branch 'master' into plugins 
Conflicts:
	src/ui/core.c
 2014-01-08 20:47:17 +00:00
James Booth
4cc4461c0f Removed handle error message function from ProfWin 2014-01-08 20:27:18 +00:00
James Booth
d99f1536ec Removed print message function from ProfWin 2014-01-08 20:11:53 +00:00
James Booth
0a97e79c68 Merge branch 'master' into plugins 
Conflicts:
	configure.ac
 2014-01-03 18:21:32 +00:00
James Booth
c549595c60 Fixed incoming message plugin call 2014-01-03 18:11:25 +00:00
James Booth
785206a06c Tidied navigation help 
Conflicts:

	src/ui/console.c
 2014-01-02 18:06:53 +00:00
James Booth
c10c9286d1 Merge branch 'master' into plugins 
Conflicts:
	src/ui/notifier.c
	src/ui/ui.h
	src/xmpp/roster.c
 2014-01-02 02:19:06 +00:00
James Booth
9823b2fae2 Added full stop to /help service summary 2014-01-02 01:51:46 +00:00
James Booth
8840457e19 Merge remote-tracking branch 'louiecaulfield/master' 2013-12-29 15:41:22 +00:00
James Booth
2defeaefe3 Removed wins_refresh_console when not required for /sub command output 
Implicitly called by cons_show
 2013-12-27 23:38:45 +00:00
Jasper van Bourgognie
4a706f7a80 src/ui/core.c: Removed duplicate const keyword 2013-12-27 20:56:47 +01:00
James Booth
b83b262d47 Bind remaining ui functions in main.c 2013-12-23 00:23:22 +00:00
James Booth
7fe8f61b9b Bind console functions in main.c 2013-12-23 00:08:45 +00:00