James Booth
106e909fbd
Merge remote-tracking branch 'incertia/time'
...
Conflicts:
src/config/preferences.c
2015-07-01 20:16:09 +01:00
James Booth
ae4c2781e1
Added messaage when account resource changed whilst connected
2015-06-24 21:36:39 +01:00
James Booth
240f6a3f79
Fixed various jid and account mem leaks
2015-06-24 20:53:04 +01:00
James Booth
626ab51ed4
free account after account connect
2015-06-24 20:24:39 +01:00
James Booth
358e9d6af0
Added /pgp setkey command
2015-06-23 23:29:10 +01:00
James Booth
86acd4649b
Added PGP prefs
2015-06-22 21:09:14 +01:00
James Booth
918e55becf
Fixed pgp help
2015-06-21 22:29:15 +01:00
James Booth
9526f2b7eb
Fixed /pgp help formatting
2015-06-21 22:06:27 +01:00
James Booth
3d2f999efb
Added PGP logging preferences
2015-06-21 21:42:58 +01:00
James Booth
446027b950
Moved setting otr.warn -> enc.warn
2015-06-21 21:07:57 +01:00
James Booth
217fcff420
Added /pgp end command
2015-06-21 20:20:28 +01:00
James Booth
f81652e84e
Added enc_mode check when starting OTR
2015-06-21 20:13:28 +01:00
James Booth
e45afd5c09
Added pgp checks for message sending
2015-06-21 01:48:25 +01:00
James Booth
6617bb5a2b
Added window encyption mode for PGP
2015-06-20 23:49:24 +01:00
James Booth
16999a3964
Merge branch 'master' into openpgp
2015-06-20 00:39:08 +01:00
James Booth
d7ec339e3e
Added /roster empty command
2015-06-20 00:38:28 +01:00
James Booth
ea99012d9b
Added initial /pgp start checks
2015-06-18 01:34:27 +01:00
James Booth
85cc5ab50d
Added cmd_pgp tests
2015-06-18 00:12:01 +01:00
James Booth
97ba9d2692
Merge branch 'master' into openpgp
2015-06-17 20:06:13 +01:00
James Booth
f51a26e6a0
Merge remote-tracking branch 'quite/#513'
2015-06-17 20:05:27 +01:00
James Booth
1af3565cbd
Merge branch 'master' into openpgp
2015-06-17 19:55:52 +01:00
James Booth
e00a03f916
Removed wins_get_current_* functions
2015-06-17 19:49:55 +01:00
James Booth
8fde14879a
Merge branch 'master' into openpgp
...
Conflicts:
src/command/commands.c
src/command/commands.h
2015-06-17 00:40:06 +01:00
James Booth
a798dc5618
Removed unused function prototype
2015-06-17 00:18:59 +01:00
James Booth
2215a3791f
Added current window reference to command functions
2015-06-17 00:15:28 +01:00
James Booth
cfef64c767
Pass current window to autocompleters
2015-06-16 22:59:08 +01:00
Daniel
d00d71f245
Let's only strip trailing whitespace when parsing command
...
Allows for "quoting" a command--doing nothing but sending the string: SPC/command
As we're used to from for example irc clients.
Fixes boothj5/profanity#513
2015-06-16 09:46:02 +02:00
James Booth
637b8bee9f
Merge branch 'master' into openpgp
2015-06-15 23:17:11 +01:00
James Booth
fb0e065902
Tidied cmd_otr, added check-unit target to Makefile
2015-06-15 23:16:22 +01:00
James Booth
de47450594
Merge branch 'master' into openpgp
2015-06-15 22:03:25 +01:00
James Booth
6097a5bade
Removed ui_get_current_chat()
2015-06-15 22:01:28 +01:00
James Booth
c76692516a
Merge branch 'master' into openpgp
2015-06-15 20:39:17 +01:00
James Booth
5cdd69f478
Moved UI interfaces to ui.h
2015-06-15 20:11:34 +01:00
James Booth
38ed9188d3
Moved ui/windows -> window_list
2015-06-15 19:26:28 +01:00
James Booth
a849b200b3
Added win_clear() function
2015-06-15 17:54:47 +01:00
James Booth
10a5f29023
Merge branch 'master' into openpgp
2015-06-14 00:02:00 +01:00
James Booth
e50461a897
Set columns when running functional tests
2015-06-13 23:59:33 +01:00
James Booth
698288ab5c
Show message when offline for /pgp fps
2015-06-13 01:19:56 +01:00
James Booth
a3693cfbe7
Merge branch 'master' into openpgp
2015-06-02 20:32:07 +01:00
James Booth
f0f3a739f4
Merge remote-tracking branch 'PMaynard/#551'
2015-06-02 20:29:35 +01:00
Pete
a0a7d04a5f
Tidy up windows when enabling
2015-06-01 14:47:02 +01:00
Pete Maynard
7bc671e07c
Extra underline
2015-06-01 11:33:19 +01:00
Pete
0564976264
Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected underline, removed call to function 'wins_resize_all()'.
2015-06-01 11:27:01 +01:00
Will Song
837f8b1f10
add examples and be more specific about time formatting
2015-05-30 00:42:19 -05:00
Will Song
0e7507a1aa
update autocomplete
2015-05-29 20:49:28 -05:00
Will Song
9463c67190
fix conflicts
2015-05-29 19:53:37 -05:00
Pete
fbc57765a3
Added window auto tidy.
2015-05-29 14:25:14 +01:00
James Booth
34d9b2b272
Merge branch 'master' into openpgp
2015-05-17 22:28:12 +01:00
Adam Ehlers Nyholm Thomsen
882ca85aca
allow enabling / disabling carbons without being connected.
2015-05-17 13:29:08 +02: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
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
3fd9692aec
Merge branch 'master' into pgp
2015-05-04 23:40:58 +01:00
James Booth
4acf853b1c
Use null check convention in commands.c
2015-05-04 22:23:59 +01:00
James Booth
2b3cc65b52
Use null check convention in command.c
2015-05-04 22:16:39 +01:00
James Booth
aca102f542
Merge branch 'master' into pgp
2015-05-04 01:34:18 +01:00
James Booth
c8eaaa0ce9
Added ui_ev_new_private_win to ui events
2015-05-04 01:31:27 +01:00
James Booth
3dace733d9
Merge branch 'master' into pgp
2015-05-04 01:10:30 +01:00
James Booth
b1dd1e2726
cl_ev_send_muc_msg takes ProfMucWin as arg
2015-05-04 01:06:12 +01:00
James Booth
0bd642edf8
Merge branch 'master' into pgp
2015-04-30 23:38:28 +01:00
James Booth
e11e55e31a
Move current win check to event, removed next and prev win functions
2015-04-30 22:43:08 +01:00
James Booth
a3a4b6267b
Merge branch 'master' into pgp
2015-04-30 22:10:03 +01:00
James Booth
d68fb25dde
Removed ui_win_switch_num
2015-04-30 22:09:39 +01:00
James Booth
7730674f45
Merge branch 'master' into pgp
2015-04-30 21:24:06 +01:00
James Booth
0a6b76d6d3
Removed some ui functions, inlined
2015-04-30 21:23:43 +01:00
James Booth
0fece78dfe
Merge branch 'master' into pgp
2015-04-29 23:08:23 +01:00
James Booth
665c34414d
Return result on OTR message sending
2015-04-29 22:59:44 +01:00
James Booth
0df8b8beff
Return new window on new chat win event
2015-04-29 22:10:32 +01:00
James Booth
5d827cafec
Merge branch 'master' into pgp
...
Conflicts:
src/xmpp/message.c
2015-04-28 23:57:28 +01:00
James Booth
d3698e6bee
Added ui events module
2015-04-28 23:53:37 +01:00
James Booth
8aba52f4fe
Renamed event functions
2015-04-28 23:38:56 +01:00
James Booth
7a44e17141
Merge branch 'master' into pgp
...
Conflicts:
src/config/account.h
2015-04-23 23:48:43 +01:00
James Booth
bc9e6b79cd
Tidied account login
2015-04-23 21:56:48 +01:00
James Booth
5f2c6cbd28
Merge branch 'master' into pgp
2015-04-22 00:30:00 +01:00
James Booth
ba286c54ef
Moved login events to client events module
2015-04-22 00:29:37 +01:00
James Booth
1c47b57e19
Tidy execute alias code
2015-04-21 23:45:03 +01:00
James Booth
bc445ccdfb
Merge branch 'master' into pgp
2015-04-21 23:35:37 +01:00
James Booth
88739d5c59
Moved new chat win events to client events module
2015-04-21 23:28:52 +01:00
James Booth
ebca38e224
Merge branch 'master' into pgp
2015-04-21 22:08:00 +01:00
James Booth
53f2a4a35c
Moved all message sending to client events module
2015-04-21 21:57:39 +01:00
James Booth
9be265591a
Merge branch 'master' into pgp
2015-04-19 19:50:19 +01:00
James Booth
32da6548da
Added client_events module, reuse message sending code for all commands
2015-04-19 19:40:15 +01:00
James Booth
bcfbbac49a
Merge branch 'master' into pgp
2015-04-12 02:16:13 +01:00
James Booth
57dc5f14ef
Added option to show jids in occupants panel
2015-04-12 02:14:37 +01:00
James Booth
7e4b756e44
Merge branch 'master' into pgp
2015-04-11 23:38:44 +01:00
James Booth
a2ccd89646
Autogenerate room name with UUID for /join with no args
2015-04-11 23:37:52 +01:00
James Booth
c8c12a8f7a
Merge branch 'master' into pgp
2015-03-29 03:17:41 +01:00
James Booth
71c2be599b
Use password for chat room invites
2015-03-29 03:16:41 +01:00
James Booth
c1eceebcba
Merge branch 'master' into pgp
2015-03-29 00:59:42 +00:00
James Booth
714faeb2e6
Add callback data to room disco info response handler
2015-03-29 00:55:33 +00:00
James Booth
551f7df1f7
Added signature verification, /pgp fps command
2015-03-24 00:47:13 +00:00
James Booth
475dfebd97
Added pgpkeyid account setting, send signed presence
2015-03-23 23:38:06 +00:00
James Booth
8a5d1fef29
Added Id and fingerprint to pgp key list
2015-03-22 01:03:06 +00:00
James Booth
fd86615549
Added /pgp libver command
2015-03-22 00:29:57 +00:00
James Booth
2490c3ed20
Added pgp key list command
2015-03-22 00:12:14 +00:00
James Booth
f1f047889e
Added individual options to send and request delivery receipts
2015-03-19 22:57:51 +00:00
James Booth
311b64a379
Tidy cmd_tiny
2015-03-16 23:03:31 +00:00
James Booth
848baa95a2
Added static function for sending otr tagged messages
2015-03-16 21:59:11 +00:00
James Booth
11966d39b0
Added otr_tag_message, removed commands.c dependency on libotr
2015-03-16 21:41:35 +00:00
James Booth
ec57c72fb4
Use static functions in cmd_msg
2015-03-16 01:48:12 +00:00
James Booth
d50754aac6
Removed window checks before logging in cmd_msg
2015-03-16 01:39:43 +00:00
James Booth
981618b7da
Added static functions to commands.c for sending messages
2015-03-16 01:29:03 +00:00
James Booth
e7e1688d8a
Moved _strtoi to common, strtoi_range
2015-03-16 01:06:40 +00:00
James Booth
23ef3498b5
Removed console dependency from strtoi
2015-03-16 01:03:37 +00:00
James Booth
9bf5a68329
Moved default and alias command execution
2015-03-16 00:03:07 +00:00
James Booth
eeabbc9bb3
Fix for chat logging
2015-03-15 23:31:39 +00:00
James Booth
8944a3b5bb
Move common chat logging code to log.c
2015-03-15 23:19:00 +00:00
James Booth
fae2717f27
Tidied help
2015-03-15 20:04:53 +00:00
James Booth
2762f18a3e
Added /receipts command
2015-03-15 19:48:19 +00:00
James Booth
bc6e32175d
Removed from argument from outgoing message functions
2015-03-14 14:50:45 +00:00
James Booth
b84bddc46b
Renamed win_save_println -> win_println
2015-03-14 14:14:46 +00:00
James Booth
e02dbe24da
Renamed win_save_print -> win_print
2015-03-14 14:12:32 +00:00
James Booth
f4441ec64f
Renamed win_save_vprint -> win_vprint
2015-03-14 14:10:10 +00:00
James Booth
57c7564445
Show message received text for receipts
2015-03-11 23:47:11 +00:00
James Booth
e5bb12a0d6
Added /time statusbar preference
2015-03-10 23:35:08 +00:00
James Booth
2ff6873cf1
Send private carbons element with message when encrypted
2015-03-10 21:16:34 +00:00
James Booth
3c1e8c4e15
Added server error handling when setting /carbons preference
2015-03-09 23:07:51 +00:00
James Booth
2c19fad6d6
Added /carbons autocompletion
2015-03-09 21:53:29 +00:00
James Booth
88af6e3455
Added connection check before sending carbons enable/disable IQ
2015-03-09 21:52:09 +00:00
James Booth
945f29873e
Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280
2015-03-08 21:51:50 +00:00
James Booth
2112ddea65
Merge branch 'master' into readline
2015-02-26 00:50:49 +00:00
James Booth
cbdfc09a84
Renamed /theme set -> /theme load
2015-02-26 00:49:21 +00:00
James Booth
7454bede8b
Merge branch 'master' into readline
2015-02-23 00:50:58 +00:00
James Booth
2f4d66ea6e
Merge remote-tracking branch 'stormc/master-spellfixes'
...
Conflicts:
src/command/command.c
2015-02-23 00:49:56 +00:00
James Booth
6979786ace
Merge branch 'master' into readline
2015-02-23 00:17:24 +00:00
James Booth
c249a60cba
Finished help tidy
2015-02-23 00:15:33 +00:00
Christian Storm
a1d14c4526
Fixed spelling.
2015-02-17 10:52:37 +01:00
James Booth
475ec97f99
Merge branch 'master' into readline
2015-02-16 22:53:15 +00:00
James Booth
0997bafeb9
Removed comment
2015-02-16 22:52:18 +00:00
James Booth
1a59c6e745
Merge branch 'master' into readline
2015-02-16 22:38:45 +00:00
James Booth
2605b84a70
Tidy help
2015-02-16 22:37:17 +00:00
James Booth
32b8ead198
Merge branch 'master' into readline
2015-02-14 20:46:11 +00:00
James Booth
d02b364b3c
Tidy help
2015-02-11 23:58:11 +00:00
James Booth
b24510c776
Merge branch 'master' into readline
...
Conflicts:
src/tools/history.c
src/tools/history.h
2015-02-11 00:09:58 +00:00
James Booth
b3be26a214
Updated copyright
2015-02-10 23:16:09 +00:00
James Booth
831be52366
Merge branch 'master' into readline
2015-02-10 21:32:44 +00:00
James Booth
1e2ef97334
Fixed parameter order for /tiny in private and group chat
...
fixes #502
2015-02-10 21:27:27 +00:00
James Booth
13297a151f
Merge branch 'master' into readline
...
Conflicts:
src/ui/inputwin.c
2015-02-10 20:47:22 +00:00
James Booth
e565812d09
Free roster list
2015-02-10 20:30:50 +00:00
James Booth
30739ed157
Free contact list
2015-02-10 19:39:18 +00:00
Olivier LE MOAL
48f9f3b3b0
Add XEP-0280 support
2015-02-10 11:32:22 +01:00
James Booth
64774a947e
Merge branch 'master' into readline
2015-02-09 22:11:25 +00:00
James Booth
a9c69670fa
Free filtered lists for who command
2015-02-09 22:03:17 +00:00
James Booth
51ccb69580
Merge branch 'master' into readline
...
Conflicts:
src/ui/inputwin.c
2015-02-09 21:28:08 +00:00
James Booth
6682f243ce
Free theme list after use
2015-02-09 21:21:22 +00:00
James Booth
8cec79faef
Merge branch 'master' into readline
2015-02-08 21:03:26 +00:00
James Booth
44c5b34a71
Moved quote stripper to common, added tests
2015-02-08 20:59:51 +00:00