James Booth
677fe16df0
Merge branch 'master' into plugins
...
Conflicts:
src/command/command.c
src/command/commands.c
src/server_events.c
2014-04-23 23:01:58 +01:00
James Booth
c7b3ff02ff
Rejoin private rooms after reconnecting
2014-04-23 22:19:14 +01:00
James Booth
1706980fd7
Merge remote-tracking branch 'lucian/master'
...
Conflicts:
src/server_events.c
2014-04-23 00:20:34 +01:00
lightb
e08ee67f5f
Bugfix: Because whitespace was removed, last check OTR always, didn't work, now it works.
2014-04-22 18:53:48 -04:00
James Booth
1a0f12b0e6
Merge remote-tracking branch 'lucian/master'
2014-04-22 23:53:15 +01:00
lightb
5a5ad31edf
Added new functionality to OTR always policy
...
If policy is set to always, and unencrypted message is received it will try to start an otr session.
Note: Fully tested with pidgin, is now working (opportunistic and always)
2014-04-22 18:07:53 -04:00
lightb
1192e67cf7
Strip whitespace from otr tagged message for proper display.
...
Will handle BASE + OTRV1TAG/OTRV2TAG or BASE + OTRV1TAG + OTRV2TAG
or BASE + OTRV2TAG + OTRV1TAG
2014-04-22 16:55:28 -04:00
lightb
1bd617d389
Small modification, should check for whitespace pattern even if policy is always.
2014-04-22 16:26:45 -04:00
lightb
6450e2a704
Added OTR opportunistic pattern intercept.
...
When a message is received, OTRL_MESSAGE_TAG_BASE + OTRL_MESSAGE_TAG_V1 or OTRL_MESSAGE_TAG_V2
is searched for, if it is, the client attempts to start an OTR session.
Tested between profanity clients: WORKED
Tested between profanity and pidgin: NOT WORKING (not sure if pidgin checks for the whitespace)
2014-04-22 16:01:57 -04:00
James Booth
94cd4723be
Merge branch 'master' into plugins
...
Conflicts:
Makefile.am
configure.ac
src/ui/titlebar.c
2014-04-21 00:50:54 +01:00
James Booth
2c15aba92a
Chat room windows now created only after successful join
2014-04-21 00:37:04 +01:00
James Booth
00fd7f4bce
Merge branch 'master' into plugins
...
Conflicts:
src/ui/window.h
src/ui/windows.c
2014-04-15 23:48:59 +01:00
James Booth
bf185d9907
Added simple stanza logging to main console
2014-04-15 01:08:41 +01:00
James Booth
6387608c6f
Merge branch 'master' into plugins
2014-04-13 03:13:06 +01:00
James Booth
71180f66d7
Added focus param to ui_room_join, not set for bookmark autojoin
...
Issue #194
2014-04-13 02:52:25 +01:00
James Booth
48922fb7a9
Merge branch 'master' into plugins
...
Conflicts:
Makefile.am
src/server_events.c
2014-04-07 21:58:15 +01:00
James Booth
fc40637789
Removed titlebar functions from ui.h
2014-04-07 20:41:06 +01:00
James Booth
ca84791fc7
Merge branch 'master' into plugins
...
Conflicts:
src/server_events.c
2014-04-06 23:58:30 +01:00
James Booth
aa2a87d162
Tidied ui dependencies
2014-04-06 21:35:17 +01:00
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
404dde2810
Renamed refresh functions to update_virtual
2014-04-01 21:52:04 +01:00
James Booth
e8e5ab597a
Do not scroll to end when chat room message whilst paging
2014-03-31 21:50:33 +01:00
James Booth
3d768527c1
Moved ui_current_page_off to ui_incoming_msg
2014-03-31 21:09:24 +01:00
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
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
38f4e76246
Merge branch 'master' into plugins
2014-01-30 23:16:31 +00:00
James Booth
0338d136e0
Added presence_error tests, added muc_close()
2014-01-30 23:15:39 +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
2cd24a484a
Renamed handle_error_message -> handle_presence_error
2014-01-30 21:43:31 +00:00
James Booth
050d996c1c
Merge branch 'master' into plugins
2014-01-28 22:44:52 +00:00
James Booth
5afb296e67
Moved error handling logic to server_events
2014-01-28 22:37:50 +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
60e2941ce7
Merge branch 'master' into plugins
2014-01-26 00:54:50 +00:00
James Booth
16de267906
Added id handler for pings, disable ping on error type 'cancel'
2014-01-26 00:53:24 +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
