James Booth
|
ef7c2bea5c
|
Merge branch 'master' into plugins
|
2017-01-28 17:29:57 +00:00 |
|
James Booth
|
68a3daedb9
|
Update Copyright
|
2017-01-28 17:24:22 +00:00 |
|
James Booth
|
e6166c76ba
|
Merge branch 'master' into plugins
|
2017-01-22 21:46:54 +00:00 |
|
James Booth
|
83385cdbc0
|
Add pre chat and room message blocking
|
2017-01-22 18:09:04 +00:00 |
|
James Booth
|
33eb5743a0
|
Merge branch 'master' into plugins
|
2017-01-16 00:25:20 +00:00 |
|
James Booth
|
0d0578b625
|
Fix compile
|
2017-01-16 00:07:17 +00:00 |
|
James Booth
|
b9f2266e90
|
Merge branch 'master' into plugins
|
2017-01-16 00:03:23 +00:00 |
|
James Booth
|
2b7894ccff
|
Remove status from cl_ev_presence_send
fixes #888
|
2017-01-15 23:59:31 +00:00 |
|
James Booth
|
f08781ea08
|
Merge branch 'master' into plugins
|
2016-11-22 00:43:09 +00:00 |
|
James Booth
|
e043029a50
|
Allow clearing account resource
issue #880
|
2016-11-22 00:39:52 +00:00 |
|
James Booth
|
c225d24b42
|
Merge branch 'master' into plugins
Conflicts:
.travis.yml
|
2016-09-03 23:11:42 +01:00 |
|
James Booth
|
f6e9ff5b9b
|
Fix missing params
|
2016-09-03 22:53:32 +01:00 |
|
Dmitry Podgorny
|
6090f76f72
|
Add missed argument
|
2016-09-02 20:56:20 +03:00 |
|
James Booth
|
33a4800b17
|
Merge branch 'master' into plugins
|
2016-08-18 22:55:57 +01:00 |
|
James Booth
|
a978bb12bf
|
Send receipt request only when receiver supports feature
issue #829
|
2016-08-18 22:53:23 +01:00 |
|
James Booth
|
c6f1a87d1d
|
Merge branch 'master' into plugins
|
2016-07-24 15:44:16 +01:00 |
|
James Booth
|
0a57c4de78
|
Tidy headers
|
2016-07-24 15:43:51 +01:00 |
|
James Booth
|
5bc38b6bc2
|
Moved window_list.c
|
2016-07-24 15:14:46 +01:00 |
|
James Booth
|
90b9b48ab9
|
Moved roster_list.c
|
2016-07-24 15:08:47 +01:00 |
|
James Booth
|
25a6252a28
|
Moved chat_session.c
|
2016-07-24 14:23:55 +01:00 |
|
James Booth
|
b4cd071bab
|
Merge remote-tracking branch 'origin/master' into plugins
|
2016-07-24 01:20:59 +01:00 |
|
James Booth
|
e8fc80f5c1
|
Update GPL link in headers
|
2016-07-24 01:14:49 +01:00 |
|
James Booth
|
808902b903
|
Merge branch 'master' into plugins
|
2016-05-11 22:23:50 +01:00 |
|
James Booth
|
d1c71e98f4
|
Move connection fulljid function
|
2016-05-06 01:12:54 +01:00 |
|
James Booth
|
88f423afea
|
Rename jabber_ functions
|
2016-05-06 00:53:03 +01:00 |
|
James Booth
|
f5656138c6
|
Merge branch 'master' into plugins
Conflicts:
configure.ac
|
2016-04-26 23:43:58 +01:00 |
|
Dominik Heidler
|
1b0ce852bb
|
Implement XEP-0363: HTTP File Upload
|
2016-04-26 23:50:55 +02:00 |
|
James Booth
|
17175bb672
|
Merge branch 'master' into plugins
Conflicts:
src/plugins/plugins.c
|
2016-03-31 21:16:19 +01:00 |
|
James Booth
|
9b177a9e01
|
Removed #AX_PREFIX_CONFIG_H
|
2016-03-31 21:05:02 +01:00 |
|
James Booth
|
41d88b0581
|
Merge branch 'master' into plugins
Conflicts:
.travis.yml
Makefile.am
configure.ac
src/command/command.c
src/command/command.h
src/config/preferences.c
src/config/preferences.h
src/event/client_events.c
src/plugins/api.c
src/plugins/api.h
src/plugins/c_api.c
src/plugins/c_plugins.c
src/plugins/callbacks.c
src/plugins/callbacks.h
src/plugins/plugins.c
src/plugins/plugins.h
src/plugins/profapi.c
src/plugins/profapi.h
|
2016-02-24 00:07:18 +00:00 |
|
James Booth
|
2ac911618a
|
Fix call to plugins_post_chat_message_send
|
2016-02-16 23:48:47 +00:00 |
|
James Booth
|
1f90aca503
|
Merge branch 'master' into plugins-c
Conflicts:
src/main.c
src/ui/console.c
|
2016-02-14 23:00:52 +00:00 |
|
James Booth
|
db88e6dd7b
|
Merge branch 'master' into plugins
Conflicts:
src/main.c
src/ui/console.c
|
2016-02-14 22:58:49 +00:00 |
|
James Booth
|
e53e94f1e2
|
Updated copyright
|
2016-02-14 22:54:46 +00:00 |
|
James Booth
|
41fe8c22b1
|
Added C plugin code from plugins branch
|
2016-02-14 22:28:55 +00:00 |
|
James Booth
|
a6c90649d9
|
Merge branch 'master' into plugins
|
2016-02-03 00:15:44 +00:00 |
|
James Booth
|
77e819e81a
|
Handle self leaving room in private wins
|
2016-02-03 00:11:38 +00:00 |
|
James Booth
|
4ddcd86f76
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
|
2016-02-02 23:32:42 +00:00 |
|
James Booth
|
150015fa3d
|
Show message in private windows when user offline
|
2016-02-02 21:52:13 +00:00 |
|
James Booth
|
c3d3737bc1
|
Merge branch 'master' into plugins
Conflicts:
src/event/server_events.c
src/profanity.c
|
2016-01-05 01:43:18 +00:00 |
|
James Booth
|
393e690165
|
Merge branch 'master' into roster-struct
|
2016-01-05 01:38:31 +00:00 |
|
James Booth
|
ba57b270db
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
|
2016-01-05 01:32:16 +00:00 |
|
James Booth
|
e1e0fda8b3
|
Call UI disconnect functions before disconnecting with /disconnect
fixes #703
|
2016-01-05 01:30:32 +00:00 |
|
James Booth
|
055a5f71ce
|
Added roster struct, create and destroy roster on connect/disconnect
|
2016-01-05 00:06:50 +00:00 |
|
James Booth
|
4b70f9e43f
|
Merge branch 'master' into plugins
Conflicts:
src/command/commands.c
src/event/client_events.c
|
2016-01-03 17:26:48 +00:00 |
|
James Booth
|
8e9bf08389
|
Add cl_ev_disconnect
|
2016-01-03 17:23:36 +00:00 |
|
James Booth
|
a575549fc6
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
src/event/server_events.c
|
2015-11-08 22:15:44 +00:00 |
|
James Booth
|
60215cdf9d
|
Renamed MUC private window functions
|
2015-11-08 22:08:29 +00:00 |
|
James Booth
|
c994a7a5ec
|
Merge branch 'master' into plugins
Conflicts:
src/command/command.c
src/event/client_events.c
src/event/server_events.c
src/main.c
src/ui/chatwin.c
|
2015-10-31 23:51:34 +00:00 |
|
James Booth
|
17488ca346
|
Added missing config.h includes
|
2015-10-31 23:38:08 +00:00 |
|