rabuzarus 
								
							 
						 
						
							
							
								
							
							
	ec4e60ce3a  
						 
						
							
							
								
								
								style the photo album page of the vier theme  
							
							
							
						 
						
							2017-01-30 15:00:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	dd36b2bded  
						 
						
							
							
								
								
								Merge pull request  #3128  from annando/bugfix-no-self-destroy  
							
							... 
							
							
							
							Bugfix: Sometimes the self contact seems to destroy itself 
							
						 
						
							2017-01-30 09:11:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	63e71ff297  
						 
						
							
							
								
								
								Merge pull request  #3127  from annando/bugfix-ssl-issues  
							
							... 
							
							
							
							Bugfix: The SSL policy setting was not respected 
							
						 
						
							2017-01-30 08:46:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0b04e0383c  
						 
						
							
							
								
								
								Merge pull request  #3132  from annando/1701-remove-duplicates  
							
							... 
							
							
							
							Adding unique indexes should now work with every MySQL flavour 
							
						 
						
							2017-01-30 08:40:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthew Exon 
								
							 
						 
						
							
							
								
							
							
	d99a96ef49  
						 
						
							
							
								
								
								Global is an integer, do not set it to an empty string  
							
							
							
						 
						
							2017-01-30 00:56:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7ca809a00e  
						 
						
							
							
								
								
								Addind unique indexes should now work with every MySQL flavour  
							
							
							
						 
						
							2017-01-29 17:31:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ac88471e55  
						 
						
							
							
								
								
								Make the code nicer  
							
							
							
						 
						
							2017-01-29 14:00:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c1eea3771f  
						 
						
							
							
								
								
								Bugfix: Sometimes the self contact seems to destroy itself  
							
							
							
						 
						
							2017-01-29 13:57:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ae849954cc  
						 
						
							
							
								
								
								Bugfix: The SSL policy setting was not respected  
							
							
							
						 
						
							2017-01-29 13:50:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	069dd5b75d  
						 
						
							
							
								
								
								Merge pull request  #3125  from annando/alternate-pr-3124  
							
							... 
							
							
							
							Alternate solution for pull request 3124 
							
						 
						
							2017-01-28 15:25:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	46ab87a303  
						 
						
							
							
								
								
								Typo fixed  
							
							
							
						 
						
							2017-01-28 13:38:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ea22828d37  
						 
						
							
							
								
								
								Alternate solution for pull request 3124  
							
							
							
						 
						
							2017-01-28 12:19:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8b2c995c3d  
						 
						
							
							
								
								
								Merge pull request  #3123  from tobiasd/20170128-nodbpwd  
							
							... 
							
							
							
							during installation inform user that pwd cannot be blank 
							
						 
						
							2017-01-28 11:25:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ffd934c78f  
						 
						
							
							
								
								
								Merge pull request  #3122  from tobiasd/20170128-allowedthemes  
							
							... 
							
							
							
							system -> allowed_themes was not set in htconfig template 
							
						 
						
							2017-01-28 11:25:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	af699940d4  
						 
						
							
							
								
								
								typo  
							
							
							
						 
						
							2017-01-28 11:20:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	703628cd01  
						 
						
							
							
								
								
								wording  
							
							
							
						 
						
							2017-01-28 11:12:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4b2f6138a4  
						 
						
							
							
								
								
								smoothly is also allowed  
							
							
							
						 
						
							2017-01-28 11:08:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	83607ff894  
						 
						
							
							
								
								
								enforce them, but inform the user about it  
							
							
							
						 
						
							2017-01-28 10:10:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	334bc7037a  
						 
						
							
							
								
								
								don't enfoce non-empty passwords during installation  
							
							
							
						 
						
							2017-01-28 10:02:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9259feec6f  
						 
						
							
							
								
								
								Merge pull request  #3121  from annando/1701-bugfix-config  
							
							... 
							
							
							
							Issue 3117: Can't store values that are only in the .htconfig.php 
							
						 
						
							2017-01-28 08:30:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d6e81117f9  
						 
						
							
							
								
								
								system -> allowed_themes was not set in htconfig template  
							
							
							
						 
						
							2017-01-28 08:26:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e031c01bb6  
						 
						
							
							
								
								
								some stuff done  
							
							
							
						 
						
							2017-01-28 07:55:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0179bc7f00  
						 
						
							
							
								
								
								Merge pull request  #3120  from tobiasd/20170128-editor  
							
							... 
							
							
							
							added editorconfig config file 
							
						 
						
							2017-01-28 07:34:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	05281a877b  
						 
						
							
							
								
								
								Merge pull request  #3072  from Hypolite/issue/#3062  
							
							... 
							
							
							
							Using placeholder attribute instead of hacky JS 
							
						 
						
							2017-01-28 07:32:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0b5ef73d4a  
						 
						
							
							
								
								
								Merge pull request  #3119  from annando/1701-bugfix-events  
							
							... 
							
							
							
							Bugfix: Avoid duplicated birthday events 
							
						 
						
							2017-01-28 07:29:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	32b997823f  
						 
						
							
							
								
								
								Don't forget the brackets  
							
							
							
						 
						
							2017-01-28 06:21:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	82086eea36  
						 
						
							
							
								
								
								Bugfix: When a value was only in the .htconfig.php then it never was stored  
							
							
							
						 
						
							2017-01-28 06:18:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0342f559c1  
						 
						
							
							
								
								
								added editorconfig config file  
							
							
							
						 
						
							2017-01-28 07:15:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	c38a5e443d  
						 
						
							
							
								
								
								Merge branch 'develop' into issue/#3062  
							
							... 
							
							
							
							* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...
# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js 
							
						 
						
							2017-01-27 15:30:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d61a4a67db  
						 
						
							
							
								
								
								Merge pull request  #3109  from Hypolite/issue/scrap-tinymce  
							
							... 
							
							
							
							Scrap TinyMCE 
							
						 
						
							2017-01-27 21:08:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5760cfeb94  
						 
						
							
							
								
								
								Added to-do  
							
							
							
						 
						
							2017-01-27 19:57:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	288ad37c3c  
						 
						
							
							
								
								
								Merge pull request  #3110  from tobiasd/20170127-translationdocs  
							
							... 
							
							
							
							translation docs now contain basic usage of the Transifex client 
							
						 
						
							2017-01-27 18:14:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	31617eddca  
						 
						
							
							
								
								
								Merge pull request  #3111  from tobiasd/20170127-lang  
							
							... 
							
							
							
							translation updates 
							
						 
						
							2017-01-27 18:13:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cb0600976d  
						 
						
							
							
								
								
								Bugfix: Avoid duplicated birthday events  
							
							
							
						 
						
							2017-01-27 17:04:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2a77e426f9  
						 
						
							
							
								
								
								Split poco discovery in smaller function calls  
							
							
							
						 
						
							2017-01-27 17:00:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	722b18ead7  
						 
						
							
							
								
								
								Merge pull request  #3096  from annando/1701-index-again  
							
							... 
							
							
							
							Some more index stuff 
							
						 
						
							2017-01-27 16:52:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	64d06b98b2  
						 
						
							
							
								
								
								Added documentation  
							
							
							
						 
						
							2017-01-27 15:13:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e5f0ba3407  
						 
						
							
							
								
								
								update to the translation  
							
							
							
						 
						
							2017-01-27 13:31:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4523753455  
						 
						
							
							
								
								
								update to the translations  
							
							
							
						 
						
							2017-01-27 13:31:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8f59833c51  
						 
						
							
							
								
								
								translation docs now contain basic usage of the Transifex client  
							
							
							
						 
						
							2017-01-27 12:39:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	bf6d235b26  
						 
						
							
							
								
								
								- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content  
							
							
							
						 
						
							2017-01-26 23:04:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	46fe6b1908  
						 
						
							
							
								
								
								- Remove misc TinyMCE mentions in docs and minifyjs  
							
							
							
						 
						
							2017-01-26 22:58:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	66482c1d9c  
						 
						
							
							
								
								
								- Remove $theme_richtext_editor boot var  
							
							... 
							
							
							
							- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter 
							
						 
						
							2017-01-26 22:57:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4ad6a7f073  
						 
						
							
							
								
								
								- Remove TinyMCE mentions in themes  
							
							
							
						 
						
							2017-01-26 22:54:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9d5384f107  
						 
						
							
							
								
								
								- Remove tinyMCE mentions or convert to addeditortext()  
							
							... 
							
							
							
							- Remove $editselect template value 
							
						 
						
							2017-01-26 22:50:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8c28e5fc5c  
						 
						
							
							
								
								
								typo  
							
							
							
						 
						
							2017-01-26 13:09:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b3c6409a06  
						 
						
							
							
								
								
								update to the changelog  
							
							
							
						 
						
							2017-01-26 11:12:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b17f032b6a  
						 
						
							
							
								
								
								Merge pull request  #3106  from rabuzarus/20170125_-_meta_description  
							
							... 
							
							
							
							limit the description of the meta tag to 160 characters in /mod/display 
							
						 
						
							2017-01-26 06:42:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	a2740d2034  
						 
						
							
							
								
								
								Remove tinyMCE libraries  
							
							
							
						 
						
							2017-01-25 16:04:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	cb37dfd0a1  
						 
						
							
							
								
								
								Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop  
							
							
							
						 
						
							2017-01-25 15:28:54 -05:00