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,365 Commits 32 Branches 59 Tags 24 MiB
733fd82a8b
Commit Graph

178 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
96e32fe178 Added cmd_win test 2014-04-01 23:14:53 +01:00
James Booth
80f2a5c8bc Merge branch 'master' into plugins 2014-03-16 01:47:04 +00:00
James Booth
93397e4581 Added cmd_roster test 2014-03-16 01:23:12 +00:00
James Booth
13ee16dedb Revert "Added srdir to git version check" 
This reverts commit 864e728705.
 2014-03-08 23:34:18 +00:00
James Booth
864e728705 Added srdir to git version check 2014-03-08 23:00:23 +00:00
James Booth
7d332750ce Merge branch 'master' into plugins 2014-03-08 00:24:42 +00:00
James Booth
f3fe1d34d2 Added connection status tests for cmd_join 2014-03-08 00:07:38 +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
57a1182eb0 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
 2014-02-25 20:34:54 +00:00
mr.Shu
0d15c7108d fixed indent in Makefile.am 2014-02-25 16:51:24 +01:00
James Booth
4a26c4dd0a Merge branch 'master' into plugins 2014-02-16 23:13:09 +00:00
James Booth
a21ab6d4c8 Mock otr module for cmd_otr tests 2014-02-16 19:14:15 +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
6295336284 Added cmd_otr tests 2014-02-16 00:04:53 +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
450c01ecb4 Refactored common otr library code 2014-02-13 23:07:09 +00:00
James Booth
4e81707b27 Renamed otr implementations 2014-02-12 23:29:08 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
819e3f1a8b Merge branch 'master' into plugins 2014-02-11 23:52:08 +00:00
James Booth
fa89e2aa62 Check for libotr version 2014-02-09 00:32:11 +00:00
James Booth
7e4b1b1dea Added libotr back to configure by default 
Renamed to BUILD_OTR3
 2014-02-08 23:07:51 +00:00
James Booth
d4f5955518 Merge branch 'master' into plugins 2014-02-02 00:02:05 +00:00
James Booth
1654f13656 Moved test helpers 2014-02-01 16:32:36 +00:00
James Booth
652e99fdd8 Added cmd_bookmark tests 2014-02-01 16:16:56 +00:00
James Booth
4538f5c01a Merge branch 'master' into plugins 2014-01-30 23:50:54 +00:00
James Booth
63b3299b06 Added muc tests 2014-01-30 23:32:52 +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
8dbe300d72 Added /alias command, writing aliases to [alias] group in profrc 2014-01-23 22:29:53 +00:00
James Booth
632df07671 Merge branch 'master' into plugins 2014-01-22 22:22:55 +00:00
James Booth
21ab182151 Refactored ProfAccount creation 2014-01-22 22:22:01 +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
a7a2850637 WIP - /statuses command options 2014-01-20 18:40:48 +00:00
James Booth
69f2f4a16f Use defaults for /statuses commands 2014-01-19 17:20:31 +00:00
James Booth
5f25d99357 Added tests/config/helpers 2014-01-19 16:32:31 +00:00
James Booth
c7325de073 Added cmd_statuses validation tests 2014-01-19 01:25:04 +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
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
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
264fc55aa2 Added conditionals to makefile for otr support 2014-01-12 02:15:16 +00:00
James Booth
49deb932e6 Merge branch 'master' into otr 2014-01-08 20:50:00 +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
f1596e2957 Added --enable-c-plugins to configure.ac 2014-01-07 23:58:47 +00:00
James Booth
1a85e6cf24 Merge branch 'master' into plugins 
Conflicts:
	src/profanity.c
	src/profanity.h
	src/xmpp/connection.c
 2014-01-06 00:08:06 +00:00
James Booth
0776c574b6 Merge branch 'master' into otr 2014-01-05 23:58:10 +00:00
James Booth
87cdbe015a Added server_events.c 2014-01-05 20:52:45 +00:00
James Booth
f569845b40 Merge branch 'master' into otr 
Conflicts:
	.gitignore
 2014-01-05 01:20:42 +00:00