45de788773 
								
							 
						 
						
							
							
								
								use time instead of uptime for unmute  
							
							
							
						 
						
							2015-02-12 18:52:10 +01:00  
				
					
						
							
							
								 
						
							
								026be61b72 
								
							 
						 
						
							
							
								
								don't show 'enter pgp key' in non encrypted chats  
							
							
							
						 
						
							2015-02-09 16:01:30 +01:00  
				
					
						
							
							
								 
						
							
								ae8c021c16 
								
							 
						 
						
							
							
								
								sort users in muc  
							
							
							
						 
						
							2015-02-07 12:29:32 +01:00  
				
					
						
							
							
								 
						
							
								e1e09d5cba 
								
							 
						 
						
							
							
								
								refactored how snackbar is displayed  
							
							
							
						 
						
							2015-02-07 12:17:03 +01:00  
				
					
						
							
							
								 
						
							
								6c3ea7f2bd 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2015-01-29 23:26:41 +01:00  
				
					
						
							
							
								 
						
							
								f2bf64d19d 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2015-01-29 23:20:01 +01:00  
				
					
						
							
							
								 
						
							
								48604a6620 
								
							 
						 
						
							
							
								
								Use Material Design Icons on API 21+  
							
							
							
						 
						
							2015-01-29 15:28:26 -05:00  
				
					
						
							
							
								 
						
							
								0eeead495f 
								
							 
						 
						
							
							
								
								properly clear notifications.  fixed   #921  
							
							
							
						 
						
							2015-01-29 13:20:18 +01:00  
				
					
						
							
							
								 
						
							
								8cbf610bb2 
								
							 
						 
						
							
							
								
								Show errors before mute snackbar  
							
							... 
							
							
							
							See #939  
							
						 
						
							2015-01-27 08:49:03 -05:00  
				
					
						
							
							
								 
						
							
								91e85d2faf 
								
							 
						 
						
							
							
								
								adapt caps on whether or not message confirmation is on  
							
							
							
						 
						
							2015-01-26 00:48:56 +01:00  
				
					
						
							
							
								 
						
							
								4afdd6480a 
								
							 
						 
						
							
							
								
								Merge pull request  #930  from betheg/otr  
							
							... 
							
							
							
							otr: switch to the otr-state the partner alternate. 
							
						 
						
							2015-01-25 20:53:29 +01:00  
				
					
						
							
							
								 
						
							
								29331e49b9 
								
							 
						 
						
							
							
								
								fix mergable() for /me command.  
							
							
							
						 
						
							2015-01-25 16:58:06 +01:00  
				
					
						
							
							
								 
						
							
								7800647885 
								
							 
						 
						
							
							
								
								otr: switch to the otr-state the partner alternate.  
							
							... 
							
							
							
							should also fixed  #877  
							
						 
						
							2015-01-25 13:07:31 +01:00  
				
					
						
							
							
								 
						
							
								cbebd14dbd 
								
							 
						 
						
							
							
								
								Changed online color to green instead of primary  
							
							
							
						 
						
							2015-01-23 22:28:10 +01:00  
				
					
						
							
							
								 
						
							
								4e50098e31 
								
							 
						 
						
							
							
								
								show checkbox to hide offline contacts  
							
							
							
						 
						
							2015-01-21 17:24:02 +01:00  
				
					
						
							
							
								 
						
							
								00c74503ab 
								
							 
						 
						
							
							
								
								deal with user entering full jids in join conference dialog  
							
							
							
						 
						
							2015-01-21 16:18:38 +01:00  
				
					
						
							
							
								 
						
							
								be9af442ef 
								
							 
						 
						
							
							
								
								always allow access to contact details. provide add button in contact details  
							
							
							
						 
						
							2015-01-21 15:31:40 +01:00  
				
					
						
							
							
								 
						
							
								764ef3c8cd 
								
							 
						 
						
							
							
								
								Add block/unblock to contact details menu  
							
							... 
							
							
							
							See #889  
							
						 
						
							2015-01-21 13:07:36 +01:00  
				
					
						
							
							
								 
						
							
								6dc53c2b35 
								
							 
						 
						
							
							
								
								fixed missing image preview  
							
							
							
						 
						
							2015-01-20 22:54:26 +01:00  
				
					
						
							
							
								 
						
							
								04f4680582 
								
							 
						 
						
							
							
								
								fixed up button on v21 devices  
							
							
							
						 
						
							2015-01-20 22:53:45 +01:00  
				
					
						
							
							
								 
						
							
								fc2e458053 
								
							 
						 
						
							
							
								
								fixed bug when sharing files from google drive  
							
							
							
						 
						
							2015-01-18 20:27:16 +01:00  
				
					
						
							
							
								 
						
							
								6756386eee 
								
							 
						 
						
							
							
								
								explain read marker  
							
							
							
						 
						
							2015-01-18 13:44:18 +01:00  
				
					
						
							
							
								 
						
							
								d58fadd05f 
								
							 
						 
						
							
							
								
								use same helper methods for images and files  
							
							
							
						 
						
							2015-01-18 13:00:57 +01:00  
				
					
						
							
							
								 
						
							
								edd58f19b4 
								
							 
						 
						
							
							
								
								Add download button on notification if applicable  
							
							
							
						 
						
							2015-01-16 01:10:01 -05:00  
				
					
						
							
							
								 
						
							
								dc8b467cf6 
								
							 
						 
						
							
							
								
								sending read marker when resuming activity and conversation is open  
							
							
							
						 
						
							2015-01-15 16:32:24 +01:00  
				
					
						
							
							
								 
						
							
								c0993a9acb 
								
							 
						 
						
							
							
								
								show toast when avatar has been published -  fixed   #874  
							
							
							
						 
						
							2015-01-15 16:26:46 +01:00  
				
					
						
							
							
								 
						
							
								0a96bec3c1 
								
							 
						 
						
							
							
								
								Add option to swap enter/emoticon key  
							
							
							
						 
						
							2015-01-14 16:14:14 -05:00  
				
					
						
							
							
								 
						
							
								8d3323e384 
								
							 
						 
						
							
							
								
								context menu for files and offered files.  fixed   #848   fixed   #849  
							
							
							
						 
						
							2015-01-12 16:42:20 +01:00  
				
					
						
							
							
								 
						
							
								77e4e1c2ac 
								
							 
						 
						
							
							
								
								reworked message preview / message meta information (ie file offered, received * file)  
							
							... 
							
							
							
							fixed  #837  
						
							2015-01-12 16:09:39 +01:00  
				
					
						
							
							
								 
						
							
								3c5224251c 
								
							 
						 
						
							
							
								
								Add XEP-0245 (/me command) support  
							
							
							
						 
						
							2015-01-11 18:32:00 -05:00  
				
					
						
							
							
								 
						
							
								18eb187949 
								
							 
						 
						
							
							
								
								make room persistant when changing subject or other muc options  
							
							
							
						 
						
							2015-01-10 23:10:32 +01:00  
				
					
						
							
							
								 
						
							
								158f5dd17c 
								
							 
						 
						
							
							
								
								don't crash when selecting a conversation by uuid did not work  
							
							
							
						 
						
							2015-01-10 19:43:23 +01:00  
				
					
						
							
							
								 
						
							
								c89fdec0b1 
								
							 
						 
						
							
							
								
								fixed regression in tablet ui  
							
							
							
						 
						
							2015-01-09 22:24:50 +01:00  
				
					
						
							
							
								 
						
							
								06eae476ee 
								
							 
						 
						
							
							
								
								Introduced expert options to control enter-is-send  
							
							... 
							
							
							
							(default == off) 
							
						 
						
							2015-01-09 19:23:26 +01:00  
				
					
						
							
							
								 
						
							
								d9f88c4669 
								
							 
						 
						
							
							
								
								ensure that everyone is member before making a room private  
							
							
							
						 
						
							2015-01-09 13:28:01 +01:00  
				
					
						
							
							
								 
						
							
								a9159568b9 
								
							 
						 
						
							
							
								
								allow for very basic muc configuration  
							
							
							
						 
						
							2015-01-08 21:29:26 +01:00  
				
					
						
							
							
								 
						
							
								0fe193b027 
								
							 
						 
						
							
							
								
								code cleanup  
							
							
							
						 
						
							2015-01-08 14:45:44 +01:00  
				
					
						
							
							
								 
						
							
								f8aa1bfec4 
								
							 
						 
						
							
							
								
								kick after ban  
							
							
							
						 
						
							2015-01-08 01:23:53 +01:00  
				
					
						
							
							
								 
						
							
								061de5205e 
								
							 
						 
						
							
							
								
								some clean ups for affiliation change context menu  
							
							
							
						 
						
							2015-01-08 00:23:26 +01:00  
				
					
						
							
							
								 
						
							
								8d655f445a 
								
							 
						 
						
							
							
								
								more muc options  
							
							... 
							
							
							
							* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this 
							
						 
						
							2015-01-07 18:34:24 +01:00  
				
					
						
							
							
								 
						
							
								ef525fb10e 
								
							 
						 
						
							
							
								
								basic affiliation changes in muc  
							
							
							
						 
						
							2015-01-07 15:03:29 +01:00  
				
					
						
							
							
								 
						
							
								81e9afdf19 
								
							 
						 
						
							
							
								
								reset next encryption when archiving conversations  
							
							
							
						 
						
							2015-01-07 12:20:39 +01:00  
				
					
						
							
							
								 
						
							
								562699c745 
								
							 
						 
						
							
							
								
								run invalidateOptionsMenu on uiThread  
							
							
							
						 
						
							2015-01-06 18:26:14 +01:00  
				
					
						
							
							
								 
						
							
								4b0043ba91 
								
							 
						 
						
							
							
								
								fixed potential NPEs in ShareWithActivity  
							
							
							
						 
						
							2015-01-06 18:25:31 +01:00  
				
					
						
							
							
								 
						
							
								fdcbdfdc05 
								
							 
						 
						
							
							
								
								added debug info + possible platform bug work arounds to message adapter  
							
							
							
						 
						
							2015-01-05 18:46:42 +01:00  
				
					
						
							
							
								 
						
							
								bdb335e6b0 
								
							 
						 
						
							
							
								
								Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role  
							
							
							
						 
						
							2015-01-05 15:06:39 +01:00  
				
					
						
							
							
								 
						
							
								e6cd92a663 
								
							 
						 
						
							
							
								
								added higher auto accept file sizes  
							
							... 
							
							
							
							also changed labeling to MiB and KiB 
							
						 
						
							2015-01-04 17:53:06 +01:00  
				
					
						
							
							
								 
						
							
								be7de054be 
								
							 
						 
						
							
							
								
								record voice and attachment refactor  
							
							
							
						 
						
							2015-01-03 16:06:59 +01:00  
				
					
						
							
							
								 
						
							
								960b7343d3 
								
							 
						 
						
							
							
								
								disable / enable all accounts  
							
							
							
						 
						
							2015-01-03 13:36:48 +01:00  
				
					
						
							
							
								 
						
							
								969044b113 
								
							 
						 
						
							
							
								
								migrated change password into separate activity  
							
							
							
						 
						
							2015-01-03 00:11:02 +01:00  
				
					
						
							
							
								 
						
							
								1988e244ef 
								
							 
						 
						
							
							
								
								some further otr improvements  
							
							
							
						 
						
							2015-01-02 15:14:06 +01:00  
				
					
						
							
							
								 
						
							
								f58f27a1f7 
								
							 
						 
						
							
							
								
								click on dynamic tag to filter for that tag  
							
							
							
						 
						
							2015-01-02 14:47:08 +01:00  
				
					
						
							
							
								 
						
							
								3df23a4f75 
								
							 
						 
						
							
							
								
								allow cancellation of waiting files  
							
							
							
						 
						
							2015-01-02 14:27:49 +01:00  
				
					
						
							
							
								 
						
							
								bcd3be59ce 
								
							 
						 
						
							
							
								
								put Conversations into background mode earlier  
							
							
							
						 
						
							2015-01-02 12:04:33 +01:00  
				
					
						
							
							
								 
						
							
								3833e6dfef 
								
							 
						 
						
							
							
								
								improved OTR verification part one  
							
							
							
						 
						
							2015-01-02 01:21:14 +01:00  
				
					
						
							
							
								 
						
							
								fb8737ed9f 
								
							 
						 
						
							
							
								
								fixed npe in block menu item  
							
							
							
						 
						
							2014-12-30 01:16:33 +01:00  
				
					
						
							
							
								 
						
							
								193d2645e6 
								
							 
						 
						
							
							
								
								code cleanup for change password stuff  
							
							
							
						 
						
							2014-12-25 22:28:19 +01:00  
				
					
						
							
							
								 
						
							
								0c22a8d1c6 
								
							 
						 
						
							
							
								
								added callback to change account password to notify UI on success / failure  
							
							
							
						 
						
							2014-12-25 22:08:13 +01:00  
				
					
						
							
							
								 
						
							
								e4d9dca2fe 
								
							 
						 
						
							
							
								
								Add ability to change password on server  
							
							... 
							
							
							
							Fixes  #260  
						
							2014-12-25 21:38:55 +01:00  
				
					
						
							
							
								 
						
							
								2081c1bef7 
								
							 
						 
						
							
							
								
								proper call to invalidateViews()  
							
							
							
						 
						
							2014-12-25 19:53:56 +01:00  
				
					
						
							
							
								 
						
							
								3ada834839 
								
							 
						 
						
							
							
								
								Show server info option when blocking is unavailable  
							
							... 
							
							
							
							Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available. 
							
						 
						
							2014-12-24 20:54:56 +00:00  
				
					
						
							
							
								 
						
							
								afbe727b17 
								
							 
						 
						
							
							
								
								Don't allow user to register domain only jids  
							
							
							
						 
						
							2014-12-23 17:35:36 -05:00  
				
					
						
							
							
								 
						
							
								8a467e33dd 
								
							 
						 
						
							
							
								
								Don't show menu on create account screen  
							
							
							
						 
						
							2014-12-23 17:12:52 -05:00  
				
					
						
							
							
								 
						
							
								d454788011 
								
							 
						 
						
							
							
								
								Remove old JID validator  
							
							
							
						 
						
							2014-12-23 13:23:13 -05:00  
				
					
						
							
							
								 
						
							
								01107e31ae 
								
							 
						 
						
							
							
								
								Add more server compatibility info.  
							
							... 
							
							
							
							Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
							
						 
						
							2014-12-23 12:44:30 -05:00  
				
					
						
							
							
								 
						
							
								e1cb72b9ef 
								
							 
						 
						
							
							
								
								Fix NPEs in blocking code  
							
							
							
						 
						
							2014-12-22 11:24:08 -05:00  
				
					
						
							
							
								 
						
							
								af7a64491f 
								
							 
						 
						
							
							
								
								Add support for XEP-0191 (Blocking command)  
							
							... 
							
							
							
							Fixes  #791 
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 
						
							2014-12-22 08:19:00 -05:00  
				
					
						
							
							
								 
						
							
								88f43643bf 
								
							 
						 
						
							
							
								
								inject ui callback into running mam query  
							
							
							
						 
						
							2014-12-20 12:52:08 +01:00  
				
					
						
							
							
								 
						
							
								f00e168752 
								
							 
						 
						
							
							
								
								clean up conversation history after swtiching to a different conversation  
							
							
							
						 
						
							2014-12-17 21:05:47 +01:00  
				
					
						
							
							
								 
						
							
								de952cc959 
								
							 
						 
						
							
							
								
								show error if jid couldn't be parsed in new contact dialog  
							
							
							
						 
						
							2014-12-17 21:04:54 +01:00  
				
					
						
							
							
								 
						
							
								c30108eb17 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2014-12-17 10:51:28 +01:00  
				
					
						
							
							
								 
						
							
								741a0c129d 
								
							 
						 
						
							
							
								
								made scroling smoother + bug fixes for history loading  
							
							
							
						 
						
							2014-12-17 10:50:51 +01:00  
				
					
						
							
							
								 
						
							
								80435eca5c 
								
							 
						 
						
							
							
								
								smoothed out scrolling a bit  
							
							
							
						 
						
							2014-12-17 09:32:51 +01:00  
				
					
						
							
							
								 
						
							
								5603440a91 
								
							 
						 
						
							
							
								
								Merge pull request  #783  from SamWhited/quiet-hours  
							
							... 
							
							
							
							Update summary in TimePreference change listener 
							
						 
						
							2014-12-17 07:15:31 +01:00  
				
					
						
							
							
								 
						
							
								1a7ed4ed7c 
								
							 
						 
						
							
							
								
								properly detect images in share with  
							
							
							
						 
						
							2014-12-17 07:12:38 +01:00  
				
					
						
							
							
								 
						
							
								6659339eff 
								
							 
						 
						
							
							
								
								Allow sending of any filetype via intent  
							
							... 
							
							
							
							Fixes  #756  
						
							2014-12-15 22:31:55 -05:00  
				
					
						
							
							
								 
						
							
								f9c783085d 
								
							 
						 
						
							
							
								
								Update summary in TimePreference change listener  
							
							... 
							
							
							
							Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener. 
							
						 
						
							2014-12-15 17:46:32 -05:00  
				
					
						
							
							
								 
						
							
								e2f50ab855 
								
							 
						 
						
							
							
								
								go through mam history page by page. load mam dynamically on scroll  
							
							
							
						 
						
							2014-12-15 23:06:29 +01:00  
				
					
						
							
							
								 
						
							
								25d8546ae8 
								
							 
						 
						
							
							
								
								Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
							
							
							
						 
						
							2014-12-15 17:16:49 +01:00  
				
					
						
							
							
								 
						
							
								2bd4621245 
								
							 
						 
						
							
							
								
								fixed history deletion.  fixed   #780  
							
							
							
						 
						
							2014-12-15 17:14:27 +01:00  
				
					
						
							
							
								 
						
							
								209e62d68b 
								
							 
						 
						
							
							
								
								avoid npe on weird platform bugs  
							
							
							
						 
						
							2014-12-15 16:55:38 +01:00  
				
					
						
							
							
								 
						
							
								a6d4b0aec5 
								
							 
						 
						
							
							
								
								Add quiet hours feature  
							
							
							
						 
						
							2014-12-14 15:07:41 -05:00  
				
					
						
							
							
								 
						
							
								de06cb38d1 
								
							 
						 
						
							
							
								
								refactored the way certain messages are being found within a conversation  
							
							
							
						 
						
							2014-12-14 18:10:46 +01:00  
				
					
						
							
							
								 
						
							
								05d1f46c15 
								
							 
						 
						
							
							
								
								recreate activity after theme has changed.  fixed   #764  
							
							
							
						 
						
							2014-12-09 20:22:21 +01:00  
				
					
						
							
							
								 
						
							
								78370094e9 
								
							 
						 
						
							
							
								
								cleanup: removed unused emoticon parsing  
							
							
							
						 
						
							2014-12-09 14:21:35 +01:00  
				
					
						
							
							
								 
						
							
								490f40b196 
								
							 
						 
						
							
							
								
								possible work around for some weird - possibly sdk - bugs  
							
							
							
						 
						
							2014-12-07 21:14:13 +01:00  
				
					
						
							
							
								 
						
							
								a38005ec89 
								
							 
						 
						
							
							
								
								fixed   #544  
							
							
							
						 
						
							2014-12-03 12:33:32 +01:00  
				
					
						
							
							
								 
						
							
								685f405154 
								
							 
						 
						
							
							
								
								display proper error in edit account details if jid is invalid  
							
							
							
						 
						
							2014-12-03 10:52:55 +01:00  
				
					
						
							
							
								 
						
							
								8f62d95e1f 
								
							 
						 
						
							
							
								
								further npe checks  
							
							
							
						 
						
							2014-12-03 10:45:47 +01:00  
				
					
						
							
							
								 
						
							
								aaeba697bd 
								
							 
						 
						
							
							
								
								refactored the message adapter a bit  
							
							
							
						 
						
							2014-12-03 10:35:30 +01:00  
				
					
						
							
							
								 
						
							
								be358b77d6 
								
							 
						 
						
							
							
								
								set nick and autojoin=true for new bookmarks  
							
							
							
						 
						
							2014-12-03 10:34:05 +01:00  
				
					
						
							
							
								 
						
							
								46b2760069 
								
							 
						 
						
							
							
								
								worked around concurrent modification exception  
							
							
							
						 
						
							2014-12-03 00:54:07 +01:00  
				
					
						
							
							
								 
						
							
								9dd445a507 
								
							 
						 
						
							
							
								
								fixed   #728  
							
							
							
						 
						
							2014-12-01 12:33:57 +01:00  
				
					
						
							
							
								 
						
							
								8d306ac64f 
								
							 
						 
						
							
							
								
								clear encrypted messages on reinit  
							
							
							
						 
						
							2014-12-01 11:18:55 +01:00  
				
					
						
							
							
								 
						
							
								57fd763066 
								
							 
						 
						
							
							
								
								don't request fragment before updating  
							
							
							
						 
						
							2014-11-30 22:27:11 +01:00  
				
					
						
							
							
								 
						
							
								afc673bb15 
								
							 
						 
						
							
							
								
								Misc. "fixes" to correct warnings.  
							
							
							
						 
						
							2014-11-29 07:50:59 -05:00  
				
					
						
							
							
								 
						
							
								7ba41c6a8e 
								
							 
						 
						
							
							
								
								fixed npe.  fixed   #717  
							
							
							
						 
						
							2014-11-27 10:30:06 +01:00  
				
					
						
							
							
								 
						
							
								2f02d8d398 
								
							 
						 
						
							
							
								
								create conversation with bare jid  
							
							
							
						 
						
							2014-11-27 10:26:53 +01:00  
				
					
						
							
							
								 
						
							
								7a75a8bc5a 
								
							 
						 
						
							
							
								
								Merge pull request  #713  from betheg/muc  
							
							... 
							
							
							
							MUC: do not add yourself to the muc user list. 
							
						 
						
							2014-11-24 11:53:28 +01:00  
				
					
						
							
							
								 
						
							
								31b539daf7 
								
							 
						 
						
							
							
								
								MUC: option to set/delete bookmark in conference details.  
							
							
							
						 
						
							2014-11-23 21:37:45 +01:00