iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							97b52abaf9
							
						
					 | 
					
						
						
							
							fixed #410 by removing that config option
						
						
						
						
						
					 | 
					
						2014-09-02 16:00:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ae852a633
							
						
					 | 
					
						
						
							
							refactored share with activity
						
						
						
						
						
					 | 
					
						2014-09-02 15:51:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c9b2e6bf8
							
						
					 | 
					
						
						
							
							fixed #406
						
						
						
						
						
					 | 
					
						2014-09-02 11:27:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							f888b167c6
							
						
					 | 
					
						
						
							
							rotate avatars
						
						
						
						
						
					 | 
					
						2014-09-02 11:19:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6045bcc2eb
							
						
					 | 
					
						
						
							
							Merge pull request #408 from emdete/unicode_emoticons
						
						
						
						
						
						
						
						add all whitespaces in regex 
						
					 | 
					
						2014-09-02 10:39:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								M. Dietrich
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7b3aa343e
							
						
					 | 
					
						
						
							
							add all whitespaces in regex
						
						
						
						
						
					 | 
					
						2014-09-02 01:18:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6291ebf1a3
							
						
					 | 
					
						
						
							
							Merge pull request #380 from emdete/unicode_emoticons
						
						
						
						
						
						
						
						add translation from ascii to unicode emoticons 
						
					 | 
					
						2014-09-01 23:58:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								M. Dietrich
							
						 
					 | 
					
						
						
						
						
							
						
						
							546082147a
							
						
					 | 
					
						
						
							
							transform ascii to emoticons (on display only)
						
						
						
						
						
					 | 
					
						2014-09-01 23:48:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7881754f5
							
						
					 | 
					
						
						
							
							fixed #403
						
						
						
						
						
					 | 
					
						2014-09-01 13:51:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								M. Dietrich
							
						 
					 | 
					
						
						
						
						
							
						
						
							2acf510ea9
							
						
					 | 
					
						
						
							
							optimize string operations a bit
						
						
						
						
						
					 | 
					
						2014-09-01 10:40:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							3558fa5f5b
							
						
					 | 
					
						
						
							
							deleted unnecessary log
						
						
						
						
						
					 | 
					
						2014-08-31 21:02:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							94389ac22a
							
						
					 | 
					
						
						
							
							show merged time and status in message adapter
						
						
						
						
						
					 | 
					
						2014-08-31 18:55:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							bda7724e31
							
						
					 | 
					
						
						
							
							improvements for merge conditions
						
						
						
						
						
					 | 
					
						2014-08-31 18:21:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							28fa48704d
							
						
					 | 
					
						
						
							
							add missing blank before nick
						
						
						
						
						
					 | 
					
						2014-08-31 17:48:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bahtiar `kalkin-` Gadimov
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e3451bcff
							
						
					 | 
					
						
						
							
							Smarter nickname highlight insert in confernces
						
						
						
						
						
					 | 
					
						2014-08-31 17:24:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ac5be4855
							
						
					 | 
					
						
						
							
							some code cleanup
						
						
						
						
						
					 | 
					
						2014-08-31 16:28:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d456085e5
							
						
					 | 
					
						
						
							
							Merge pull request #391 from betheg/fix_typo
						
						
						
						
						
						
						
						fix forgotten spelling. 
						
					 | 
					
						2014-08-31 15:56:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							1cc16161ef
							
						
					 | 
					
						
						
							
							require encrypted to be the same for messages to get merged
						
						
						
						
						
					 | 
					
						2014-08-31 15:54:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f8d4e320d
							
						
					 | 
					
						
						
							
							experimental message merging
						
						
						
						
						
					 | 
					
						2014-08-31 14:29:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael
							
						 
					 | 
					
						
						
						
						
							
						
						
							969cba5ee6
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into fix_typo
						
						
						
						
						
					 | 
					
						2014-08-30 14:00:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							c494f4f7ae
							
						
					 | 
					
						
						
							
							Merge branch 'sm' into development
						
						
						
						
						
						
						
						Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java 
						
					 | 
					
						2014-08-30 09:24:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4435b0055e
							
						
					 | 
					
						
						
							
							reset unsend messages to waiting
						
						
						
						
						
					 | 
					
						2014-08-30 09:22:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							9075d3854d
							
						
					 | 
					
						
						
							
							properly set stanza count on session resume
						
						
						
						
						
					 | 
					
						2014-08-30 09:22:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a6a6c8403
							
						
					 | 
					
						
						
							
							basic message acking
						
						
						
						
						
					 | 
					
						2014-08-30 09:22:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							9de77b190b
							
						
					 | 
					
						
						
							
							proper namespaces for xep-0352
						
						
						
						
						
					 | 
					
						2014-08-30 09:22:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d82a69ba3
							
						
					 | 
					
						
						
							
							send inactive or active on every connect and resume
						
						
						
						
						
					 | 
					
						2014-08-30 09:22:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							265bd06250
							
						
					 | 
					
						
						
							
							added basic csi
						
						
						
						
						
					 | 
					
						2014-08-30 09:22:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ad5c6925d
							
						
					 | 
					
						
						
							
							version bump to 0.6 with changelogs
						
						
						
						
						
					 | 
					
						2014-08-30 08:51:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							8840d082ba
							
						
					 | 
					
						
						
							
							brought npe catcher back for kxml parser
						
						
						
						
						
					 | 
					
						2014-08-30 08:31:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael
							
						 
					 | 
					
						
						
						
						
							
						
						
							3714947d5f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into fix_typo
						
						
						
						
						
					 | 
					
						2014-08-29 23:30:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							5450a2ae46
							
						
					 | 
					
						
						
							
							fixed link to old resource
						
						
						
						
						
					 | 
					
						2014-08-29 14:05:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0d777d9ca
							
						
					 | 
					
						
						
							
							fixed npe
						
						
						
						
						
					 | 
					
						2014-08-29 12:14:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							33172246c9
							
						
					 | 
					
						
						
							
							fixed #389
						
						
						
						
						
					 | 
					
						2014-08-29 10:24:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael
							
						 
					 | 
					
						
						
						
						
							
						
						
							98dabe9ab4
							
						
					 | 
					
						
						
							
							fix forgotten spelling.
						
						
						
						
						
					 | 
					
						2014-08-28 16:49:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							85b31b8d8b
							
						
					 | 
					
						
						
							
							fixed spelling thanks @betheg
						
						
						
						
						
					 | 
					
						2014-08-28 11:01:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							431d4ed44b
							
						
					 | 
					
						
						
							
							translated missing string in settings
						
						
						
						
						
					 | 
					
						2014-08-27 09:43:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							450b911cb2
							
						
					 | 
					
						
						
							
							fixing duplicate private muc messages
						
						
						
						
						
					 | 
					
						2014-08-25 19:20:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							07b422d4c8
							
						
					 | 
					
						
						
							
							fixed message hint
						
						
						
						
						
					 | 
					
						2014-08-25 15:43:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e791c8a01
							
						
					 | 
					
						
						
							
							fixed faulty db creation on first install
						
						
						
						
						
					 | 
					
						2014-08-24 20:53:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a30bc8a3e2
							
						
					 | 
					
						
						
							
							use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint
						
						
						
						
						
					 | 
					
						2014-08-24 11:21:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0b759340d
							
						
					 | 
					
						
						
							
							jump right into edit account if now accounts are configured
						
						
						
						
						
					 | 
					
						2014-08-23 21:31:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d504daec16
							
						
					 | 
					
						
						
							
							changed workflow on inital avatar publication
						
						
						
						
						
					 | 
					
						2014-08-23 20:00:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7437ecc36
							
						
					 | 
					
						
						
							
							experimental muc message deduplication
						
						
						
						
						
					 | 
					
						2014-08-23 15:57:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee9872277d
							
						
					 | 
					
						
						
							
							removed server compat value in favor of a (small xep list)
						
						
						
						
						
					 | 
					
						2014-08-23 15:56:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b0bf9b5bc
							
						
					 | 
					
						
						
							
							fixed another npe
						
						
						
						
						
					 | 
					
						2014-08-22 13:22:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							c40c8ee910
							
						
					 | 
					
						
						
							
							tiny redesign for private muc messages
						
						
						
						
						
					 | 
					
						2014-08-22 13:22:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4875b52f09
							
						
					 | 
					
						
						
							
							make avatars persisent / available even without internet
						
						
						
						
						
					 | 
					
						2014-08-21 12:32:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							301477c764
							
						
					 | 
					
						
						
							
							save newly taken photos in DCIM dir
						
						
						
						
						
					 | 
					
						2014-08-21 09:19:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							7808e5b77f
							
						
					 | 
					
						
						
							
							added roster versioning to calculation of server compat
						
						
						
						
						
					 | 
					
						2014-08-21 07:47:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f5456e41b
							
						
					 | 
					
						
						
							
							check if service is bound before adding conferences or contacts
						
						
						
						
						
					 | 
					
						2014-08-21 07:46:55 +02:00 | 
					
					
						
						
							
							
							
						
					 |