aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
2,412 Commits 32 Branches 59 Tags 24 MiB
6387608c6f
Commit Graph

253 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
James Booth
5e56515f4f Merge branch 'master' into plugins 2014-02-10 23:20:35 +00:00
James Booth
3e02921859 Removed id from bookmarks add 2014-02-03 19:35:26 +00:00
James Booth
af11eab3f1 Merge branch 'master' into plugins 2014-02-02 02:41:44 +00:00
James Booth
9394091f04 Implemented add bookmark for XEP-0223 
Issue #194
 2014-02-02 02:39:36 +00:00
James Booth
b6d7b4be05 Merge branch 'master' into plugins 2014-02-02 01:07:22 +00:00
James Booth
95c48a0f47 Test message when removing autojoin for non existent bookmark 2014-02-02 01:05:52 +00:00
James Booth
9d957e5f93 Show message on /bookmark remove when bookmark does not exist 2014-02-02 00:59:32 +00:00
James Booth
92b85bb7f1 Added message when bookmark updated 2014-02-02 00:49:02 +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
26dc4efdf6 Merge branch 'master' into plugins 2014-01-28 21:16:03 +00:00
James Booth
c3ea8f8d0b Added generated id's to presence stanzas 2014-01-28 20:55:02 +00:00
James Booth
7374d8aa58 Merge branch 'master' into plugins 2014-01-27 22:51:10 +00:00
James Booth
e9959d5d38 Refactored presence_error_handler 2014-01-27 22:35:04 +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
678a5bd05c Fixed comment 2014-01-27 21:48:44 +00:00
James Booth
da94dcf3cf Moved connection_error_handler to _presence_error_handler 2014-01-27 21:42:34 +00:00
James Booth
f26686aeca Removed unnecessary strdup 2014-01-27 21:33:02 +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