friendica 
								
							 
						 
						
							
							
								
							
							
	bfc9cfb82f  
						 
						
							
							
								
								
								put tags in items  
							
							 
							
							
							
						 
						
							2013-06-26 04:02:04 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	5cdeef22ea  
						 
						
							
							
								
								
								pager: fix stupid typo  
							
							 
							
							
							
						 
						
							2013-06-19 14:28:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	faa510befc  
						 
						
							
							
								
								
								move html from paginate functions to template  
							
							 
							
							
							
						 
						
							2013-06-13 08:12:15 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2b09b8ae17  
						 
						
							
							
								
								
								make red# available as a smilie  
							
							 
							
							
							
						 
						
							2013-05-27 08:34:12 +02: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	d36292c532  
						 
						
							
							
								
								
								template: set smarty3 as default template engine in theme info array.  
							
							 
							
							... 
							
							
							
							remove commented code from get_markup_template.
add check for $root/$filename in get_template_file. 
							
						 
						
							2013-04-23 03:35:31 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	ddf1caf0fd  
						 
						
							
							
								
								
								template engine rework  
							
							 
							
							... 
							
							
							
							- use smarty3 as default engine
- new pluggable template engine system 
							
						 
						
							2013-04-23 03:27:52 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	1a8bdf8ae8  
						 
						
							
							
								
								
								more phpdocs  
							
							 
							
							
							
						 
						
							2013-03-27 10:28:56 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	a161b86d1f  
						 
						
							
							
								
								
								add phpdoc  
							
							 
							
							
							
						 
						
							2013-03-27 05:11:40 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	0187283709  
						 
						
							
							
								
								
								allow admin to prevent private image embedding on hub  
							
							 
							
							
							
						 
						
							2013-03-03 09:44:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	93143702ed  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php 
							
						 
						
							2013-02-17 12:35:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fermionic 
								
							 
						 
						
							
							
								
							
							
	a0e18a0ff8  
						 
						
							
							
								
								
								Merge pull request  #601  from fermionic/20130204-100-percent-CPU-usage-on-xmlify  
							
							 
							
							... 
							
							
							
							move mb_strlen call out of for loop definition 
							
						 
						
							2013-02-06 21:38:15 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	c886927a52  
						 
						
							
							
								
								
								use mb_ereg_replace for xmlify and unxmlify  
							
							 
							
							
							
						 
						
							2013-02-06 22:30:27 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	18f71c1050  
						 
						
							
							
								
								
								parsing multi-byte strings with xmlify  
							
							 
							
							
							
						 
						
							2013-02-06 00:37:15 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	774a78dbde  
						 
						
							
							
								
								
								better unicode support in xmlify  
							
							 
							
							
							
						 
						
							2013-02-05 23:02:13 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	6152cbd5ac  
						 
						
							
							
								
								
								add support for more file attachment types  
							
							 
							
							
							
						 
						
							2013-02-04 22:15:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	b6bc7daadf  
						 
						
							
							
								
								
								move mb_strlen call out of for loop definition  
							
							 
							
							
							
						 
						
							2013-02-04 20:17:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2cb576d305  
						 
						
							
							
								
								
								Bugfixing after adding timestamps  
							
							 
							
							
							
						 
						
							2013-01-27 13:57:44 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	fdee002f73  
						 
						
							
							
								
								
								Several improvements for performance measuring  
							
							 
							
							
							
						 
						
							2013-01-26 18:35:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael - piratica.eu 
								
							 
						 
						
							
							
								
							
							
	2c93067682  
						 
						
							
							
								
								
								Performance: Adding several variables for performance measuring.  
							
							 
							
							
							
						 
						
							2013-01-26 16:46:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4e3d0018c6  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	boot.php
	include/items.php
	update.php 
							
						 
						
							2013-01-20 14:07:57 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	82c00660e0  
						 
						
							
							
								
								
								Preloading of items in the cache when receiving them.  
							
							 
							
							
							
						 
						
							2013-01-17 23:20:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5501dd0759  
						 
						
							
							
								
								
								Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds.  
							
							 
							
							
							
						 
						
							2013-01-13 17:13:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8b643d4c88  
						 
						
							
							
								
								
								Merge pull request  #581  from fermionic/20130112-backport-red-smarty-improvements  
							
							 
							
							... 
							
							
							
							fixes and tweaks to Smarty processing 
							
						 
						
							2013-01-12 12:28:14 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	74caf1a4a7  
						 
						
							
							
								
								
								* Add MIME types for file attachments  
							
							 
							
							... 
							
							
							
							* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files 
							
						 
						
							2013-01-12 06:31:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	609c45e791  
						 
						
							
							
								
								
								fixes and tweaks to Smarty processing  
							
							 
							
							
							
						 
						
							2013-01-12 05:58:54 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	5f1ef732e0  
						 
						
							
							
								
								
								remove now-unnecessary line in text.php  
							
							 
							
							
							
						 
						
							2013-01-10 21:48:33 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	215a7f139c  
						 
						
							
							
								
								
								make smarty error reporting a bit less chatty  
							
							 
							
							
							
						 
						
							2012-12-30 00:29:07 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	e736abd372  
						 
						
							
							
								
								
								small fixes; update smarty3 templates  
							
							 
							
							
							
						 
						
							2012-12-25 12:05:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	11c06e21b7  
						 
						
							
							
								
								
								simplify by making Smarty include directives behave like Friendica native ones  
							
							 
							
							
							
						 
						
							2012-12-25 11:55:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	96ed0a7791  
						 
						
							
							
								
								
								Implement Smarty3  
							
							 
							
							
							
						 
						
							2012-12-22 12:57:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c22f65bafa  
						 
						
							
							
								
								
								repeated items from ostatus and diaspora are now using the share-element.  
							
							 
							
							... 
							
							
							
							Some design changes to repeated items in "vier". 
							
						 
						
							2012-12-19 12:18:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4164257cb2  
						 
						
							
							
								
								
								vier: The alt-pager and the birthday- and eventreminder is optically improved  
							
							 
							
							
							
						 
						
							2012-12-17 21:12:11 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f17377e6de  
						 
						
							
							
								
								
								New cache system with subdirectories  
							
							 
							
							
							
						 
						
							2012-11-17 00:50:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	009744af50  
						 
						
							
							
								
								
								allow posted ACLs to be comma-delimited string besides the default array  
							
							 
							
							
							
						 
						
							2012-11-11 13:56:21 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2347a4326c  
						 
						
							
							
								
								
								get rid of 'Friendika'  
							
							 
							
							
							
						 
						
							2012-10-18 21:51:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	054f8edb59  
						 
						
							
							
								
								
								zeros - theming for new categories/folder display  
							
							 
							
							
							
						 
						
							2012-09-23 19:22:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	dd25c7db7e  
						 
						
							
							
								
								
								more $item data  
							
							 
							
							... 
							
							
							
							- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php 
							
						 
						
							2012-09-20 09:46:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b400ddd22d  
						 
						
							
							
								
								
								conversation: new 'categories' and 'folder' elements to $item  
							
							 
							
							... 
							
							
							
							remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array 
							
						 
						
							2012-09-19 11:38:32 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	cdf648c0b4  
						 
						
							
							
								
								
								attachments from non-friendica contacts shouldn't go through redir - it won't work  
							
							 
							
							
							
						 
						
							2012-09-03 21:31:35 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	386b6d081b  
						 
						
							
							
								
								
								moods  
							
							 
							
							
							
						 
						
							2012-08-22 21:36:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	e802c81ec1  
						 
						
							
							
								
								
								fix single quotes  
							
							 
							
							
							
						 
						
							2012-08-15 05:09:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	4654ebd43b  
						 
						
							
							
								
								
								correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare  
							
							 
							
							
							
						 
						
							2012-08-15 00:02:15 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	558fbcc69e  
						 
						
							
							
								
								
								rev update + don't tag anything in [] brackets  
							
							 
							
							
							
						 
						
							2012-08-06 19:50:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	372ad112c9  
						 
						
							
							
								
								
								tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.  
							
							 
							
							
							
						 
						
							2012-08-01 01:36:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	5cb979f5e4  
						 
						
							
							
								
								
								changes to support a mobile theme  
							
							 
							
							
							
						 
						
							2012-07-23 20:37:00 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	43d986cab2  
						 
						
							
							
								
								
								one for the ladies who get poked by undesirables.  
							
							 
							
							
							
						 
						
							2012-07-20 00:47:30 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	700569c7d6  
						 
						
							
							
								
								
								this is the one I'll probably use the most  
							
							 
							
							
							
						 
						
							2012-07-19 22:40:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	d442bbc482  
						 
						
							
							
								
								
								have fun...  
							
							 
							
							
							
						 
						
							2012-07-19 18:17:16 -07:00