zotlabs 
							
						 
					 
					
						
						
							
						
						24b55bbc9b 
					 
					
						
						
							
							fix photo prvnxt after all the changes yesterday  
						
						
						
						
					 
					
						2017-03-22 12:41:16 -07:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						3a7db8ec60 
					 
					
						
						
							
							fix embed image modals  
						
						
						
						
					 
					
						2017-03-22 13:15:53 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						bc3e1e99fe 
					 
					
						
						
							
							Merge branch 'dev' into bs4  
						
						
						
						
					 
					
						2017-03-22 12:12:44 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						efdd95fe7f 
					 
					
						
						
							
							css fixes  
						
						
						
						
					 
					
						2017-03-22 11:52:22 +01:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						65ecc5ae15 
					 
					
						
						
							
							more work on the photo album mess  
						
						
						
						
					 
					
						2017-03-21 22:05:36 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						83a78a949d 
					 
					
						
						
							
							photos_album_exists() requires an observer to work correctly; provide it.  
						
						
						
						
					 
					
						2017-03-21 21:13:14 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						a7bf4366ce 
					 
					
						
						
							
							use the same host macro for sender address as for reply_to address  
						
						
						
						
					 
					
						2017-03-21 21:00:48 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						066ab8c1fc 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/redmatrix/hubzilla  into xdev_merge  
						
						
						
						
					 
					
						2017-03-21 20:59:26 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						bedc393425 
					 
					
						
						
							
							begin the process of using the relevant attach directory/path for photo albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact  
						
						
						
						
					 
					
						2017-03-21 20:11:48 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						c1cc7bfc94 
					 
					
						
						
							
							update license  
						
						
						
						
					 
					
						2017-03-21 17:14:58 -07:00 
						 
				 
			
				
					
						
							
							
								Klaus 
							
						 
					 
					
						
						
							
						
						caae956f6e 
					 
					
						
						
							
							Merge pull request  #705  from dawnbreak/dev  
						
						... 
						
						
						
						✅  Some more tests for purify_html(). 
					
						2017-03-22 00:59:09 +01:00 
						 
				 
			
				
					
						
							
							
								Klaus Weidenbach 
							
						 
					 
					
						
						
							
						
						30a3339653 
					 
					
						
						
							
							✅  Some more tests for purify_html().  
						
						... 
						
						
						
						Add some generic HTML, JS, CSS expectations for purify_html().
Also cover our own configuration for HTMLPurifier. 
						
						
					 
					
						2017-03-22 00:50:49 +01:00 
						 
				 
			
				
					
						
							
							
								Klaus 
							
						 
					 
					
						
						
							
						
						ef73607288 
					 
					
						
						
							
							Merge pull request  #706  from dawnbreak/master  
						
						... 
						
						
						
						issue #699  
						
						
					 
					
						2017-03-21 21:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						e7c3ecd192 
					 
					
						
						
							
							issue  #699  
						
						... 
						
						
						
						(cherry picked from commit a45dd09fc0 
						
						
					 
					
						2017-03-21 21:47:30 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						a7d184ba54 
					 
					
						
						
							
							add generic-icons-nav class  
						
						
						
						
					 
					
						2017-03-21 13:59:44 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						546867c102 
					 
					
						
						
							
							add icon, name and thumb to profile tabs. remove login app - we have login in the panel now.  
						
						
						
						
					 
					
						2017-03-21 13:38:44 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						42fbc28b11 
					 
					
						
						
							
							missing template  
						
						
						
						
					 
					
						2017-03-21 12:00:19 +01:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						82631c3413 
					 
					
						
						
							
							more markdown purification  
						
						
						
						
					 
					
						2017-03-21 00:40:19 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						b153c651b4 
					 
					
						
						
							
							perform attach_upgrade()  
						
						
						
						
					 
					
						2017-03-20 21:53:39 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						8821986d87 
					 
					
						
						
							
							after all of this, I would be very hesitant to use any multi-user system which uses markdown and which doesn't have a large security budget.  
						
						
						
						
					 
					
						2017-03-20 19:50:09 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						35fc7328de 
					 
					
						
						
							
							even more fine tuning of the markdown purifier - especially when used with the wiki  
						
						
						
						
					 
					
						2017-03-20 19:41:03 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						7a611c6d47 
					 
					
						
						
							
							create channel_store_lowlevel() and remove more diaspora stuff from core.  
						
						
						
						
					 
					
						2017-03-20 18:14:50 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						f252f3efc5 
					 
					
						
						
							
							remove redundant and non-functional/broken check for successfully cloned channel record which was left over from an earlier method of creating the table; which was deprecated a few months back.  
						
						
						
						
					 
					
						2017-03-20 15:40:48 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						da823125b9 
					 
					
						
						
							
							remove redundant and non-functional/broken check for successfully cloned channel record which was left over from an earlier method of creating the table; which was deprecated a few months back.  
						
						
						
						
					 
					
						2017-03-20 15:24:47 -07:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						7de5717418 
					 
					
						
						
							
							superfluos ;  
						
						
						
						
					 
					
						2017-03-20 23:21:02 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						a6f232f2b0 
					 
					
						
						
							
							really fix fullscreen and fix some issues in chat  
						
						
						
						
					 
					
						2017-03-20 23:20:14 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						cbcd195461 
					 
					
						
						
							
							fix webpages widgets  
						
						
						
						
					 
					
						2017-03-20 22:39:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						837efcf5e7 
					 
					
						
						
							
							fix fullscreen and bbco_autocomplete popup rendering  
						
						
						
						
					 
					
						2017-03-20 20:59:46 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						8b0bcdb2a5 
					 
					
						
						
							
							minor fixes  
						
						
						
						
					 
					
						2017-03-20 20:13:10 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						ca14ab3d55 
					 
					
						
						
							
							move profile tabs to app-tray  
						
						
						
						
					 
					
						2017-03-20 17:24:48 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						cfdf1def2a 
					 
					
						
						
							
							since we have the app bin we do not actually need the profile tabs for ourself  
						
						
						
						
					 
					
						2017-03-20 14:09:27 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						37d350c3f5 
					 
					
						
						
							
							update to latest bs4 from git and change hidden-* classes to d-*  
						
						
						
						
					 
					
						2017-03-20 11:18:23 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						b10c519cc1 
					 
					
						
						
							
							Merge branch 'dev' into bs4  
						
						
						
						
					 
					
						2017-03-20 08:53:08 +01:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						78aeb50ce5 
					 
					
						
						
							
							add function attach_syspaths to calculate the contents of os_path and display_path; add this to the rename function. We will also need it to populate existing file/photo structures as an upgrade task.  
						
						
						
						
					 
					
						2017-03-19 21:39:28 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						a12a614e7e 
					 
					
						
						
							
							attach_folder_rpaths() providing incorrect results  
						
						
						
						
					 
					
						2017-03-19 19:43:00 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						f746418fda 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/redmatrix/hubzilla  into xdev_merge  
						
						
						
						
					 
					
						2017-03-19 17:13:26 -07:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						1bdab6e633 
					 
					
						
						
							
							Merge pull request  #703  from dawnbreak/oauth2  
						
						... 
						
						
						
						⬆️  Update bshaffer/oauth2-server-php library. 
					
						2017-03-20 11:05:46 +11:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						1bf2a9d47b 
					 
					
						
						
							
							Merge pull request  #702  from dawnbreak/dev  
						
						... 
						
						
						
						✅  Add unit test for purify_html(). 
					
						2017-03-20 11:05:20 +11:00 
						 
				 
			
				
					
						
							
							
								Klaus Weidenbach 
							
						 
					 
					
						
						
							
						
						8b4b135036 
					 
					
						
						
							
							⬆️  Update bshaffer/oauth2-server-php library.  
						
						... 
						
						
						
						Manage oauth2-server-php library with composer.
Folder ./library/oauth2/ can be removed and includes removed with autoloading. 
						
						
					 
					
						2017-03-20 00:43:09 +01:00 
						 
				 
			
				
					
						
							
							
								zotlabs 
							
						 
					 
					
						
						
							
						
						be10bf2ceb 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/redmatrix/hubzilla  into dev_merge  
						
						
						
						
					 
					
						2017-03-19 15:44:59 -07:00 
						 
				 
			
				
					
						
							
							
								Klaus Weidenbach 
							
						 
					 
					
						
						
							
						
						d4bd4ca000 
					 
					
						
						
							
							✅  Add unit test for purify_html().  
						
						... 
						
						
						
						In preparation to update HTMLPurifier library add a unit test.
Please add more HTML that you need to have working and we can check
against regressions. 
						
						
					 
					
						2017-03-19 23:07:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						2f3f95d3a9 
					 
					
						
						
							
							change the btn-outline-secondary:hover color to soething sane  
						
						
						
						
					 
					
						2017-03-19 19:59:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						d958f1099b 
					 
					
						
						
							
							Revert "update to bs-git"  
						
						... 
						
						
						
						This reverts commit 7b0f3d9e26 
						
						
					 
					
						2017-03-19 19:51:02 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						7b0f3d9e26 
					 
					
						
						
							
							update to bs-git  
						
						
						
						
					 
					
						2017-03-19 19:40:08 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						92d581a342 
					 
					
						
						
							
							do not show the scrollbar before the animation has finished  
						
						
						
						
					 
					
						2017-03-19 19:36:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						8e11b2d6f0 
					 
					
						
						
							
							fix some wrapping issues  
						
						
						
						
					 
					
						2017-03-19 19:32:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						79bd2ddd9c 
					 
					
						
						
							
							reflect count in modal  
						
						
						
						
					 
					
						2017-03-19 17:53:33 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						949ca844c5 
					 
					
						
						
							
							open like-modal directly if more than 10 likes  
						
						
						
						
					 
					
						2017-03-19 17:49:07 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						f31af3c7c0 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2017-03-19 17:09:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mario Vavti 
							
						 
					 
					
						
						
							
						
						a0245f3e93 
					 
					
						
						
							
							css fixes  
						
						
						
						
					 
					
						2017-03-19 17:06:55 +01:00