| 
							
							
								 zotlabs | 120e578a67 | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | 2018-04-16 20:28:22 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 411b8e48a3 | don't save a permcat with empty name | 2018-04-16 18:09:14 -07:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | bef5be827d | remove some more distinct in queries and observe any regressions. this is related to issue #1079 and commit d47ea20aa8 | 2018-04-16 11:42:13 +02:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | a422063c7d | fix regression where in the starred tab only top level posts were visible | 2018-04-15 10:15:49 +02:00 |  | 
			
				
					| 
							
							
								 zotlabs | 953a2fd9b2 | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | 2018-04-11 17:44:51 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 2fa9645dfc | channel delegation: push current identity and pop it on logout from the delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel. | 2018-04-11 17:40:04 -07:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | fee258edbe | allow to toggle visibility of likes/dislikes in notifications | 2018-04-11 11:49:33 +02:00 |  | 
			
				
					| 
							
							
								 zotlabs | 887a59066b | last commented expiration setting in admin | 2018-04-10 00:05:20 -07:00 |  | 
			
				
					| 
							
							
								 Julian Schweinsberg | c50105b8c1 | Show "Unseen public activity" channel setting when site only public streams are activated | 2018-04-09 19:26:35 +02:00 |  | 
			
				
					| 
							
							
								 zotlabs | cda3d23508 | more intelligent handling of level 0 - and remove an extraneous logging function | 2018-04-08 22:09:08 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | e4ee165e29 | more work merging techlevels and features | 2018-04-08 22:02:48 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | e0255c0dc4 | first cut of feature/techlevel merge | 2018-04-08 20:05:30 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | c3cd613f42 | extend AC | 2018-04-08 17:30:46 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | f2078b25ad | hubzilla issue #1050 pubstream notifications visible when pubstream is not | 2018-04-08 16:51:29 -07:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | 7205ffb5c0 | Merge remote-tracking branch 'mike/master' into dev | 2018-04-08 11:38:31 +02:00 |  | 
			
				
					| 
							
							
								 zotlabs | d47ea20aa8 | we shouldn't need distinct here, since ids_to_querystr() will filter duplicates. It might have an effect on pager totals. Need to monitor for a few days. | 2018-04-07 16:54:49 -07:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | 9369150db7 | rename button label in editpost from edit to submit | 2018-04-07 14:15:07 +02:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | 0fd7634339 | rename relation to relationship - issue #1044 | 2018-04-07 13:50:41 +02:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | 969a91c432 | use Title instead of Caption - issue #1037 | 2018-04-07 13:36:34 +02:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | 4d08fcf1a7 | Use Add Files/Photos instead of Upload to open the upload dialog | 2018-04-07 13:29:36 +02:00 |  | 
			
				
					| 
							
							
								 zotlabs | b17f741050 | bring back the dnt policy document, not sure when it was lost | 2018-04-05 22:15:15 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 4a45c35c4e | oauth2 client settings page | 2018-04-05 21:01:36 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | b7386a0e88 | fix permalinks to children of articles and cards | 2018-04-05 16:58:37 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | e864679942 | private forum mentions | 2018-04-04 18:53:06 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 1a25b0bda7 | allow the profile recrods to be cloned separately | 2018-04-04 17:54:43 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 8871f8d0f4 | disable the oauth2testvehicle completely until it is safe | 2018-04-03 21:58:11 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 29b377d4c5 | get rid of dangerous test code | 2018-04-03 21:13:26 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 4915a4efbb | OAuth2 integration | 2018-04-03 21:08:40 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 245142cc07 | Merge branch 'master' into oauth2 | 2018-04-03 19:57:35 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | cf6d51bee8 | some more work on hubzilla issue #1019 | 2018-04-02 22:47:11 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | bcffb6cf55 | obscurify chats | 2018-04-01 16:53:10 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 3bd3686acf | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 | 2018-03-31 14:00:09 -07:00 |  | 
			
				
					| 
							
							
								 Andrew Manning | 6decffb00c | Merge branch 'dev' into oauth2 | 2018-03-31 13:41:29 -04:00 |  | 
			
				
					| 
							
							
								 zotlabs | e155e7d9ce | undo vcard on display module until we can make it accurate | 2018-03-31 01:43:33 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 1e086a4ac8 | Hubzilla issue #1022 cleanup of post formatting | 2018-03-30 17:13:21 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 1c3e669761 | Hubzilla issue #1022 - improve the usability | 2018-03-30 16:47:47 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | af125fbe4f | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is only implemented in the 'edit' pane and could use some improvement/enhancement | 2018-03-30 16:09:25 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 43249bd4be | hubzilla issue #1020 - PM using unicode domain for recipient. May require further testing | 2018-03-30 15:18:33 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | f54aa4f21e | allow case independence of replacements as well as patterns | 2018-03-30 01:59:32 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 6d0e1b0e07 | display and link issues with quoted tags | 2018-03-29 17:06:23 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 998f39868f | directory: link entry keywords to a directory keyword search | 2018-03-29 14:27:26 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 33bb89729c | hubzilla issue #1019 - punycode urls on connedit page when displaying locations | 2018-03-29 02:26:25 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 14383a4c4a | uexport: set content-type to json and add sections info to the default filename if present | 2018-03-27 18:43:59 -07:00 |  | 
			
				
					| 
							
							
								 Andrew Manning | 1dc795722a | Merge branch 'dev' into oauth2 | 2018-03-27 21:11:34 -04:00 |  | 
			
				
					| 
							
							
								 zotlabs | 08274ffab7 | put vcard widget with author of top-level post on display page | 2018-03-27 18:01:20 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 5ea11d1222 | don't include the q and PHPSESSID request variables in a redirected rpost | 2018-03-27 16:27:28 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | d4e91d5d9b | app sellpage not being stored | 2018-03-24 15:13:19 -07:00 |  | 
			
				
					| 
							
							
								 zotlabs | 558e3f8042 | code optimisations and de-duplication on updating parent commented timestamp | 2018-03-24 02:22:24 -07:00 |  | 
			
				
					| 
							
							
								 Mario Vavti | 376091010f | Merge remote-tracking branch 'mike/master' into dev | 2018-03-23 10:03:54 +01:00 |  | 
			
				
					| 
							
							
								 zotlabs | 05e11844e5 | make list mode work in cards and articles | 2018-03-22 17:17:00 -07:00 |  |