Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	6fbb02fb93  
						 
						
							
							
								
								
								RINO 2 based on php-encryption  
							
							... 
							
							
							
							reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes. 
							
						 
						
							2015-06-23 16:13:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	2ad8fdc40b  
						 
						
							
							
								
								
								port of red matrix datepicker implementation  
							
							
							
						 
						
							2015-05-22 18:53:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									thorsten23 
								
							 
						 
						
							
							
								
							
							
	a665ebafa4  
						 
						
							
							
								
								
								Replaced 'q' by 'pagename' so that the basestring is encoded right. The correct basestring is needed to create the right signature in the OAuth authentication process.  
							
							
							
						 
						
							2015-03-14 19:55:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	59fa1c9453  
						 
						
							
							
								
								
								New version of the library for the detection of mobiles.  
							
							
							
						 
						
							2015-02-24 11:26:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d4b0a9ea2a  
						 
						
							
							
								
								
								Solving parsing problems with the markdown library and html elements.  
							
							
							
						 
						
							2015-02-24 10:21:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e0d3594933  
						 
						
							
							
								
								
								Added the markdown parser to the time measurement system  
							
							
							
						 
						
							2015-02-24 00:08:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	884b8b03db  
						 
						
							
							
								
								
								Cleaned up the Markdown files.  
							
							
							
						 
						
							2015-02-23 12:47:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b710c8bbfd  
						 
						
							
							
								
								
								Tests with new markdown library  
							
							
							
						 
						
							2015-02-23 08:27:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	70615d7f78  
						 
						
							
							
								
								
								New versions.  
							
							
							
						 
						
							2015-02-22 20:26:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4a6a6ca937  
						 
						
							
							
								
								
								Bugfix for spaces in links  
							
							
							
						 
						
							2015-02-22 20:06:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2f46675a89  
						 
						
							
							
								
								
								New routines for markdown to html and html to markdown.  
							
							
							
						 
						
							2015-02-22 17:38:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a86c143e24  
						 
						
							
							
								
								
								The "scrape" bugfix lead to partly damaged encodings. This is fixed now.  
							
							
							
						 
						
							2015-01-04 11:56:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	04106ff6f5  
						 
						
							
							
								
								
								Moving the clean up code to a central place.  
							
							
							
						 
						
							2014-12-08 22:37:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									hauke 
								
							 
						 
						
							
							
								
							
							
	baabb5ba8b  
						 
						
							
							
								
								
								removed fancybox as it is not used anywhere  
							
							
							
						 
						
							2014-09-07 14:54:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									hauke 
								
							 
						 
						
							
							
								
							
							
	bc8df42dcc  
						 
						
							
							
								
								
								update of fullcalender to v1.6.4  
							
							
							
						 
						
							2014-09-07 14:31:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									hauke 
								
							 
						 
						
							
							
								
							
							
	0e1f8f6486  
						 
						
							
							
								
								
								reverting tinymce changes, updating smarty to 3.1.19  
							
							
							
						 
						
							2014-09-07 13:38:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									hauke 
								
							 
						 
						
							
							
								
							
							
	386eadde3a  
						 
						
							
							
								
								
								updated tinymce to 3.5.11  
							
							
							
						 
						
							2014-09-07 12:51:05 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									hauke 
								
							 
						 
						
							
							
								
							
							
	87fa2ee2af  
						 
						
							
							
								
								
								updated jquery to version 1.11, updated themes frost and diabook where necessary  
							
							
							
						 
						
							2014-09-06 16:21:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e2f9ae3970  
						 
						
							
							
								
								
								Removing of some warnings  
							
							
							
						 
						
							2014-07-24 22:53:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	405dd794fe  
						 
						
							
							
								
								
								New database system that uses PDO if present/Test script for doing database upgrades.  
							
							
							
						 
						
							2014-04-28 23:55:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	aed28a24f1  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							... 
							
							
							
							Conflicts:
	mod/crepair.php 
							
						 
						
							2014-01-05 16:22:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7770317f1e  
						 
						
							
							
								
								
								Preparations for a more visible reshare when exporting to twitter, statusnet or facebook.  
							
							... 
							
							
							
							The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt. 
							
						 
						
							2013-07-28 20:38:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	127b7a589e  
						 
						
							
							
								
								
								eliminate Cropper conflicts with jQuery  
							
							
							
						 
						
							2013-06-01 10:42:51 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	35358baac9  
						 
						
							
							
								
								
								update to v4.0.0; point to local host of SWF  
							
							
							
						 
						
							2013-05-11 10:55:09 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	fec4581f34  
						 
						
							
							
								
								
								basic video playback support using VideoJS  
							
							
							
						 
						
							2013-05-03 18:17:56 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Carsten Pfeiffer 
								
							 
						 
						
							
							
								
							
							
	7e5ec9fceb  
						 
						
							
							
								
								
								Wrap class OAuthException with !class_exists  
							
							... 
							
							
							
							Same problem and solution as discussed on
https://drupal.org/node/1334528  
							
						 
						
							2013-04-27 21:08:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	86eec2e0fa  
						 
						
							
							
								
								
								Twitter API 1.1  
							
							
							
						 
						
							2013-03-05 03:48:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Olaf Conradi 
								
							 
						 
						
							
							
								
							
							
	77f4a36d90  
						 
						
							
							
								
								
								Ignore invalid tokens when scraping an URL  
							
							
							
						 
						
							2013-03-03 21:41:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	0e67ba2bd4  
						 
						
							
							
								
								
								update minified javascripts  
							
							
							
						 
						
							2013-02-04 18:16:13 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	bde68bd8ca  
						 
						
							
							
								
								
								add colorbox  
							
							
							
						 
						
							2013-02-04 18:09:57 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	e0dd8944ce  
						 
						
							
							
								
								
								some deleted files for tinymce update  
							
							
							
						 
						
							2013-01-27 17:34:10 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	d39a2e8a9d  
						 
						
							
							
								
								
								TinyMCE 3.5.8 update; some fixes  
							
							
							
						 
						
							2013-01-27 14:26:43 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	a875bec75c  
						 
						
							
							
								
								
								update fancybox, remove tiptip from head.tpl  
							
							
							
						 
						
							2013-01-22 08:17:23 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	891bfd9f91  
						 
						
							
							
								
								
								further jenkins include fixes  
							
							
							
						 
						
							2012-11-22 05:09:28 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Domovoy 
								
							 
						 
						
							
							
								
							
							
	a31c779a15  
						 
						
							
							
								
								
								Transform prefixed elements to classic ones  
							
							
							
						 
						
							2012-09-14 07:59:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Domovoy 
								
							 
						 
						
							
							
								
							
							
	09413a0f0a  
						 
						
							
							
								
								
								Better integration with the existing code  
							
							
							
						 
						
							2012-09-14 05:50:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Domovoy 
								
							 
						 
						
							
							
								
							
							
	f9a9b70123  
						 
						
							
							
								
								
								Detect the namespace uri from token name  
							
							
							
						 
						
							2012-09-14 05:30:21 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	1f09e7ad23  
						 
						
							
							
								
								
								Modify Javascript to improve page loading times  
							
							... 
							
							
							
							1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files
Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious. 
							
						 
						
							2012-07-28 09:57:16 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	5cb979f5e4  
						 
						
							
							
								
								
								changes to support a mobile theme  
							
							
							
						 
						
							2012-07-23 20:37:00 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	5589bca1e0  
						 
						
							
							
								
								
								fix !@#$ tinymce linebreaks for the thousandth time  
							
							
							
						 
						
							2012-07-04 17:15:43 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	fd626022ec  
						 
						
							
							
								
								
								add smarty engine, remove some obsolete zot1 stuff  
							
							
							
						 
						
							2012-07-03 22:23:08 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	f0db196288  
						 
						
							
							
								
								
								iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources  
							
							
							
						 
						
							2012-06-20 05:04:51 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	e39014a3a7  
						 
						
							
							
								
								
								update tinymce to 3.5.0.1  
							
							
							
						 
						
							2012-05-15 17:18:46 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	62727012d3  
						 
						
							
							
								
								
								language detection library  
							
							
							
						 
						
							2012-05-12 01:55:18 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	547007e199  
						 
						
							
							
								
								
								add photos to PM autocomplete, improved appearance  
							
							
							
						 
						
							2012-05-10 19:29:01 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	851264161f  
						 
						
							
							
								
								
								mail autcomplete testing  
							
							
							
						 
						
							2012-05-06 19:55:39 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	63ea378d92  
						 
						
							
							
								
								
								document tinymce fixes/workarounds  
							
							
							
						 
						
							2012-04-01 04:13:27 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	03b95c9a09  
						 
						
							
							
								
								
								translate br with extra elements  
							
							
							
						 
						
							2012-03-26 16:56:44 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	86d8d3f442  
						 
						
							
							
								
								
								private file in repository  
							
							
							
						 
						
							2012-03-21 00:34:12 -07:00