| 
							
							
								 marijus | c20c9e99b6 | Merge branch 'master' of https://github.com/friendica/red | 2014-09-27 15:42:28 +02:00 |  | 
			
				
					| 
							
							
								 marijus | 38605eefdd | more css shifting | 2014-09-27 15:41:49 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 2b02f611ad | Merge https://github.com/friendica/red into pending_merge | 2014-09-27 05:11:32 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 913109796e | provide backup copy of post for diaspora reshare and re-fetch | 2014-09-27 05:10:09 -07:00 |  | 
			
				
					| 
							
							
								 RedMatrix | e1ae60246a | Merge pull request #603 from dawnbreak/docu Some documentation for include/config.php. | 2014-09-27 17:19:41 +10:00 |  | 
			
				
					| 
							
							
								 friendica | 51c0904a8a | Merge https://github.com/friendica/red into pending_merge | 2014-09-27 00:15:43 -07:00 |  | 
			
				
					| 
							
							
								 friendica | fa019791fa | some background work for import/export of things and liked things/profiles | 2014-09-27 00:14:35 -07:00 |  | 
			
				
					| 
							
							
								 Klaus Weidenbach | 2681071970 | Some documentation of include/config.php. I hope my guesses are not completely wrong, anyway please take look
not that I tell complete bullshit. | 2014-09-26 22:28:35 +02:00 |  | 
			
				
					| 
							
							
								 marijus | 04e460c8f8 | upload first but not inside another {{if}} | 2014-09-26 19:34:39 +02:00 |  | 
			
				
					| 
							
							
								 marijus | a7269e9d6e | upload should be first | 2014-09-26 19:28:28 +02:00 |  | 
			
				
					| 
							
							
								 marijus | f652fbdf74 | fix blockquote | 2014-09-26 19:17:02 +02:00 |  | 
			
				
					| 
							
							
								 Thomas Willingham | 94fcf5885e | So much so, in fact, that I didn't even notice the typo. | 2014-09-26 17:16:55 +01:00 |  | 
			
				
					| 
							
							
								 Thomas Willingham | c9e8a3e8fe | Minor doco.  Add some clarity - that had me scratching my head. | 2014-09-26 17:05:22 +01:00 |  | 
			
				
					| 
							
							
								 marijus | 574c4845b7 | move some css to the right place | 2014-09-26 12:34:22 +02:00 |  | 
			
				
					| 
							
							
								 marijus | b948ab5955 | some more work on photos - work in progress | 2014-09-26 12:29:07 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 1e7fbac6c1 | doc updates, clean up buttons on PM edit template to match other edit buttons | 2014-09-26 01:52:30 -07:00 |  | 
			
				
					| 
							
							
								 friendica | d8c03526ed | optionally include wall items (posts) in import/export | 2014-09-25 20:21:23 -07:00 |  | 
			
				
					| 
							
							
								 Thomas Willingham | e75f1ccb2e | Typo | 2014-09-25 19:47:06 +01:00 |  | 
			
				
					| 
							
							
								 friendica | 92c723d37c | constrain viewsrc colorbox to 80% of the current page size. It gets messy scrolling to the right for days to find the close button. | 2014-09-24 17:32:38 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 24d402941f | if no rss/atom element author, use feed level contact | 2014-09-24 14:27:18 -07:00 |  | 
			
				
					| 
							
							
								 friendica | c76b8febaa | make it the default | 2014-09-24 02:18:13 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 95470a9f9b | one step closer | 2014-09-24 02:08:35 -07:00 |  | 
			
				
					| 
							
							
								 friendica | be54f0d9e6 | more testing | 2014-09-24 01:58:24 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 87b8e2725c | just an experiment - don't do anything with this until I'm finished with it. | 2014-09-24 01:45:57 -07:00 |  | 
			
				
					| 
							
							
								 friendica | f6269e2082 | Merge https://github.com/friendica/red into pending_merge | 2014-09-23 20:56:33 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 81ee35e03b | fix url mismatches of a single trailing slash for feed author/owner comparisons; update diaspora_compat | 2014-09-23 20:55:22 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 02210b81d8 | Merge https://github.com/friendica/red into pending_merge | 2014-09-23 20:38:25 -07:00 |  | 
			
				
					| 
							
							
								 RedMatrix | 0c929c2ec5 | Merge pull request #601 from solstag/master update pt-br translation | 2014-09-24 13:38:07 +10:00 |  | 
			
				
					| 
							
							
								 friendica | f203d2a3b0 | diaspora private mail seems to work now - but there's an obfuscation leak via the conversation structure that needs to be dealt with. | 2014-09-23 20:36:10 -07:00 |  | 
			
				
					| 
							
							
								 zzottel | 7076eafc14 | Merge pull request #602 from zzottel/master update German main help page | 2014-09-23 16:37:24 +02:00 |  | 
			
				
					| 
							
							
								 zottel | ccc97ffdc0 | update German main help page | 2014-09-23 16:35:30 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 2b466ccb8c | d* little fixes | 2014-09-23 04:40:36 -07:00 |  | 
			
				
					| 
							
							
								 friendica | ad86cc24c8 | d* PM cont. | 2014-09-23 04:34:35 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 509a85cb12 | more work on d* private messages | 2014-09-23 03:03:14 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 72ec78d027 | trying to call mod/magic on rss resources - which have no hub | 2014-09-22 23:49:12 -07:00 |  | 
			
				
					| 
							
							
								 friendica | e8854bb19d | better way to deal with effective_uid | 2014-09-22 22:03:19 -07:00 |  | 
			
				
					| 
							
							
								 friendica | fb05919d90 | make discover items interactive | 2014-09-22 21:37:19 -07:00 |  | 
			
				
					| 
							
							
								 friendica | b735961560 | found the sucker | 2014-09-22 16:23:59 -07:00 |  | 
			
				
					| 
							
							
								 Alexandre Hannud Abdo | aa59010885 | update pt-br translation | 2014-09-22 15:42:59 -03:00 |  | 
			
				
					| 
							
							
								 friendica | 2070dbfdea | private mail from d* to r# seems to work with these edits. - Now have to go back the other way. | 2014-09-22 02:27:52 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 4aa1506c00 | Merge https://github.com/friendica/red into pending_merge | 2014-09-21 15:13:32 -07:00 |  | 
			
				
					| 
							
							
								 friendica | e76ab30467 | we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUBLOC_OFFLINE instead. Filter this as well from deliveries. | 2014-09-21 15:11:47 -07:00 |  | 
			
				
					| 
							
							
								 RedMatrix | aa928d65eb | Merge pull request #600 from dawnbreak/master Don't link unknown likes. | 2014-09-22 07:50:20 +10:00 |  | 
			
				
					| 
							
							
								 friendica | 09b5bbb032 | feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599 | 2014-09-21 14:46:12 -07:00 |  | 
			
				
					| 
							
							
								 Klaus Weidenbach | d2268a412d | Don't link unknown likes. Likes/Dislikes of unknown channels have disabled links now.
Fixed intention a bit, romved a unused variable. | 2014-09-21 17:51:01 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 22e6e691ca | Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". | 2014-09-20 16:34:48 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 44cb423f21 | Merge https://github.com/friendica/red into pending_merge | 2014-09-20 16:22:21 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 8d23a8da8d | fix empty likes | 2014-09-20 16:21:49 -07:00 |  | 
			
				
					| 
							
							
								 cvogeley | a1773fea25 | Merge pull request #598 from cvogeley/master Allow ordering by created | 2014-09-20 22:41:47 +01:00 |  | 
			
				
					| 
							
							
								 Christian Vogeley | 89fec0e085 | Allow ordering by created | 2014-09-20 23:28:42 +02:00 |  |