James Booth
7e386fbf00
Removed ui_open_xmlconsole_win()
2015-11-01 19:33:01 +00:00
James Booth
9eae20298f
Removed ui_create_xmlconsole_win()
2015-11-01 19:29:59 +00:00
James Booth
486d2e0495
Removed ui_xmlconsole_exists
2015-11-01 19:26:31 +00:00
James Booth
241fb72fa2
Merge branch 'master' into osx-functional
2015-11-01 19:06:48 +00:00
James Booth
d6e4b74802
Removed ui_input_nonblocking()
2015-11-01 18:56:34 +00:00
James Booth
8195ab42cb
Removed ui_ paging functions
2015-11-01 18:49:53 +00:00
James Booth
be4b07102c
Removed ui_input_clear()
2015-11-01 18:42:42 +00:00
James Booth
4c42ce9701
Removed ui_readline()
2015-11-01 18:38:21 +00:00
James Booth
863018d103
Merge branch 'master' into osx-functional
2015-10-31 23:53:05 +00:00
James Booth
17488ca346
Added missing config.h includes
2015-10-31 23:38:08 +00:00
James Booth
8a7e2c19f9
Fixed tests
2015-10-31 23:24:47 +00:00
James Booth
5963155b8a
Merge branch 'master' into osx-functional
2015-10-27 23:47:46 +00:00
James Booth
3f7f1186a6
Tidied remaining chatwin functions
2015-10-27 23:39:26 +00:00
James Booth
31016a2150
Tidied chatwin_outgoing_carbon
2015-10-27 23:25:18 +00:00
James Booth
e7148bf82d
Renamed ui_outgoing_chat_msg -> chatwin_outgoing_msg
2015-10-27 23:20:03 +00:00
James Booth
af1124f28f
Renamed ui_incoming_msg -> chatwin_incoming_msg
2015-10-27 23:18:42 +00:00
James Booth
ea09dcda18
Renamed ui_new_chat_win -> chatwin_new
2015-10-27 23:15:28 +00:00
James Booth
ae89028772
Renamed ui_recipient_gone -> chatwin_recipeint_gone
2015-10-27 23:06:27 +00:00
James Booth
62c2febc11
Tidied ui_recipient_gone
2015-10-27 23:05:20 +00:00
James Booth
ff9abecd50
Combined chatwin OTR SMP functions
2015-10-27 22:25:26 +00:00
James Booth
40dcd59727
Renamed chatwin OTR functions
2015-10-27 21:23:56 +00:00
James Booth
124aaa9809
remaining otr functions take ProfChatWin
2015-10-27 00:19:22 +00:00
James Booth
8bd74cefcf
ui_smp_successful takes ProfChatWin
2015-10-26 23:50:56 +00:00
James Booth
3cea2bc4f4
ui_smp_aborted takes ProfChatWin
2015-10-26 23:45:39 +00:00
James Booth
0b51f4d36f
ui_smp_unsuccessful_receiver takes ProfChatWin
2015-10-26 23:40:37 +00:00
James Booth
d11f8d5ffc
ui_smp_unsuccessful_sender takes ProfChatWin
2015-10-26 23:36:11 +00:00
James Booth
3ce55de1e1
ui_smp_recipient_initiated_q takes ProfChatWin
2015-10-26 23:29:01 +00:00
James Booth
55e857d6a8
ui_smp_recipient_initiated takes ProfChatWin
2015-10-26 23:22:59 +00:00
James Booth
9d3bcf5f90
ui_gone_insecure takes ProfChatWin
2015-10-26 23:10:30 +00:00
James Booth
4fb0b4b0da
ui_gone_secure takes ProfChatWin
2015-10-26 23:04:45 +00:00
James Booth
2efaa464bf
ui_message_receipt takes ProfChatWin
2015-10-26 22:54:06 +00:00
James Booth
8f45f332ad
Removed ui_chat_win_exists
2015-10-26 22:43:32 +00:00
James Booth
d2cc99a4f2
Merge branch 'master' into osx-functional
2015-10-26 20:54:56 +00:00
James Booth
2f68063aca
Merge remote-tracking branch 'jubalh/resleak'
2015-10-26 20:50:51 +00:00
James Booth
d8fc7faa36
Removed ui_about() function
2015-10-26 20:37:50 +00:00
Michael Vetter
9b5cdf8ebd
Fix resource leak
...
Run fclose after fopen in unittests.
2015-10-26 14:30:26 +01:00
James Booth
67d57ba908
Merge branch 'master' into osx-functional
2015-10-26 01:05:31 +00: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
James Booth
7361760ca2
Merge branch 'master' into osx-functional
2015-10-19 00:57:51 +01:00
James Booth
496616256e
Fixed test_cmd_rooms.c
2015-10-19 00:57:01 +01:00
James Booth
d4a60a268a
Merge branch 'master' into osx-functional
2015-10-18 03:11:18 +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
cb33ae13fc
Merge branch 'master' into osx-functional
2015-10-17 23:15:49 +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
e60b4d1946
Merge branch 'master' into osx-functional
2015-10-15 01:23:14 +01:00
James Booth
904a5a81cf
Add ability to script commands after connect
2015-10-15 01:19:24 +01:00
James Booth
5d1dc99872
Merge branch 'master' into osx-functional
2015-10-14 00:31:19 +01:00
James Booth
c9165ef9d2
Title bar TLS indicator
...
Issue #616
2015-10-14 00:29:22 +01:00
James Booth
e6fd9f8a7b
Merge branch 'master' into osx-functional
2015-10-13 00:50:41 +01:00
James Booth
9c08211119
functionaltests: user ip address for server on connect
2015-10-13 00:45:10 +01:00
James Booth
118e92039e
functionaltests: reset connect wait to 30 secs
2015-10-13 00:32:02 +01:00
James Booth
14ff1db9a6
functionaltests: Doubled libexpect timeout for connect
2015-10-13 00:24:28 +01:00
James Booth
e7b4f0bd78
Doubled expect timeout for connect in tests, removed libuuid from travis build
2015-10-13 00:10:28 +01:00
James Booth
a61d95f45b
Merge branch 'master' into osx-functional
2015-10-12 23:44:36 +01:00
James Booth
164620f4bb
Fixed tests
2015-10-12 23:44:03 +01:00
James Booth
c61388d517
Merge branch 'master' into osx-functional
2015-09-30 22:54:34 +01:00
James Booth
e9aff68947
Fixed functional tests
2015-09-30 22:42:42 +01:00
James Booth
bb8a83a152
Merge branch 'master' into osx-functional
2015-09-29 00:02:19 +01:00
James Booth
26d160cae8
WIP: Added last activity request and response
2015-09-29 00:01:38 +01:00
James Booth
78c5b64ab5
Merge branch 'master' into osx-functional
2015-09-27 23:12:20 +01:00
James Booth
54e225aa53
Added auto xa option, tidied autoaway code
2015-09-27 23:08:30 +01:00
James Booth
100db7c36c
Set status to what it was before autoaway
2015-09-25 22:55:44 +01:00
James Booth
95195fceee
Merge branch 'master' into osx-functional
2015-09-25 00:37:49 +01:00
James Booth
c5178747fd
Fixed test
2015-09-25 00:36:20 +01:00
James Booth
b484411ea8
Save last activity to account on disconnect
2015-09-25 00:26:58 +01:00
James Booth
966da3b45f
Merge branch 'master' into osx-functional
2015-09-24 20:20:59 +01:00
James Booth
9414ad268d
Prompt user to allow or deny untrusted TLS certificates
2015-09-22 21:42:05 +01:00
James Booth
94b685d692
Merge branch 'master' into osx-functional
2015-09-08 20:21:55 +01:00
James Booth
b266e4d035
Pass delay timestamp to all incoming chat events
2015-09-08 20:18:31 +01:00
James Booth
0a2df8ae89
Merge branch 'master' into osx-functional
2015-08-30 02:13:03 +01:00
James Booth
688be91c23
PGP: Format fingerprints
2015-08-30 02:12:05 +01:00
James Booth
816274457e
Merge branch 'master' into osx-functional
2015-08-30 01:37:33 +01:00
James Booth
b4722632b6
Split PGP incoming and outgoing message handling
2015-08-30 01:32:13 +01:00
James Booth
d7b56a468d
Merge branch 'master' into osx-functional
2015-08-27 00:42:27 +01:00
James Booth
1484e94b35
Fixed OTR decryption check
2015-08-27 00:37:48 +01:00
James Booth
ef52840d91
Added str_contains_str to common
2015-08-26 23:52:40 +01:00
James Booth
9e9d31cbac
Merge branch 'master' into osx-functional
2015-08-26 01:38:14 +01:00
James Booth
4625651340
Fixed test stubs
2015-08-26 00:45:09 +01:00
James Booth
cb19be2ffc
Added PGP key autocompleter
2015-08-25 23:44:03 +01:00
James Booth
fc1ee79190
PGP: Show key IDs for assigned public keys
2015-08-25 22:45:51 +01:00
James Booth
c5184e8060
Merge branch 'master' into osx-functional
2015-08-25 00:22:49 +01:00
James Booth
f6a91145b6
Show public/private indicator when listing PGP keys
2015-08-25 00:21:49 +01:00
James Booth
6700f9afbb
Merge branch 'master' into osx-functional
2015-08-24 00:18:23 +01:00
James Booth
525876770a
Removed unused barejid argument from PGP decryption
2015-08-24 00:13:57 +01:00
James Booth
be802b7221
Merge branch 'master' into osx-functional
2015-08-23 23:12:46 +01:00
James Booth
b1ab4b2854
Added JID to log when failing to load PGP fingerprint
...
Added PGP stub for tests
2015-08-23 23:09:44 +01:00
James Booth
97a70e3123
Merge branch 'master' into osx-functional
2015-08-11 01:02:08 +01:00
James Booth
2af5c151a0
Tidied pgp memory allocations
2015-08-11 01:00:23 +01:00
James Booth
cc6f36e253
Merge branch 'master' into osx-functional
...
Conflicts:
tests/functionaltests/proftest.c
2015-08-06 01:58:48 +01:00
James Booth
406b821b35
Show software version result in current window
2015-08-06 01:56:52 +01:00
James Booth
f9c5a46c82
Merge branch 'master' into osx-functional
2015-08-05 01:26:05 +01:00
James Booth
ac3e7dd9e8
Handle software version requests for gateways that return from domainpart
2015-08-05 00:48:50 +01:00
James Booth
2a92169351
Use id handler for software version requests, handle errors
2015-08-05 00:26:29 +01:00
James Booth
67a8ee2026
Merge branch 'master' into osx-functional
2015-08-04 23:43:46 +01:00
James Booth
de747e3d46
Added software version request tests
2015-08-04 23:43:19 +01:00
James Booth
2cb2f83ce3
Added test for missing resource on presence
2015-08-04 23:22:43 +01:00
James Booth
cf48b124a6
Merge branch 'master' into osx-functional
2015-08-02 00:25:48 +01:00
James Booth
8ec931eb84
Added cons_show_padded
2015-07-29 23:48:28 +01:00
James Booth
5576b88a04
Added indent padding
2015-07-29 22:48:03 +01:00
James Booth
8119025120
Fixed tests for new command format
2015-07-27 00:04:48 +01:00
James Booth
22111bf75b
Moved help and about to new format
2015-07-23 23:05:33 +01:00
James Booth
e9d7693856
Merge branch 'master' into osx-functional
2015-07-23 00:46:17 +01:00
James Booth
decd5066ce
tests: prof_connect_with_roster takes items
2015-07-23 00:40:08 +01:00
James Booth
b583290907
Merge branch 'master' into osx-functional
2015-07-22 22:55:39 +01:00
James Booth
f9a7e35001
Added id attributes to roster queries
...
fixes #596
2015-07-22 22:48:37 +01:00
James Booth
b11fd81b0d
Merge branch 'master' into osx-functional
...
Conflicts:
tests/functionaltests/functionaltests.c
2015-07-20 22:36:34 +01:00
James Booth
d40998c4af
Added reciept send functional test
2015-07-20 22:35:14 +01:00
James Booth
d54cbf126a
Added receipt request functional test
2015-07-20 22:21:29 +01:00
James Booth
d3130be8a5
Merge branch 'master' into osx-functional
...
Conflicts:
tests/functionaltests/functionaltests.c
2015-07-20 22:03:58 +01:00
James Booth
52e2917b5d
Added functional test macro
2015-07-20 22:00:51 +01:00
James Booth
232e746637
Merge branch 'master' into osx-functional
...
Conflicts:
tests/functionaltests/functionaltests.c
2015-07-20 21:46:31 +01:00
James Booth
bdcc0ddbf8
Added carbon message tests
2015-07-20 21:36:58 +01:00
James Booth
ba50414ac2
Debugging expect test
2015-07-16 23:53:26 +01:00
James Booth
4027968b4c
Merge branch 'master' into osx-functional
2015-07-15 00:24:44 +01:00
James Booth
f3326bf105
Added carbons enable/disable tests
2015-07-15 00:23:46 +01:00
James Booth
50ac166cff
Reverted previous attempt to get expect working on osx
2015-07-14 23:36:39 +01:00
James Booth
0400a5237f
WIP getting functional tests working on osx
2015-07-13 20:06:48 +01:00
James Booth
5e324e407f
Added carbons command functional test
2015-07-05 17:29:33 +01:00
James Booth
b98e119c86
Fixed segfault in unit tests
2015-07-02 19:28:35 +01:00
James Booth
dd206ef637
WIP fix for #516 , needs memory cleanup
2015-06-29 23:48:41 +01:00
James Booth
ae4c2781e1
Added messaage when account resource changed whilst connected
2015-06-24 21:36:39 +01:00
James Booth
583bccf631
Merge remote-tracking branch 'pasis/stderr-log-handler'
2015-06-24 21:02:21 +01:00
James Booth
358e9d6af0
Added /pgp setkey command
2015-06-23 23:29:10 +01:00
Dmitry Podgorny
e831410669
log: Introduced stderr log handler
...
This handler redirects stderr output to a pipe and gathers logs from the
read end.
The handler is called from main loop, therefore, if a function prints logs
to stderr they will be put to log file only after function returns.
2015-06-23 20:52:04 +00:00
James Booth
86acd4649b
Added PGP prefs
2015-06-22 21:09:14 +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
5669799690
Encryption modes for sv_ev_incoming_message
2015-06-21 20:08:46 +01:00
James Booth
13a612cbc2
Moved window creation to sv_ev_incoming_message
2015-06-21 18:29:20 +01:00
James Booth
8d2d923603
Moved message display logic to sv_ev_incoming_message
2015-06-21 18:00:57 +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
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
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
2215a3791f
Added current window reference to command functions
2015-06-17 00:15:28 +01: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
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
82ff85c329
Revert back to original rooms test
2015-06-13 22:13:01 +01:00
James Booth
dda79aed24
Debugging travis build
2015-06-13 21:31:38 +01:00
James Booth
5b58e2d0bc
Debugging travis build
2015-06-13 21:20:13 +01:00
James Booth
5c13f00e2f
Debugging travis build
2015-06-13 21:13:21 +01:00
James Booth
0fcfa65f15
Use regex for multiline assert in rooms functional test
2015-06-13 20:53:51 +01:00
James Booth
0c3fe51799
Changed assert order in rooms test
2015-06-13 20:10:12 +01:00
James Booth
b07a7035df
Merge branch 'master' into openpgp
2015-06-13 19:50:53 +01:00
James Booth
6255420b80
Increase connection time, functional tests
2015-06-13 19:49:26 +01:00
James Booth
eb1f8a499a
Merge branch 'master' into openpgp
2015-06-13 19:41:34 +01:00
James Booth
a48b9fcec2
Tidied functional tests
2015-06-13 19:41:11 +01:00
James Booth
c2c2cee6c9
Moved stub_gpg.c
2015-06-12 23:58:44 +01:00
James Booth
efb07f8187
Merge branch 'master' into openpgp
2015-06-12 23:55:28 +01:00
James Booth
68ed20f10d
Moved all tests to tests folder
2015-06-12 23:53:30 +01:00
James Booth
1cd23e0efc
Moved gpg stub
2015-06-12 23:27:39 +01:00
James Booth
9aff8abd2e
Merge branch 'master' into openpgp
...
Conflicts:
.travis.yml
2015-06-05 23:02: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
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
Pete Maynard
9c659246bc
Added winstidy to test stub
2015-05-31 11:43:08 +01:00
James Booth
6d6bb64588
Moved tests -> unittests
2015-05-28 18:50:55 +01:00
James Booth
2c5b44421e
Added initial stabber test
2015-05-17 22:05:43 +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
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
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
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
bb2b5d20d5
Merge branch 'master' into pgp
2015-05-04 00:57:17 +01:00
James Booth
ef54ff305e
ui_outgoing_chat_msg now takes ProfChatWin as argument
2015-05-04 00:55:43 +01:00
James Booth
8c72f0deb5
Merge branch 'master' into pgp
2015-05-02 23:24:50 +01:00
James Booth
be4ee40ed4
Pass ProfChatWin to otr_on_message_send
2015-05-02 23:23:12 +01:00
James Booth
cade9e7c4c
Merge branch 'master' into pgp
2015-05-01 00:55:58 +01:00
James Booth
0118178080
Removed server event delegation functions
2015-05-01 00:55:40 +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
d5188a160e
Merge branch 'master' into pgp
2015-04-29 23:16:43 +01:00
James Booth
2e75e54460
Added ui_win_error_line()
2015-04-29 23:16:28 +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
5d827cafec
Merge branch 'master' into pgp
...
Conflicts:
src/xmpp/message.c
2015-04-28 23:57:28 +01:00
James Booth
8aba52f4fe
Renamed event functions
2015-04-28 23:38:56 +01:00
James Booth
43189b1ab4
Merge branch 'master' into pgp
2015-04-27 23:45:51 +01:00
James Booth
70d1756a1c
Moved otr message send event to otr module
2015-04-27 23:30:33 +01:00