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,332 Commits 32 Branches 59 Tags 24 MiB
f7a7277e40
Commit Graph

330 Commits

Author SHA1 Message Date
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