4b0043ba91 
								
							 
						 
						
							
							
								
								fixed potential NPEs in ShareWithActivity  
							
							
							
						 
						
							2015-01-06 18:25:31 +01:00  
				
					
						
							
							
								 
						
							
								352af145f8 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							... 
							
							
							
							char ">" was missing at line 285 
							
						 
						
							2015-01-06 01:23:51 +01:00  
				
					
						
							
							
								 
						
							
								f8758b7bd5 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							... 
							
							
							
							French translation updated 
							
						 
						
							2015-01-05 23:42:37 +01:00  
				
					
						
							
							
								 
						
							
								777e060100 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2015-01-05 18:47:04 +01:00  
				
					
						
							
							
								 
						
							
								fdcbdfdc05 
								
							 
						 
						
							
							
								
								added debug info + possible platform bug work arounds to message adapter  
							
							
							
						 
						
							2015-01-05 18:46:42 +01:00  
				
					
						
							
							
								 
						
							
								0c51245ff5 
								
							 
						 
						
							
							
								
								reworked ping scheduling strategy. very experimental  
							
							
							
						 
						
							2015-01-05 18:45:39 +01:00  
				
					
						
							
							
								 
						
							
								85f24c9106 
								
							 
						 
						
							
							
								
								avoid requesting blocklist after stream resumption  
							
							
							
						 
						
							2015-01-05 16:17:05 +01:00  
				
					
						
							
							
								 
						
							
								f2cc70c58c 
								
							 
						 
						
							
							
								
								Merge pull request  #840  from kriztan/patch-1  
							
							... 
							
							
							
							corrected German spellings 
							
						 
						
							2015-01-05 16:09:25 +01:00  
				
					
						
							
							
								 
						
							
								47a8a39595 
								
							 
						 
						
							
							
								
								corrected German spellings  
							
							... 
							
							
							
							and shorten some strings 
							
						 
						
							2015-01-05 15:59:21 +01:00  
				
					
						
							
							
								 
						
							
								2679824770 
								
							 
						 
						
							
							
								
								prevent QR code parser from crashing  fixed   #839  
							
							
							
						 
						
							2015-01-05 15:08:13 +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  
				
					
						
							
							
								 
						
							
								8264474a0c 
								
							 
						 
						
							
							
								
								Merge pull request  #838  from shtrom/pebble-notifications-squash  
							
							... 
							
							
							
							Send notification to Pebble on new message 
							
						 
						
							2015-01-05 13:14:48 +01:00  
				
					
						
							
							
								 
						
							
								f1ebece866 
								
							 
						 
						
							
							
								
								Send notification to Pebble on new message  
							
							... 
							
							
							
							This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net> 
							
						 
						
							2015-01-05 23:06:46 +11:00  
				
					
						
							
							
								 
						
							
								07dc1627df 
								
							 
						 
						
							
							
								
								Merge pull request  #836  from kriztan/development  
							
							... 
							
							
							
							Updated languages ... 
							
						 
						
							2015-01-05 13:05:25 +01:00  
				
					
						
							
							
								 
						
							
								ddee804a01 
								
							 
						 
						
							
							
								
								Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB  
							
							
							
						 
						
							2015-01-05 12:46:13 +01:00  
				
					
						
							
							
								 
						
							
								2723c9ccb9 
								
							 
						 
						
							
							
								
								made checks for valid image extensions case insensitive  
							
							
							
						 
						
							2015-01-04 23:04:23 +01:00  
				
					
						
							
							
								 
						
							
								3522243835 
								
							 
						 
						
							
							
								
								do not run mam queries in findOrCreateConversation() when isn't available  
							
							
							
						 
						
							2015-01-04 18:16:55 +01:00  
				
					
						
							
							
								 
						
							
								e6cd92a663 
								
							 
						 
						
							
							
								
								added higher auto accept file sizes  
							
							... 
							
							
							
							also changed labeling to MiB and KiB 
							
						 
						
							2015-01-04 17:53:06 +01:00  
				
					
						
							
							
								 
						
							
								d7ac9b88cf 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2015-01-04 17:23:51 +01:00  
				
					
						
							
							
								 
						
							
								0c804af1bc 
								
							 
						 
						
							
							
								
								added travis build icon to README  
							
							
							
						 
						
							2015-01-04 17:23:34 +01:00  
				
					
						
							
							
								 
						
							
								4f34a8f73f 
								
							 
						 
						
							
							
								
								Merge pull request  #833  from SamWhited/travis  
							
							... 
							
							
							
							Add travis config 
							
						 
						
							2015-01-04 17:13:42 +01:00  
				
					
						
							
							
								 
						
							
								92f4b7161b 
								
							 
						 
						
							
							
								
								Add travis config  
							
							
							
						 
						
							2015-01-04 10:43:15 -05:00  
				
					
						
							
							
								 
						
							
								0d6d09b7e9 
								
							 
						 
						
							
							
								
								code cleanup + logging of spoofed iq packets  
							
							
							
						 
						
							2015-01-04 15:40:09 +01:00  
				
					
						
							
							
								 
						
							
								d64496eab6 
								
							 
						 
						
							
							
								
								Merge pull request  #823  from SamWhited/issue20  
							
							... 
							
							
							
							Verify IQ responses 
							
						 
						
							2015-01-04 15:05:24 +01:00  
				
					
						
							
							
								 
						
							
								88704ce5cd 
								
							 
						 
						
							
							
								
								Verify IQ responses  
							
							... 
							
							
							
							Fixes  #20 
Move fromServer/toServer to AbstractStanza 
						
							2015-01-04 08:28:13 -05:00  
				
					
						
							
							
								 
						
							
								eb7e683403 
								
							 
						 
						
							
							
								
								Make IqPacket type an enum  
							
							
							
						 
						
							2015-01-04 08:20:30 -05:00  
				
					
						
							
							
								 
						
							
								00fdac42a9 
								
							 
						 
						
							
							
								
								Merge pull request  #832  from svetlemodry/development  
							
							... 
							
							
							
							Czech translation update 
							
						 
						
							2015-01-04 12:45:48 +01:00  
				
					
						
							
							
								 
						
							
								3a4fbcd4cc 
								
							 
						 
						
							
							
								
								Czech translation update  
							
							
							
						 
						
							2015-01-04 12:43:32 +01:00  
				
					
						
							
							
								 
						
							
								5c190487bc 
								
							 
						 
						
							
							
								
								deal with prosodys muc namespace tagging of messages  
							
							
							
						 
						
							2015-01-04 12:37:22 +01:00  
				
					
						
							
							
								 
						
							
								e32a927300 
								
							 
						 
						
							
							
								
								Use packet callbacks only for IqPackets. Removed unnecessary code  
							
							
							
						 
						
							2015-01-04 12:09:39 +01:00  
				
					
						
							
							
								 
						
							
								51f5b84ee4 
								
							 
						 
						
							
							
								
								Merge pull request  #829  from kriztan/patch-1  
							
							... 
							
							
							
							corrected German 'private_message_to' 
							
						 
						
							2015-01-04 11:28:38 +01:00  
				
					
						
							
							
								 
						
							
								404b8e103e 
								
							 
						 
						
							
							
								
								Merge pull request  #830  from kruks23/translation4  
							
							... 
							
							
							
							Update spanish translations 
							
						 
						
							2015-01-04 11:28:31 +01:00  
				
					
						
							
							
								 
						
							
								c674e9c3e9 
								
							 
						 
						
							
							
								
								Update spanish translations  
							
							
							
						 
						
							2015-01-04 11:24:53 +01:00  
				
					
						
							
							
								 
						
							
								b739a0d200 
								
							 
						 
						
							
							
								
								corrected German 'private_message_to'  
							
							
							
						 
						
							2015-01-04 11:16:21 +01:00  
				
					
						
							
							
								 
						
							
								f338d89753 
								
							 
						 
						
							
							
								
								no longer use ConcurrentHashMap in favor of synchronize on a final HashMap  
							
							
							
						 
						
							2015-01-04 00:14:40 +01:00  
				
					
						
							
							
								 
						
							
								4f4eff2353 
								
							 
						 
						
							
							
								
								Merge branch 'development'  
							
							
							
						 
						
							2015-01-03 22:39:50 +01:00  
				
					
						
							
							
								 
						
							
								03508eab9a 
								
							 
						 
						
							
							
								
								Merge pull request  #827  from kriztan/patch-2  
							
							... 
							
							
							
							Added and modified German translations 
							
						 
						
							2015-01-03 22:39:17 +01:00  
				
					
						
							
							
								 
						
							
								58b7e71e58 
								
							 
						 
						
							
							
								
								Added and modified German translations  
							
							
							
						 
						
							2015-01-03 19:35:58 +01:00  
				
					
						
							
							
								 
						
							
								e89e54a04a 
								
							 
						 
						
							
							
								
								version bump to 0.10  
							
							
							
						 
						
							2015-01-03 19:11:27 +01:00  
				
					
						
							
							
								 
						
							
								fc8bd64bfd 
								
							 
						 
						
							
							
								
								void messages getting reloaded through mam after clear history  
							
							
							
						 
						
							2015-01-03 18:22:26 +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  
				
					
						
							
							
								 
						
							
								521c289db1 
								
							 
						 
						
							
							
								
								update last presence only for messages  
							
							
							
						 
						
							2015-01-03 13:01:38 +01:00  
				
					
						
							
							
								 
						
							
								715c8545f4 
								
							 
						 
						
							
							
								
								added missing layout file  
							
							
							
						 
						
							2015-01-03 10:35:12 +01:00  
				
					
						
							
							
								 
						
							
								8bda54d48c 
								
							 
						 
						
							
							
								
								code cleanup  
							
							
							
						 
						
							2015-01-03 00:47:22 +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  
				
					
						
							
							
								 
						
							
								093c5275c6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/development' into development  
							
							
							
						 
						
							2015-01-02 14:28:02 +01:00  
				
					
						
							
							
								 
						
							
								3df23a4f75 
								
							 
						 
						
							
							
								
								allow cancellation of waiting files  
							
							
							
						 
						
							2015-01-02 14:27:49 +01:00