0cd241bcbe 
 
						 
						
							
							
								
								
								added spaces + some curly braces + some usage of dbm::is_result()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:44:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3af099298c  
						 
						
							
							
								
								
								Some more caching  
							
							 
							
							
							
						 
						
							2017-01-13 17:31:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	844fefc9c4  
						 
						
							
							
								
								
								Caching the events.  
							
							 
							
							
							
						 
						
							2017-01-13 13:04:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	884f44ce94  
						 
						
							
							
								
								
								*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-19 14:27:16 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	47c60aa486  
						 
						
							
							
								
								
								Opps, no need for this.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-13 10:01:56 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d489ba1510  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							 
							
							... 
							
							
							
							Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php 
							
						 
						
							2016-12-13 09:59:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	aea122cd20  
						 
						
							
							
								
								
								Little improvements to the queries in ping.php  
							
							 
							
							
							
						 
						
							2016-12-01 13:44:30 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	0f33311f65  
						 
						
							
							
								
								
								pig.php: remove debug  
							
							 
							
							
							
						 
						
							2016-11-22 23:04:00 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	133120007c  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/develop' into improvement/ping-php-json  
							
							 
							
							
							
						 
						
							2016-11-22 21:14:25 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	58e03c5155  
						 
						
							
							
								
								
								ping.php: Ensure data structure consistency  
							
							 
							
							... 
							
							
							
							- Formatting
- Documentation 
							
						 
						
							2016-11-22 21:11:22 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	61da46677d  
						 
						
							
							
								
								
								Merge pull request  #2967  from Hypolite/issue/#2955  
							
							 
							
							... 
							
							
							
							ping.php: Prevent $register_count from being undefined 
							
						 
						
							2016-11-22 21:00:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	e0322546d8  
						 
						
							
							
								
								
								ping.php improvement: Prevent $register_count from being undefined  
							
							 
							
							
							
						 
						
							2016-11-22 14:17:05 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	754de768f2  
						 
						
							
							
								
								
								Merge pull request  #2960  from Hypolite/issue/#2955  
							
							 
							
							... 
							
							
							
							ping.php Fix confusion between count vars and array vars 
							
						 
						
							2016-11-22 08:13:36 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	cc242d52f8  
						 
						
							
							
								
								
								ping.php Fix confusion between count vars and array vars  
							
							 
							
							
							
						 
						
							2016-11-21 16:02:36 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	61afd71897  
						 
						
							
							
								
								
								ping.php performance: fix typo  
							
							 
							
							
							
						 
						
							2016-11-19 15:23:36 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	c6fbb46108  
						 
						
							
							
								
								
								ping.php performance: Add JSON output  
							
							 
							
							... 
							
							
							
							- Added JSON/JSONP support
- Added XML backward-compatible output
- Updated main.js to handle JSON data
- Removed unused references to non-existant DOM elements 
							
						 
						
							2016-11-16 23:26:43 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	bc407080d2  
						 
						
							
							
								
								
								ping.php performance: improve documentation and formatting  
							
							 
							
							
							
						 
						
							2016-10-28 22:14:51 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	f1c855e755  
						 
						
							
							
								
								
								ping.php performance: Cache notification bbcode  
							
							 
							
							... 
							
							
							
							- Add two fields to notifiy table to store cached bbcode result
- Add bbcode conversion on notif creation
- Add postfact caching if cache field is empty on retrieval 
							
						 
						
							2016-10-28 06:28:16 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	fdacc40b5f  
						 
						
							
							
								
								
								Fix wrong data type  
							
							 
							
							
							
						 
						
							2016-09-24 13:51:53 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	fac2d9a880  
						 
						
							
							
								
								
								Fix registration request notification query  
							
							 
							
							... 
							
							
							
							- Removed wrong usage of COUNT in registration request query
- Added simple count() of results 
							
						 
						
							2016-09-24 13:49:55 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b6dec53ec1  
						 
						
							
							
								
								
								Bugfix: A parameter in xml::from_array was missing.  
							
							 
							
							
							
						 
						
							2016-08-11 08:44:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0ea9af3d7d  
						 
						
							
							
								
								
								Ping is now using a standard routine to generate the xml.  
							
							 
							
							
							
						 
						
							2016-08-10 22:51:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e4c6cfd2d8  
						 
						
							
							
								
								
								Moves the function "is_result" from dba to dbm.  
							
							 
							
							
							
						 
						
							2016-07-02 14:00:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7d531afd00  
						 
						
							
							
								
								
								Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced  
							
							 
							
							... 
							
							
							
							Conflicts:
	boot.php 
							
						 
						
							2016-07-02 13:38:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0b1188b7fe  
						 
						
							
							
								
								
								Imrpoved avatar handling when storing them/partly use of "micro"  
							
							 
							
							
							
						 
						
							2016-06-25 13:56:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	807fbe173b  
						 
						
							
							
								
								
								Some more places where the avatar picture is taken from the database  
							
							 
							
							
							
						 
						
							2016-06-10 07:44:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	9cfc249b12 
 
						 
						
							
							
								
								
								Moved is_filled_array() to both dba classes and named it is_result().  
							
							 
							
							... 
							
							
							
							Please see ticket #2390  for full discussion.
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-03-12 18:54:55 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	c60605ce0c 
 
						 
						
							
							
								
								
								Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop  
							
							 
							
							
							
						 
						
							2016-03-12 18:50:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	14a2aa552a  
						 
						
							
							
								
								
								The name in the notifications has to be double encoded  
							
							 
							
							
							
						 
						
							2016-03-12 09:21:13 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4ec377008d  
						 
						
							
							
								
								
								Introduced is_filled_array() + added some missing array initialization  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-03-01 18:31:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bf7dedb03b  
						 
						
							
							
								
								
								Optimized query for unread group postings  
							
							 
							
							
							
						 
						
							2016-02-13 18:15:24 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	04dceb9551  
						 
						
							
							
								
								
								Merge branch 'develop' into api_ping  
							
							 
							
							
							
						 
						
							2016-02-09 14:06:57 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	804c04a06f  
						 
						
							
							
								
								
								Merge pull request  #2326  from fabrixxm/revert_db949bb8  
							
							 
							
							... 
							
							
							
							Revert "Updated modules to allow for partial overrides without errors" 
							
						 
						
							2016-02-09 06:55:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	0c67c89715  
						 
						
							
							
								
								
								Merge pull request  #2323  from annando/1601-dfrn-import  
							
							 
							
							... 
							
							
							
							Complete rewrite of DFRN import 
							
						 
						
							2016-02-08 15:48:16 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b202e02fbf  
						 
						
							
							
								
								
								Revert "Updated modules to allow for partial overrides without errors"  
							
							 
							
							... 
							
							
							
							This reverts commit db949bb802 . 
							
						 
						
							2016-02-07 15:11:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	44592611e1  
						 
						
							
							
								
								
								new api for notifications  
							
							 
							
							... 
							
							
							
							/api/friendica/notification
returns first 50 notifications for current user
/api/friendica¬ification/<id>
set note <id> as seen and return item object if possible
new class NotificationsManager to query for notifications and set seen
state 
							
						 
						
							2016-02-07 14:27:13 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	9330a6994c  
						 
						
							
							
								
								
								Merge pull request  #2319  from stieben/develop  
							
							 
							
							... 
							
							
							
							Added the possibility for themes to override core module functions 
							
						 
						
							2016-02-07 09:52:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	db949bb802  
						 
						
							
							
								
								
								Updated modules to allow for partial overrides without errors  
							
							 
							
							... 
							
							
							
							Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions. 
							
						 
						
							2016-02-05 21:52:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	52dbb0b4a2  
						 
						
							
							
								
								
								Forum class - rename Class CamelCase and rename some methods  
							
							 
							
							
							
						 
						
							2016-02-04 14:51:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	9a54afa629  
						 
						
							
							
								
								
								Forum class - rename Class CamelCase and rename some methods  
							
							 
							
							
							
						 
						
							2016-02-04 14:47:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	c1070e4655  
						 
						
							
							
								
								
								forums.php is now forum.php and providing class forum  
							
							 
							
							
							
						 
						
							2016-02-03 18:05:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	69457a4a5b  
						 
						
							
							
								
								
								DFRN import seems to work. Improvements are possible :-)  
							
							 
							
							
							
						 
						
							2016-01-30 02:57:40 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	4b7f080c46  
						 
						
							
							
								
								
								ping: further work  
							
							 
							
							
							
						 
						
							2015-12-03 22:42:53 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	c0406918ec  
						 
						
							
							
								
								
								ping: cleanup  
							
							 
							
							
							
						 
						
							2015-12-03 17:15:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9c37fc320e  
						 
						
							
							
								
								
								Merge pull request  #2095  from rabuzarus/unread_forums  
							
							 
							
							... 
							
							
							
							count unread forum items for forumlist widget (ping.php) 
							
						 
						
							2015-11-27 16:28:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	ddf3589fc5  
						 
						
							
							
								
								
								count unread forum items for forumlist widget (ping.php)  
							
							 
							
							
							
						 
						
							2015-11-24 22:14:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	573a441d83  
						 
						
							
							
								
								
								Do not notify own posts,  closes   #1032  
							
							 
							
							
							
						 
						
							2015-11-22 12:28:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	c700a6fb37  
						 
						
							
							
								
								
								duepuntozero, vier: add unread messages per group  
							
							 
							
							
							
						 
						
							2015-11-08 18:02:04 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	d31c372376  
						 
						
							
							
								
								
								Revert the rename of <groups>  
							
							 
							
							
							
						 
						
							2015-11-08 15:56:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	e28072f548  
						 
						
							
							
								
								
								Fix bugs and rename <groups> to <group_posts>  
							
							 
							
							
							
						 
						
							2015-11-08 15:56:08 +01:00