Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	e2dc4f922c
						 | 
						
							
							
								
								
								Friendica 'Ginger' 3.3
							
							
							
							
							
						 | 
						
							2014-10-06 08:56:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	7687342849
						 | 
						
							
							
								
								
								fix email for
							
							
							
							
							
							
							
							- registration request
- registration approval
- account created by admin
add a reditect after registration approval or deny 
							
						 | 
						
							2014-09-09 22:07:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	21b1e09fad
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
							
							
							
							
							
						 | 
						
							2014-09-07 14:28:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	5997fb19ee
						 | 
						
							
							
								
								
								More template gore!
							
							
							
							
							
						 | 
						
							2014-09-07 12:29:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	803854738b
						 | 
						
							
							
								
								
								another massacre of templates
							
							
							
							
							
						 | 
						
							2014-09-07 11:48:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	fe02619114
						 | 
						
							
							
								
								
								fix indentation
							
							
							
							
							
						 | 
						
							2014-09-07 11:31:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	871b425c6e
						 | 
						
							
							
								
								
								Unsupported themes aren't displayed anymore
							
							
							
							
							
						 | 
						
							2014-09-07 10:06:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e21bcb82d2
						 | 
						
							
							
								
								
								Enhance the database structure checks when they failed.
							
							
							
							
							
						 | 
						
							2014-09-04 09:26:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	de75d8ca7f
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	mod/admin.php 
							
						 | 
						
							2014-08-13 00:18:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d4b2d3bf8a
						 | 
						
							
							
								
								
								Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
							
							
							
							
							
						 | 
						
							2014-08-13 00:13:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	016b6428a0
						 | 
						
							
							
								
								
								Merge pull request #1067 from Beanow/feature/noscrape
							
							
							
							
							
							
							
							Added noscrape feature. 
							
						 | 
						
							2014-08-10 13:24:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Beanow
								
							 
						 | 
						
							
							
								
							
							
	9026810496
						 | 
						
							
							
								
								
								Added noscrape feature.
							
							
							
							
							
						 | 
						
							2014-08-10 12:45:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6e67d39241
						 | 
						
							
							
								
								
								Relocate the site now relocates adresses in the "unique_contacts" table as well.
							
							
							
							
							
						 | 
						
							2014-07-09 21:36:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5ed5773f57
						 | 
						
							
							
								
								
								The temporary paths (temp, lock, itemcache) are now detected automatically when used.
							
							
							
							
							
						 | 
						
							2014-06-23 01:24:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	13fea42d8c
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2014-05-29 23:04:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	00b8355ad5
						 | 
						
							
							
								
								
								The number of comments per post are now editable.
							
							
							
							
							
						 | 
						
							2014-05-29 22:26:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	31312ab1d2
						 | 
						
							
							
								
								
								Merge pull request #956 from annando/master
							
							
							
							
							
							
							
							New database system that uses PDO if present/Test script for doing database upgrades. 
							
						 | 
						
							2014-05-09 21:55:01 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fd7e17f91e
						 | 
						
							
							
								
								
								save selection to suppress language results (fix 961)
							
							
							
							
							
						 | 
						
							2014-05-05 13:44:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2db1029830
						 | 
						
							
							
								
								
								APC support is removed due to problems with PHP 5.5.
							
							
							
							
							
						 | 
						
							2014-05-03 12:02:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7b7e372fb0
						 | 
						
							
							
								
								
								Suppress showing unsupported addons in the administration.
							
							
							
							
							
						 | 
						
							2014-04-29 14:22:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	2dfbd448a3
						 | 
						
							
							
								
								
								ideni.ca is now pump.io, so don't mention it in OStatus settings
							
							
							
							
							
						 | 
						
							2014-04-24 21:18:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b23dd95c5e
						 | 
						
							
							
								
								
								OStatus auto completion: option to completely disable the auto completion.
							
							
							
							
							
						 | 
						
							2014-03-16 18:09:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	22a6c72b31
						 | 
						
							
							
								
								
								added option to the admin panel to allow users to set the remote_self flag
							
							
							
							
							
						 | 
						
							2013-12-22 16:14:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e0cf2c5167
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	mod/admin.php
	mod/settings.php 
							
						 | 
						
							2013-12-02 00:33:46 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6684107b66
						 | 
						
							
							
								
								
								multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma.
							
							
							
							
							
						 | 
						
							2013-12-02 00:11:31 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4101127c01
						 | 
						
							
							
								
								
								better worting of the SUBMIT button in the settings tab and the admin panel
							
							
							
							
							
						 | 
						
							2013-11-17 15:22:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	0414e0a316
						 | 
						
							
							
								
								
								More "relocate":
							
							
							
							
							
							
							
							button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server 
							
						 | 
						
							2013-11-13 06:07:49 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									maase2
								
							 
						 | 
						
							
							
								
							
							
	940f55a2ec
						 | 
						
							
							
								
								
								Update admin.php
							
							
							
							
							
							
							
							Improve the SQL query to keep the result quantity small 
							
						 | 
						
							2013-11-10 13:23:06 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8faeee9965
						 | 
						
							
							
								
								
								added config->info and system-suppress_language options to the admin panel
							
							
							
							
							
						 | 
						
							2013-10-20 16:17:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e70b110984
						 | 
						
							
							
								
								
								Switching from "new share" to "old share"
							
							
							
							
							
						 | 
						
							2013-10-15 00:49:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ab7d8bc6ab
						 | 
						
							
							
								
								
								Delete all APC values before showing them in the settings and admin section
							
							
							
							
							
						 | 
						
							2013-09-27 23:02:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zered
								
							 
						 | 
						
							
							
								
							
							
	82972be85e
						 | 
						
							
							
								
								
								Adding a "User waiting for permanent deletion" table in admin page
							
							
							
							
							
						 | 
						
							2013-08-05 06:08:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	0972189372
						 | 
						
							
							
								
								
								allow admins to add a new user from the admin panel (eventually fixing oldbug #383)
							
							
							
							
							
						 | 
						
							2013-07-21 08:46:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c43e65e26b
						 | 
						
							
							
								
								
								OStatus conversation poll option in the admin panel
							
							
							
							
							
						 | 
						
							2013-03-25 11:00:13 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	39cc7f4565
						 | 
						
							
							
								
								
								use _Enable Debugging_ instead of only _Debugging_ in the interface
							
							
							
							
							
						 | 
						
							2013-03-19 07:01:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	277c47732b
						 | 
						
							
							
								
								
								fix disable embedding option description
							
							
							
							
							
						 | 
						
							2013-03-04 16:55:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	0187283709
						 | 
						
							
							
								
								
								allow admin to prevent private image embedding on hub
							
							
							
							
							
						 | 
						
							2013-03-03 09:44:41 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f07df4f667
						 | 
						
							
							
								
								
								merge
							
							
							
							
							
						 | 
						
							2013-03-02 15:46:54 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	7186331a89
						 | 
						
							
							
								
								
								Admin panel: show if an account has expired
							
							
							
							
							
						 | 
						
							2013-02-25 13:02:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	3843f821b2
						 | 
						
							
							
								
								
								better description
							
							
							
							
							
						 | 
						
							2013-02-23 09:33:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	4db50a3ecb
						 | 
						
							
							
								
								
								admin option to disable post content in email notifications for the site
							
							
							
							
							
						 | 
						
							2013-02-23 09:31:34 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	0d4d15c73d
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	mod/admin.php 
							
						 | 
						
							2013-02-20 21:57:26 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8e65e95d17
						 | 
						
							
							
								
								
								add multi vs. single user config to the admin panel
							
							
							
							
							
						 | 
						
							2013-02-17 17:42:32 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	aa2f1c38e9
						 | 
						
							
							
								
								
								add 'hide_help' to admin panel
							
							
							
							
							
						 | 
						
							2013-02-17 12:37:45 +01: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	439974a5d5
						 | 
						
							
							
								
								
								allow themes to use plugin hooks
							
							
							
							
							
						 | 
						
							2013-02-04 20:53:53 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2cb576d305
						 | 
						
							
							
								
								
								Bugfixing after adding timestamps
							
							
							
							
							
						 | 
						
							2013-01-27 13:57:44 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	b6981768ee
						 | 
						
							
							
								
								
								remove more dashes in templates
							
							
							
							
							
						 | 
						
							2012-12-27 09:38:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	11c06e21b7
						 | 
						
							
							
								
								
								simplify by making Smarty include directives behave like Friendica native ones
							
							
							
							
							
						 | 
						
							2012-12-25 11:55:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	a29842e301
						 | 
						
							
							
								
								
								Merge https://github.com/annando/friendica into annando
							
							
							
							
							
							
							
							Conflicts:
	view/admin_site.tpl 
							
						 | 
						
							2012-12-22 23:02:21 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |