James Booth
|
262fcd4d66
|
Merge branch 'master' into openpgp
|
2015-05-19 22:43:25 +01:00 |
|
James Booth
|
e5c14b9b80
|
Added uuid dependency to install-all.sh, opensuse, fedora and cygwin
|
2015-05-19 22:42:16 +01:00 |
|
James Booth
|
22e322e2f1
|
Merge branch 'master' into stabber-tests
|
2015-05-19 22:38:56 +01:00 |
|
James Booth
|
5ae012476c
|
Merge branch 'master' into openpgp
Conflicts:
install-all.sh
|
2015-05-19 22:38:36 +01:00 |
|
James Booth
|
8d8b651cf2
|
Merge pull request #547 from PMaynard/update-install-script-for-uuid-dev
Udpate installer.sh to include uuid-dev
|
2015-05-19 22:36:19 +01:00 |
|
Pete Maynard
|
7eab35f353
|
Udpate installer.sh for Debain to unclude uuid-dev
|
2015-05-18 14:15:02 +01:00 |
|
James Booth
|
9ce25c33b0
|
Fixed compiler warnings
|
2015-05-17 23:10:30 +01:00 |
|
James Booth
|
641eadd02f
|
Updated travis build, make stabber dependency
|
2015-05-17 22:35:17 +01:00 |
|
James Booth
|
09f01d518c
|
Merge branch 'master' into stabber-tests
|
2015-05-17 22:28:25 +01:00 |
|
James Booth
|
34d9b2b272
|
Merge branch 'master' into openpgp
|
2015-05-17 22:28:12 +01:00 |
|
James Booth
|
adae6bb4a5
|
Merge remote-tracking branch 'adament/carbons'
|
2015-05-17 22:27:28 +01:00 |
|
James Booth
|
cdf239dd78
|
Removed stbbr_stop from test
|
2015-05-17 22:12:10 +01:00 |
|
James Booth
|
2c5b44421e
|
Added initial stabber test
|
2015-05-17 22:05:43 +01:00 |
|
Adam Ehlers Nyholm Thomsen
|
882ca85aca
|
allow enabling / disabling carbons without being connected.
|
2015-05-17 13:29:08 +02:00 |
|
James Booth
|
97c5072f56
|
Added stabber testsuite
|
2015-05-17 01:11:03 +01:00 |
|
James Booth
|
7f861b7743
|
Removed libgpg include from presence.c
|
2015-05-10 23:54:48 +01:00 |
|
James Booth
|
58b5e39b95
|
Merge branch 'master' into openpgp
|
2015-05-10 01:45:07 +01:00 |
|
James Booth
|
aeffca496c
|
Tidy ui_room_message
|
2015-05-10 01:44:34 +01:00 |
|
James Booth
|
487f5da17d
|
Merge branch 'master' into openpgp
|
2015-05-10 01:08:30 +01:00 |
|
James Booth
|
aaad3ff909
|
Moved logic to notify_message
|
2015-05-10 01:03:34 +01:00 |
|
James Booth
|
acd2d2309f
|
Moved pgp signature generation to cl_ev_presence_send
|
2015-05-08 00:07:21 +01:00 |
|
James Booth
|
0db7bcbdcd
|
Merge branch 'master' into openpgp
|
2015-05-07 23:23:45 +01:00 |
|
James Booth
|
d853284f92
|
Added cl_ev_presence_send
|
2015-05-07 23:21:48 +01:00 |
|
James Booth
|
a2281dbccf
|
Merge branch 'master' into openpgp
|
2015-05-07 23:16:22 +01:00 |
|
James Booth
|
56cbce2ff3
|
Renamed presence_update -> presence_send
|
2015-05-07 23:12:49 +01:00 |
|
James Booth
|
beeadd6ae3
|
Merge branch 'master' into openpgp
|
2015-05-07 22:51:42 +01:00 |
|
James Booth
|
f69ccbf0cc
|
Tidied _roster_result_handler
|
2015-05-07 22:51:35 +01:00 |
|
James Booth
|
8ebc1d4ac1
|
Moved pgp signature verification to sv_ev_contact_online
|
2015-05-07 22:22:28 +01:00 |
|
James Booth
|
8673488368
|
Merge branch 'master' into openpgp
|
2015-05-07 22:06:02 +01:00 |
|
James Booth
|
a2c6211732
|
Added ui_contact_online
|
2015-05-07 22:05:36 +01:00 |
|
James Booth
|
8c347de298
|
Merge branch 'master' into openpgp
|
2015-05-07 00:26:45 +01:00 |
|
James Booth
|
6fd9b179a0
|
Optimised occupant comparisons, create utf8 collate key once
|
2015-05-07 00:26:24 +01:00 |
|
James Booth
|
ca3f7412f5
|
Optimised contact comparisons, create utf8 collate key once
|
2015-05-07 00:16:22 +01:00 |
|
James Booth
|
6840f3b599
|
Merge branch 'master' into openpgp
|
2015-05-06 22:04:47 +01:00 |
|
James Booth
|
5067e565e3
|
Set ui nonblocking on presence updates
Speeds up joining rooms, and connecting.
|
2015-05-06 22:02:50 +01:00 |
|
James Booth
|
c9e21a557e
|
Merge branch 'master' into openpgp
|
2015-05-05 00:51:16 +01:00 |
|
James Booth
|
d52f86ef0f
|
Tidied form field autocompleters
|
2015-05-05 00:13:41 +01:00 |
|
James Booth
|
44aa2fd1bf
|
Use null check convention in gpg.c
|
2015-05-04 23:41:22 +01:00 |
|
James Booth
|
3fd9692aec
|
Merge branch 'master' into pgp
|
2015-05-04 23:40:58 +01:00 |
|
James Booth
|
6f3750c6aa
|
Use null check convention in roster_list.c
|
2015-05-04 23:31:05 +01:00 |
|
James Booth
|
59788752c7
|
Use null check convention in resource.c
|
2015-05-04 23:29:53 +01:00 |
|
James Booth
|
0930f0f688
|
Use null check convention in profanity.c
|
2015-05-04 23:29:24 +01:00 |
|
James Booth
|
41724218c0
|
Use null check convention in log.c
|
2015-05-04 23:28:34 +01:00 |
|
James Booth
|
4c78534be0
|
Use null check convention in jid.c
|
2015-05-04 23:27:41 +01:00 |
|
James Booth
|
1bfaa49fb3
|
Use null check convention in contact.c
|
2015-05-04 23:26:57 +01:00 |
|
James Booth
|
1d002e5bdc
|
Use null check convention in common.c
|
2015-05-04 23:26:08 +01:00 |
|
James Booth
|
49e450767d
|
Use null check convention in chat_session.c
|
2015-05-04 23:24:37 +01:00 |
|
James Booth
|
c487fe5f77
|
Use null check convention in stanza.c
|
2015-05-04 23:23:55 +01:00 |
|
James Booth
|
defa955ae0
|
Use null check convention in roster.c
|
2015-05-04 23:22:06 +01:00 |
|
James Booth
|
8e64323503
|
Use null check convention in presence.c
|
2015-05-04 23:21:06 +01:00 |
|