1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Commit Graph

4682 Commits

Author SHA1 Message Date
James Booth
f081aa7aa2 Merge branch 'master' into plugins
Conflicts:
	src/command/commands.c
	src/command/commands.h
	src/main.c
	src/ui/console.c
	src/ui/core.c
	src/ui/notifier.c
	src/ui/ui.h
	src/ui/window.c
	src/window_list.c
	src/window_list.h
	src/xmpp/connection.c
2015-10-26 01:05:13 +00:00
James Booth
dd11334b06 Applied coding style to src/ 2015-10-26 00:52:33 +00:00
James Booth
c8a6bdb381 Applied coding style to src/xmpp/ 2015-10-26 00:14:23 +00:00
James Booth
2ce43b633f Applied coding style to src/ui/ 2015-10-25 23:31:11 +00:00
James Booth
4a6b729a54 Applied coding style to src/ui/core.c 2015-10-25 23:11:27 +00:00
James Booth
1096603234 Applied coding style to src/ui/console.c 2015-10-25 22:59:35 +00:00
James Booth
559ff72cf5 Applied coding style to src/ui/buffer.h src/ui/buffer.c 2015-10-25 22:50:10 +00:00
James Booth
0017098400 Applied coding style to src/tools/ 2015-10-25 22:47:42 +00:00
James Booth
39d183fe23 Applied coding style to src/pgp/ 2015-10-25 22:43:19 +00:00
James Booth
894fa355e8 Applied coding style to src/otr/ 2015-10-25 22:40:09 +00:00
James Booth
afbd2693cd Applied coding style to src/event/ 2015-10-25 22:32:46 +00:00
James Booth
5863292094 Applied coding style to src/config/ 2015-10-25 22:23:38 +00:00
James Booth
ea899aabee Applied coding style to account.h 2015-10-25 00:49:48 +01:00
James Booth
5f74c2044c Applied coding style to accounts.c 2015-10-25 00:46:12 +01:00
James Booth
19e71f05f8 Applied coding style to account.h 2015-10-25 00:36:56 +01:00
James Booth
13ae9252a7 Applied coding style to account.c 2015-10-25 00:35:39 +01:00
James Booth
22db16e646 Applied coding style to commands.h 2015-10-25 00:33:41 +01:00
James Booth
99b2d5fda2 Applied coding style to commands.c 2015-10-25 00:31:42 +01:00
James Booth
fa53e23805 Applied coding style to command.h 2015-10-25 00:26:42 +01:00
James Booth
cded90bcd0 Applied coding style to command.c 2015-10-25 00:25:10 +01:00
James Booth
1d4d693a53 Merge remote-tracking branch 'jubalh/jub' 2015-10-24 21:42:04 +01:00
Michael Vetter
7a0e8f87b5 Remove trailing whitespaces 2015-10-21 15:07:58 +02:00
Michael Vetter
3b0f7e109c Use consistent style for pointers 2015-10-21 15:07:49 +02:00
James Booth
85e8c13a11 Merge branch 'master' into plugins 2015-10-19 00:57:30 +01:00
James Booth
496616256e Fixed test_cmd_rooms.c 2015-10-19 00:57:01 +01:00
James Booth
34b19c5738 Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
	src/profanity.c
	src/xmpp/connection.c
2015-10-18 03:11:02 +01:00
James Booth
6640a0891f Force tls on all connections, add tls policy account property 2015-10-18 03:06:23 +01:00
James Booth
9d2745e462 Removed --disable-tls command line option 2015-10-18 00:17:45 +01:00
James Booth
31ecd41c8f Renamed PREF_CERT_PATH -> PREF_TLS_CERTPATH 2015-10-18 00:03:15 +01:00
James Booth
15db19c0b6 Merge branch 'master' into plugins 2015-10-17 23:15:34 +01:00
James Booth
b8c08f85cc Added /script autocompletion 2015-10-17 23:14:55 +01:00
James Booth
eca7390951 Implemented /script show 2015-10-17 22:58:45 +01:00
James Booth
a35cbea732 Implemented /script list 2015-10-17 22:30:01 +01:00
James Booth
66ea05d814 Merge branch 'master' into plugins 2015-10-16 00:00:22 +01:00
James Booth
0769fc6b1b Added /script run 2015-10-15 23:57:52 +01:00
James Booth
8defc0ec9f Merge branch 'master' into plugins 2015-10-15 23:33:40 +01:00
James Booth
ea4fb2ce6c Allow /lastactivity on|off when not connected 2015-10-15 23:32:47 +01:00
James Booth
df7e0cca00 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/profanity.c
2015-10-15 01:23:03 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
James Booth
0c1c8cae46 Merge branch 'master' into plugins 2015-10-14 22:29:00 +01:00
James Booth
fb60a755e5 Updated CHANGELOG 2015-10-14 22:28:06 +01:00
James Booth
7a7a5813e1 Merge branch 'master' into plugins 2015-10-14 22:09:46 +01:00
James Booth
d38e10828e Added /lastactivity on|off 2015-10-14 22:09:18 +01:00
James Booth
1fd2a8a4e9 Send service-unavailable when lastactivity disabled 2015-10-14 21:45:19 +01:00
James Booth
5fb8acb17f Use lastactivity preference for presence updates 2015-10-14 21:30:48 +01:00
James Booth
8c9174b82f Added lastactivity preference 2015-10-14 21:17:46 +01:00
James Booth
aae526fbde Moved idle time check for last activity 2015-10-14 21:12:26 +01:00
James Booth
f260a8c0bd Merge branch 'master' into plugins 2015-10-14 01:01:04 +01:00
James Booth
85764ddb53 Added TLS show to UI preferences 2015-10-14 00:58:33 +01:00
James Booth
93358d5e62 Updated themes 2015-10-14 00:53:51 +01:00