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

1708 Commits

Author SHA1 Message Date
James Booth
c3418a2909 Added /log shared setting
Issue #170
2014-04-13 21:56:51 +01:00
James Booth
a4a23fdf68 Added /log rotate option 2014-04-13 20:41:11 +01:00
James Booth
6387608c6f Merge branch 'master' into plugins 2014-04-13 03:13:06 +01:00
James Booth
bc6f8ceb3a Fixed handling of room subject 2014-04-13 03:11:46 +01:00
James Booth
99592e2779 Show message when no bookmarks found
Issue #194
2014-04-13 02:57:11 +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
883696c58c Merge branch 'master' into plugins 2014-04-13 02:28:36 +01:00
James Booth
f332b6681e Fixed "/bookmark remove" for disabling autojoin
Issue #194
2014-04-13 02:27:37 +01:00
James Booth
f62cf772a7 Refactored bookmark_remove
Issue #194
2014-04-13 02:05:12 +01:00
James Booth
eb9d7d7580 Merge branch 'master' into plugins 2014-04-13 01:41:08 +01:00
James Booth
73c146c65a Implemented "/bookmark remove" for private storage
Issue #194
2014-04-13 01:39:54 +01:00
James Booth
0b2f810431 Added bookmark autocomplete to /join
Issue #194
2014-04-13 01:20:36 +01:00
James Booth
f7daaf0953 Clean up after removing bookmark
Issue #194
2014-04-13 01:11:21 +01:00
James Booth
5bb3fab17c Implemented "/bookmark add" for private storage
Issue #194
2014-04-13 01:01:53 +01:00
James Booth
0a90047bf7 Merge branch 'master' into plugins 2014-04-12 15:38:16 +01:00
James Booth
132976d85e Revert "Added ui_unknown_command"
This reverts commit 714ee24863.
2014-04-12 15:20:31 +01:00
James Booth
2fafcf0013 Revert "Added ui_already_connected"
This reverts commit e97ec56fce.
2014-04-12 15:20:19 +01:00
James Booth
45feaefa71 Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
2014-04-09 22:48:01 +01:00
James Booth
e97ec56fce Added ui_already_connected 2014-04-09 22:29:38 +01:00
James Booth
714ee24863 Added ui_unknown_command 2014-04-09 22:13:01 +01:00
James Booth
b9aac28ccc Refactored invalid command usage 2014-04-09 22:05:31 +01:00
James Booth
26216f6c17 Refactored cmd_execute 2014-04-09 21:38:57 +01:00
James Booth
c3e3759256 Command argument parsers set result argument 2014-04-09 21:31:43 +01:00
Dmitry Podgorny
aa6e2284fc config/theme: search for system-wide themes
Search for system-wide themes (usually /usr/share/profanity/themes) if
not found in user's home directory.

Not tested yet.
2014-04-09 21:42:14 +03:00
James Booth
bdc2eb0d91 Merge branch 'master' into plugins 2014-04-07 22:43:33 +01:00
James Booth
6275644de4 Fixed spelling in comment 2014-04-07 22:43:02 +01:00
James Booth
e401eda990 Merge branch 'master' into plugins 2014-04-07 22:02:32 +01:00
James Booth
a05b63f7a5 Removed unused inputwin module init 2014-04-07 22:01:50 +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
9aa282f6de Removed inputwin functions from ui.h 2014-04-07 21:50:28 +01:00
James Booth
e2443511b6 Tidied new headers, added defines 2014-04-07 21:19:35 +01:00
James Booth
f0f0dbfdac Removed statusbar functions from ui.h 2014-04-07 21:12:30 +01:00
James Booth
fc40637789 Removed titlebar functions from ui.h 2014-04-07 20:41:06 +01:00
James Booth
c7e214860c Removed create_title_bar from ui.h 2014-04-07 20:00:11 +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
ccfea12674 Inlined wins_update_virtual_console and wins_update_virtual_current 2014-04-06 21:06:50 +01:00
James Booth
6b2d2fd8e4 Removed dirty flag from statusbar 2014-04-06 01:33:00 +01:00
James Booth
c9d28b6999 Inlined status_bar_update_time 2014-04-06 01:14:21 +01:00
James Booth
4248b61a0c Renamed function to draw terminal title 2014-04-06 00:47:14 +01:00
James Booth
075ece29c6 Merge branch 'master' into plugins
Conflicts:
	src/ui/core.c
2014-04-03 21:49:22 +01:00
James Booth
561d96c711 Removed titlebar version property and allow disabling of titlebar display 2014-04-03 21:46:43 +01:00
James Booth
95c081666a Clear window title bar on exit 2014-04-03 21:13:59 +01:00
James Booth
fc9706414a Merge remote-tracking branch 'origin/plugins' into plugins 2014-04-02 22:54:22 +01:00
James Booth
7403353da7 Merge branch 'master' into plugins 2014-04-02 22:53:35 +01:00
James Booth
e083e20313 Added check on input length 2014-04-02 22:19:27 +01:00
James Booth
a720ef2627 Removed strcpy calls 2014-04-02 21:01:20 +01:00
James Booth
e1db531875 Show recipient not found in console only when no window for recipient 2014-04-02 20:02:46 +01:00
James Booth
733fd82a8b Fixed merge 2014-04-02 00:14:23 +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
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +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
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
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
80f2a5c8bc Merge branch 'master' into plugins 2014-03-16 01:47:04 +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
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
dd1ee18c72 Added test for /join with nick option 2014-03-08 21:10:23 +00:00
James Booth
e9b5d3294b Removed unused variables from cmd_join 2014-03-08 18:32:48 +00:00
James Booth
7d332750ce Merge branch 'master' into plugins 2014-03-08 00:24:42 +00:00
James Booth
a94814f0a9 Added invalid jid test for /join 2014-03-08 00:23:52 +00:00
James Booth
2d54c565ce Added test to show usage when no room supplied to /join 2014-03-08 00:19:21 +00:00
James Booth
f3fe1d34d2 Added connection status tests for cmd_join 2014-03-08 00:07:38 +00:00
James Booth
b6ceabdc8e Merge branch 'plugins' of github.com:boothj5/profanity into plugins
Conflicts:
	.travis.yml
	Makefile.am
2014-03-06 19:52:05 +00:00
James Booth
917a0c7867 Merge remote-tracking branch 'origin/master' into plugins
Conflicts:
	.gitignore
	.travis.yml
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
2014-03-06 19:46:53 +00:00
Dmitry Podgorny
0fbaa6f5ee fixed build error when make run with -jN option
Race can occur when gitversion file isn't fully generated before
it is used.
2014-03-06 02:06:22 +02:00
James Booth
0e9d4f1cc6 Merge branch 'master' into plugins 2014-03-05 21:01:13 +00:00
James Booth
a9e2028981 Added autocompeleter for /join options 2014-03-05 20:57:59 +00:00
James Booth
65432c8d64 Merge remote-tracking branch 'kmwhite/adding_support_for_private_confs' 2014-03-05 20:29:41 +00:00
Kristofer M White
7c6755b62c Ensuring nick is set when not included in opt args for cmd_join 2014-03-05 19:55:02 +00:00
Kristofer M White
3f18d933ca Removing extra nick = line that broke nick assignment 2014-03-05 17:39:44 +00:00
Kristofer M White
a4e2809756 Removing strdup calls per cmd_connect design 2014-03-05 17:25:26 +00:00
Kristofer M White
28425060bc Parsing optional args for cmd_join 2014-03-05 17:13:42 +00:00
James Booth
8d464e9916 Fixed previous merge 2014-03-05 00:14:43 +00:00
James Booth
02ef4d31be Merge branch 'master' into plugins 2014-03-05 00:14:14 +00:00
James Booth
b5171cb054 Added configure checks to enable desktop notifications on OSX 2014-03-04 22:59:09 +00:00
James Booth
3f73a55cb0 Log message when cannot send desktop nofication 2014-03-04 20:16:47 +00:00
James Booth
8cfbb72337 Added OSX desktop notifications using terminal-notifier
Requires Xcode
WIP - No configure.ac changes
2014-03-04 20:01:19 +00:00
Kristofer M White
ced6e7f411 Making whitespace consistently spaces, not tabs 2014-02-27 05:40:31 +00:00
Kristofer M White
8a54c5895d Adding password handling for joining chatrooms 2014-02-27 05:31:10 +00:00
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00