21907 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	66bf39216b	Remove unreliable ANY_VALUE from message list query	2018-12-19 06:41:08 -05:00
Hypolite Petovan	c7abb1d82b	Remove unused template variable $tabcontent in mail_head.tpl	2018-12-19 06:39:36 -05:00
Hypolite Petovan	091193ad64	Merge pull request #6278 from annando/fix-contact-edit ... Fix: Contacts can now be edited again	2018-12-18 08:02:49 -05:00
Michael	99e69e30a3	Fix: Contacts can now be edited again	2018-12-18 06:52:09 +00:00
Hypolite Petovan	9aee4cb174	Merge pull request #6251 from JonnyTischbein/issue_bg_for_pages ... [frio] Background wrapper + bootstrap buttons for newmember, un/follow	2018-12-17 23:26:43 -05:00
Jonny Tischbein	5d81738034	Add page-wrapper for probe + webfinder	2018-12-17 23:15:14 +01:00
Jonny Tischbein	dc7e6edca9	Add page-wrapper to oauth/edit in frio	2018-12-17 23:09:08 +01:00
Jonny Tischbein	443210b4f0	move templates to frio theme	2018-12-17 23:09:08 +01:00
Jonny Tischbein	58067cdfbf	Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn)	2018-12-17 23:09:08 +01:00
Hypolite Petovan	f413abb82b	Merge pull request #6277 from annando/nextcloud-ap ... Fix ActivityPub with Nextcloud	2018-12-17 15:28:22 -05:00
Michael	c485ca6f06	Fix ActivityPub with Nextcloud	2018-12-17 20:13:56 +00:00
Hypolite Petovan	faff105f86	Fix feed display in browser when using emojis	2018-12-16 22:58:43 -05:00
Michael Vogel	b6623216f0	Merge pull request #6270 from MrPetovan/bug/5932-fix-notices ... Fix various notices	2018-12-16 08:41:28 +01:00
Hypolite Petovan	b6e1571b1e	Fix various notices	2018-12-15 04:32:47 -05:00
Hypolite Petovan	607f7daf51	Add PHP 5 compatible recursive dirname()	2018-12-15 02:46:08 -05:00
Michael	b08e5ab41b	Issue 6259: Suppress contact group widget only on network page	2018-12-14 06:33:57 +00:00
Hypolite Petovan	5a802bc474	Merge pull request #6261 from annando/fix-magic ... Fix for magic auth	2018-12-13 17:03:44 -05:00
Michael	9ea0864394	Some added to-do	2018-12-13 21:41:19 +00:00
Michael	705211100b	Fix for magic auth	2018-12-13 21:19:57 +00:00
Michael Vogel	e2f1fd1efb	Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote ... Add check for relationship with remote user for connect display	2018-12-13 22:18:24 +01:00
Hypolite Petovan	f6917dd8f4	Merge pull request #6260 from annando/issue-6257 ... Issue 6257: Make notes visible again	2018-12-13 15:41:56 -05:00
Michael	f6c3974c8f	Issue 6257: Make notes visible again	2018-12-13 20:09:19 +00:00
Hypolite Petovan	7c11194a2c	Use Contact::isFollower instead	2018-12-13 11:53:15 -05:00
Hypolite Petovan	096093766a	Add check for relationship with remote user for connect display	2018-12-12 22:22:43 -05:00
Hypolite Petovan	2d9e1b8ec2	Merge pull request #6253 from annando/too-much-escaped ... The "about" field shouldn't be escaped	2018-12-11 15:15:56 -05:00
Hypolite Petovan	5147d05c53	Merge pull request #6252 from annando/memory ... Possibly fix a memory issue with large posts	2018-12-11 15:13:40 -05:00
Michael	b53a6c5154	The "about" field shouldn't be escaped	2018-12-11 19:24:24 +00:00
Michael	cced018825	Possibly fix a memory issue with large posts	2018-12-11 18:48:33 +00:00
Tobias Diekershoff	f9bda66e29	Welcome 2018.12-rc	2018-12-11 14:38:11 +01:00
Hypolite Petovan	8a185a0346	Merge pull request #6244 from annando/auth-fix ... Fix for remote authentication when visiting contact's pages	2018-12-09 09:05:46 -05:00
Michael	f2e2066d33	Non public content is now displayed again to visitors.	2018-12-09 13:09:49 +00:00
Michael	8fbe0d46e9	Fix for remote authentication when visiting contact's pages	2018-12-08 20:28:01 +00:00
Hypolite Petovan	5e79ad277a	Merge pull request #6237 from annando/issue-6236 ... Issue 6236: Handle account removal messages with very low priority	2018-12-06 10:32:11 -05:00
Michael	a041c7c0fa	Issue 6236: Handle account removal messages with very low priority	2018-12-06 10:04:16 +00:00
Hypolite Petovan	8416dea3cd	Merge pull request #6235 from annando/curl-notice ... Avoids the notice "array_merge(): Argument #1 is not an array"	2018-12-05 01:41:22 -05:00
Michael	d52d4ca355	Avoids the notice "array_merge(): Argument #1 is not an array"	2018-12-05 06:01:58 +00:00
Hypolite Petovan	6510df410d	Merge pull request #6234 from annando/issue-6168 ... Issue 6168: "redir" now mostly use OWA	2018-12-04 12:08:48 -05:00
Michael	95c150ef28	Added to-do	2018-12-04 14:20:25 +00:00
Michael	5c20f21dd8	Improved fallback when the probing fails	2018-12-04 14:17:55 +00:00
Michael	491fc5f78a	Issue 6168: "redir" now mostly use OWA	2018-12-04 07:12:55 +00:00
Hypolite Petovan	e0a0302397	Merge pull request #6233 from rebeka-catalina/rct/d/logrotation ... Added a hint to help/Settings "Logs/logrotate" section in install.md	2018-12-03 16:36:55 -05:00
rebeka-catalina	1a8ca791cd	Added a hint to help/Settings "Logs/logrotate" section in install.md	2018-12-03 22:18:26 +01:00
Hypolite Petovan	89f5a9c550	Merge pull request #6231 from annando/notice ... Fix for notice	2018-12-03 15:08:36 -05:00
Michael	6733b77b73	Make it simpler	2018-12-03 19:29:06 +00:00
Hypolite Petovan	e05552470d	Merge pull request #6230 from annando/ext-redirect ... Fix for exceptions on external redirects	2018-12-03 11:38:35 -05:00
Michael	d76003797a	Fix for notice	2018-12-03 16:32:03 +00:00
Michael	fb68b50139	Fix for exceptions on external redirects	2018-12-03 15:59:53 +00:00
Hypolite Petovan	bfe809f60d	Merge pull request #6229 from annando/issue-5911 ... Issue 5911: Fix for fetching the correct user	2018-12-03 07:40:14 -05:00
Michael Vogel	be0d70f9ef	Merge pull request #6228 from MrPetovan/bug/5911-undefined-constant-DB_UPDATE_VERSION ... Add DB connection status check in Update::check	2018-12-03 07:20:51 +01:00
Michael	51bce11b69	Issue 5911: Fix for fetching the correct user	2018-12-03 06:16:25 +00:00