Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	f633acd8d1
						 | 
						
							
							
								
								
								Remove include/html2*.php files
							
							
							
							
							
						 | 
						
							2018-03-07 16:34:48 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	789561c7a2
						 | 
						
							
							
								
								
								Remove/Update references to include/html2*.php
							
							
							
							
							
						 | 
						
							2018-03-07 16:34:17 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	5e806ff598
						 | 
						
							
							
								
								
								Replace html2plain calls by HTML::toPlaintext
							
							
							
							
							
						 | 
						
							2018-03-07 16:29:44 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	b5666bd27f
						 | 
						
							
							
								
								
								Replace html2bbcode calls by HTML::toBBCode
							
							
							
							
							
						 | 
						
							2018-03-07 16:24:13 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	3bb2f72d05
						 | 
						
							
							
								
								
								Replace html2* function content by references to HTML class
							
							
							
							
							
						 | 
						
							2018-03-07 16:21:02 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	cc688e2b4f
						 | 
						
							
							
								
								
								Merge pull request #4549 from MrPetovan/task/4518-add-memcached-support
							
							
							
							
							
							
							
							[develop] Performance: Add memcached support/Improve database cache (redux) 
							
						 | 
						
							2018-03-06 16:34:28 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	95752b79e8
						 | 
						
							
							
								
								
								Add cache performance to API and worker
							
							
							
							
							
						 | 
						
							2018-03-04 23:13:19 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	6447a45a06
						 | 
						
							
							
								
								
								Remove include/bb2diaspora.php
							
							
							
							
							
						 | 
						
							2018-03-04 17:43:51 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	fe5ce67ef8
						 | 
						
							
							
								
								
								Move bb2diaspora() content to Content\Text\BBCode::toMarkdown
							
							
							
							
							
							
							
							- Use self where appropriate
- Add BaseObject extension 
							
						 | 
						
							2018-03-04 17:34:59 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	49f99d94f6
						 | 
						
							
							
								
								
								Replace disapora2bb function content with Markdown::toBBCode call
							
							
							
							
							
						 | 
						
							2018-03-04 08:31:40 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	7bd4a52156
						 | 
						
							
							
								
								
								Merge pull request #4532 from annando/dba-array
							
							
							
							
							
							
							
							[develop] We now accept array as condition parameters 
							
						 | 
						
							2018-03-03 18:14:19 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	74f6dc5373
						 | 
						
							
							
								
								
								Renamed functions / each is replaced
							
							
							
							
							
						 | 
						
							2018-03-03 23:02:45 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	194da423e0
						 | 
						
							
							
								
								
								An array with fieldnames as keys is important for the "insert" in the "update" function
							
							
							
							
							
						 | 
						
							2018-03-03 13:26:23 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5bda6c7f6d
						 | 
						
							
							
								
								
								We now accept array as condition parameters
							
							
							
							
							
						 | 
						
							2018-03-03 08:47:13 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	2f463dfb17
						 | 
						
							
							
								
								
								Remove include/acl_selectors
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:09 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	09c717d751
						 | 
						
							
							
								
								
								Remove references to include/acl_selectors
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:09 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	207eac4a16
						 | 
						
							
							
								
								
								Move navbar_complete to Acl
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	824262b824
						 | 
						
							
							
								
								
								Move populate_acl to Acl
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	2b35938e34
						 | 
						
							
							
								
								
								Move get_acl_permissions to Acl
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	ce9e0f3649
						 | 
						
							
							
								
								
								Move prune_deadguys to Contact
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	113ea38d50
						 | 
						
							
							
								
								
								Move contact_select to Acl
							
							
							
							
							
							
							
							- Simplify Acl::getMessageContactSelectHTML parameters 
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	eef25a3259
						 | 
						
							
							
								
								
								Move contact_selector()
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	e2de86de46
						 | 
						
							
							
								
								
								Update references in acl_selectors to new functions
							
							
							
							
							
						 | 
						
							2018-03-02 18:40:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1be5275eef
						 | 
						
							
							
								
								
								Some more performance measuring for database stuff
							
							
							
							
							
						 | 
						
							2018-03-02 13:37:49 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	4fe1d804ab
						 | 
						
							
							
								
								
								Merge pull request #4511 from annando/no-activity
							
							
							
							
							
							
							
							Only show visible activities 
							
						 | 
						
							2018-02-27 04:41:12 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	74ff36eee9
						 | 
						
							
							
								
								
								Only show visible activities
							
							
							
							
							
						 | 
						
							2018-02-27 09:29:11 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	20368cbbf4
						 | 
						
							
							
								
								
								Fix for network update (number of maximum comments set to 0)
							
							
							
							
							
						 | 
						
							2018-02-26 22:15:57 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d2728cad2e
						 | 
						
							
							
								
								
								Children for the network page are now fetched correctly in the conversation
							
							
							
							
							
						 | 
						
							2018-02-26 06:38:27 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a1eb5a584f
						 | 
						
							
							
								
								
								Improve the queries on the network page
							
							
							
							
							
						 | 
						
							2018-02-25 21:33:15 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a59796d1d4
						 | 
						
							
							
								
								
								No gcontact-id anymore (It wasn't really used)
							
							
							
							
							
						 | 
						
							2018-02-21 05:15:55 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a3af6807ac
						 | 
						
							
							
								
								
								Improved resource id creation
							
							
							
							
							
						 | 
						
							2018-02-20 10:02:07 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	e2d8c80f33
						 | 
						
							
							
								
								
								Revert "Fix PHP Warning: preg_replace(): Compilation failed in include/items"
							
							
							
							
							
						 | 
						
							2018-02-16 11:12:41 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	31831b9fdb
						 | 
						
							
							
								
								
								Remove partial preg_quote in include/items
							
							
							
							
							
						 | 
						
							2018-02-16 00:31:32 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	f4d76d10b2
						 | 
						
							
							
								
								
								Fix PHP Warning: preg_replace(): Compilation failed in include/items
							
							
							
							
							
						 | 
						
							2018-02-15 22:13:45 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	71cb1523d5
						 | 
						
							
							
								
								
								Remove include/bbcode.php
							
							
							
							
							
						 | 
						
							2018-02-14 22:05:16 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	9e3bae5caa
						 | 
						
							
							
								
								
								Remove references to include/bbcode.php
							
							
							
							
							
						 | 
						
							2018-02-14 22:01:14 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	05a2ea4220
						 | 
						
							
							
								
								
								Refactor comments including "bbcode()"
							
							
							
							
							
						 | 
						
							2018-02-14 22:00:43 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	4e4f5862b2
						 | 
						
							
							
								
								
								Remove unused $preserve_nl parameter from bb2diaspora()
							
							
							
							
							
						 | 
						
							2018-02-14 21:45:41 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	0c52866693
						 | 
						
							
							
								
								
								Refactor bbcode() into BBCode::convert()
							
							
							
							
							
						 | 
						
							2018-02-14 21:33:55 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	29f5270313
						 | 
						
							
							
								
								
								Remove unused parameter preserve_nl in BBCode::convert
							
							
							
							
							
						 | 
						
							2018-02-14 21:31:28 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	5fe7a21482
						 | 
						
							
							
								
								
								add $no_photos parameter to add_page_info_data()
							
							
							
							
							
						 | 
						
							2018-02-12 03:56:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	26fd6b1c33
						 | 
						
							
							
								
								
								fix undeclared variables or wrong variable names (/include)
							
							
							
							
							
						 | 
						
							2018-02-11 22:13:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	30cfca40d8
						 | 
						
							
							
								
								
								Use a more simple HTML for API output
							
							
							
							
							
						 | 
						
							2018-02-10 13:33:15 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ee7c587693
						 | 
						
							
							
								
								
								Suppress content from hidden or blocked contacts
							
							
							
							
							
						 | 
						
							2018-02-10 12:34:10 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	164f4f7cdf
						 | 
						
							
							
								
								
								Merge pull request #4424 from annando/manage-admin
							
							
							
							
							
							
							
							We can now delegate again like before 
							
						 | 
						
							2018-02-08 21:41:51 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	6f9c66b0bc
						 | 
						
							
							
								
								
								Add missing require in include/text
							
							
							
							
							
						 | 
						
							2018-02-08 19:59:34 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d42f86e218
						 | 
						
							
							
								
								
								We can now delegate again like before
							
							
							
							
							
						 | 
						
							2018-02-08 22:18:34 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c953784945
						 | 
						
							
							
								
								
								Forgotten "use"
							
							
							
							
							
						 | 
						
							2018-02-07 20:22:40 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	85c8bf0228
						 | 
						
							
							
								
								
								Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src
							
							
							
							
							
							
							
							Move include/bbcode to src/ part 1 : Everything but bbcode() 
							
						 | 
						
							2018-02-07 07:18:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1ec6359faa
						 | 
						
							
							
								
								
								Duplicate check
							
							
							
							
							
						 | 
						
							2018-02-06 16:44:48 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |