1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

2364 Commits

Author SHA1 Message Date
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
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
7113b97952 Added test for valid window switch 2014-04-01 23:33:12 +01:00
James Booth
96e32fe178 Added cmd_win test 2014-04-01 23:14:53 +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
3fdd9944ab Do not scroll to end in message window when paging 2014-03-31 21:44:34 +01:00
James Booth
3d768527c1 Moved ui_current_page_off to ui_incoming_msg 2014-03-31 21:09:24 +01:00
James Booth
b303bdd057 Hooks test commit 2014-03-30 00:35:56 +00:00
James Booth
8f7bdc3c2e Switch back to storage for muc bookmarks 2014-03-29 23:15:51 +00:00
James Booth
7e27d96f16 Revert "Commented bookmarks code for 0.4.0 release"
This reverts commit 8306d4c244.
2014-03-29 22:58:48 +00:00
James Booth
6909a0a721 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2014-03-29 18:57:19 +00:00
James Booth
47632bd3ee Set version to 0.5.0 development 2014-03-29 18:55:35 +00:00
James Booth
45cf45b218 Set status to release 2014-03-29 17:12:12 +00:00
James Booth
f8ba6bbdea Updated debian files 2014-03-28 22:14:22 +00:00
James Booth
bf0fdc4d76 Updated profanity.spec 2014-03-28 22:12:32 +00:00
James Booth
9db02541e4 Added otr settings to themes 2014-03-28 22:02:36 +00:00
James Booth
9709ab7738 Merge branch 'master' into plugins 2014-03-24 21:05:50 +00:00
James Booth
9815ef3b02 Change libotr 4.0.0 code to use only OTR spec v2 2014-03-24 21:02:10 +00:00
James Booth
7dd4c92d47 Merge branch 'master' into plugins 2014-03-16 18:23:31 +00:00
James Booth
8306d4c244 Commented bookmarks code for 0.4.0 release 2014-03-16 18:20:31 +00:00
James Booth
d97a7dc670 Merge branch 'master' into plugins 2014-03-16 18:12:56 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
James Booth
38e1ff22fc Merge branch 'master' into plugins 2014-03-16 18:03:15 +00:00
James Booth
f4d52f3d40 Use expect_value == NULL for NULL parameters in tests 2014-03-16 18:02:18 +00:00
James Booth
89f306ceb2 Updated /roster help 2014-03-16 17:59:01 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
bcafba2de6 Added /roster remove tests 2014-03-16 16:00:10 +00:00
James Booth
80f2a5c8bc Merge branch 'master' into plugins 2014-03-16 01:47:04 +00:00
James Booth
a578419d55 Added /roster add test 2014-03-16 01:46:18 +00:00
James Booth
93397e4581 Added cmd_roster test 2014-03-16 01:23:12 +00:00
James Booth
05952e8337 Small changes to help 2014-03-16 00:53:46 +00: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
3acec2b0be Udated copyright in plugins sources 2014-03-09 01:27:35 +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
a198c9e873 Updated man page 2014-03-09 00:54:41 +00:00
James Booth
006ee8dd02 Removed old DESIGN file 2014-03-09 00:48:45 +00:00
James Booth
2731ef9cd8 Merge branch 'master' into plugins 2014-03-09 00:13:41 +00:00
James Booth
3b1b3f8b16 Merge branch 'brew-build' 2014-03-09 00:06:20 +00:00
James Booth
72c35553fd Split ncurses and curl LIB additions 2014-03-09 00:04:39 +00:00
James Booth
7fa9ecc76d Uncomment ncurses check 2014-03-09 00:02:34 +00:00
James Booth
768df4d736 Ncurses include libs before wget_wch check 2014-03-08 23:57:50 +00:00
James Booth
ea16cacf91 Uncommented ncurses check 2014-03-08 23:52:14 +00:00
James Booth
2b3d645147 Added other osx build options 2014-03-08 23:38:30 +00:00
James Booth
13ee16dedb Revert "Added srdir to git version check"
This reverts commit 864e728705.
2014-03-08 23:34:18 +00:00
James Booth
864e728705 Added srdir to git version check 2014-03-08 23:00:23 +00:00
James Booth
2c976d3523 Commented ncurses wget_wch test 2014-03-08 22:32:54 +00:00
James Booth
c505b03465 Merge branch 'master' into plugins 2014-03-08 21:51:47 +00:00