]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years agoMerge branch 'develop' into utf8mb4
Alexandre Alapetite [Sun, 16 Apr 2017 20:08:48 +0000 (22:08 +0200)]
Merge branch 'develop' into utf8mb4

7 years agoMerge pull request #3321 from Alkarex/MySQL5.7
Hypolite Petovan [Sun, 16 Apr 2017 20:03:13 +0000 (16:03 -0400)]
Merge pull request #3321 from Alkarex/MySQL5.7

Fix for MySQL 5.7+ NO_ZERO_DATE

7 years agoMerge pull request #3345 from annando/1704-db-update-error
Hypolite Petovan [Sun, 16 Apr 2017 20:03:06 +0000 (16:03 -0400)]
Merge pull request #3345 from annando/1704-db-update-error

Print out database error messages

7 years agoDefault UTF8MB4 for CREATE DATABASE
Alexandre Alapetite [Sun, 16 Apr 2017 14:04:38 +0000 (16:04 +0200)]
Default UTF8MB4 for CREATE DATABASE

7 years agoMore replaces UTF8 to UTF8MB4
Alexandre Alapetite [Sun, 16 Apr 2017 13:53:48 +0000 (15:53 +0200)]
More replaces UTF8 to UTF8MB4

7 years agoDoxygen header added
Michael [Sun, 16 Apr 2017 13:37:42 +0000 (13:37 +0000)]
Doxygen header added

7 years agoMore general date test for dob
Alexandre Alapetite [Sun, 16 Apr 2017 13:36:01 +0000 (15:36 +0200)]
More general date test for dob

7 years agoBump version to 1219
Alexandre Alapetite [Sun, 16 Apr 2017 13:23:57 +0000 (15:23 +0200)]
Bump version to 1219

https://github.com/friendica/friendica/pull/3321#pullrequestreview-32528437

7 years agoPrint out database error messages
Michael [Sun, 16 Apr 2017 13:21:49 +0000 (13:21 +0000)]
Print out database error messages

7 years agoMerge branch 'develop' into MySQL5.7
Alexandre Alapetite [Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)]
Merge branch 'develop' into MySQL5.7

7 years agoMerge pull request #3343 from annando/1704-mastodon
Tobias Diekershoff [Sun, 16 Apr 2017 08:23:07 +0000 (10:23 +0200)]
Merge pull request #3343 from annando/1704-mastodon

Discover Mastodon servers

7 years agoDiscover Mastodon servers
Michael [Sun, 16 Apr 2017 07:46:04 +0000 (07:46 +0000)]
Discover Mastodon servers

7 years agoMerge pull request #3323 from Alkarex/ostatus-only_full_group_by
Hypolite Petovan [Sat, 15 Apr 2017 22:32:50 +0000 (18:32 -0400)]
Merge pull request #3323 from Alkarex/ostatus-only_full_group_by

Fix MySQL bugs related to only_full_group_by

7 years agoForgotten AS in mod/admin patch
Alexandre Alapetite [Sat, 15 Apr 2017 21:48:02 +0000 (23:48 +0200)]
Forgotten AS in mod/admin patch

7 years agoANY_VALUE in mod/admin
Alexandre Alapetite [Sat, 15 Apr 2017 21:42:10 +0000 (23:42 +0200)]
ANY_VALUE in mod/admin

The query was not standard, not deterministic, and was not doing what
its description says. The patch makes it more standard and a bit more
deterministic. The returned protocol type is still undeterministic.

7 years agoMove any_value_fallback() to dba class
Alexandre Alapetite [Sat, 15 Apr 2017 15:31:32 +0000 (17:31 +0200)]
Move any_value_fallback() to dba class

https://github.com/friendica/friendica/pull/3323#discussion_r111666245

7 years agoDocument any_value_fallback()
Alexandre Alapetite [Sat, 15 Apr 2017 12:39:41 +0000 (14:39 +0200)]
Document any_value_fallback()

https://github.com/friendica/friendica/pull/3323#discussion_r111663767

7 years agoUse server_info to fallback from ANY_VALUE if needed
Alexandre Alapetite [Sat, 15 Apr 2017 10:40:32 +0000 (12:40 +0200)]
Use server_info to fallback from ANY_VALUE if needed

7 years agoMerge pull request #3341 from annando/issue-3326
Hypolite Petovan [Sat, 15 Apr 2017 05:58:18 +0000 (01:58 -0400)]
Merge pull request #3341 from annando/issue-3326

Always use utf8mb4 from now on

7 years agoMerge develop
Alexandre Alapetite [Fri, 14 Apr 2017 23:03:21 +0000 (01:03 +0200)]
Merge develop

7 years agoSQL typo mod/message
Alexandre Alapetite [Fri, 14 Apr 2017 22:45:30 +0000 (00:45 +0200)]
SQL typo mod/message

Mistake in previous commit

7 years agoMySQL ANY_VALUE with fallback to MIN
Alexandre Alapetite [Fri, 14 Apr 2017 22:42:44 +0000 (00:42 +0200)]
MySQL ANY_VALUE with fallback to MIN

https://github.com/friendica/friendica/issues/3322

7 years agoDatabase version updated
Michael [Fri, 14 Apr 2017 22:34:01 +0000 (22:34 +0000)]
Database version updated

7 years agoMerge remote-tracking branch 'upstream/develop' into issue-3326
Michael [Fri, 14 Apr 2017 22:30:48 +0000 (22:30 +0000)]
Merge remote-tracking branch 'upstream/develop' into issue-3326

7 years agoWe only need to define the collation.
Michael [Fri, 14 Apr 2017 12:22:36 +0000 (12:22 +0000)]
We only need to define the collation.

7 years agoit should work now
Michael [Fri, 14 Apr 2017 11:26:47 +0000 (11:26 +0000)]
it should work now

7 years agoIssue 3326: We are now completely working with utf8mb4
Michael [Fri, 14 Apr 2017 07:58:56 +0000 (07:58 +0000)]
Issue 3326: We are now completely working with utf8mb4

7 years agoMerge pull request #3339 from Hypolite/issue/#2803-icons
Tobias Diekershoff [Fri, 14 Apr 2017 05:35:16 +0000 (07:35 +0200)]
Merge pull request #3339 from Hypolite/issue/#2803-icons

Change icon of contact page links

7 years agoMerge pull request #3335 from annando/issue-3331
Tobias Diekershoff [Fri, 14 Apr 2017 05:32:30 +0000 (07:32 +0200)]
Merge pull request #3335 from annando/issue-3331

Issue 3331: Remove unneeded table "deliverq"

7 years agoMerge pull request #3319 from Hypolite/issue/#3316
Michael Vogel [Fri, 14 Apr 2017 05:24:27 +0000 (07:24 +0200)]
Merge pull request #3319 from Hypolite/issue/#3316

Use get_contact_by_url for unknown contacts in acl_lookup

7 years agoChange icon of contact page links
Hypolite Petovan [Fri, 14 Apr 2017 03:00:02 +0000 (23:00 -0400)]
Change icon of contact page links

7 years agoAdd htmlentities to protect nick/addr in acl_lookup
Hypolite Petovan [Thu, 13 Apr 2017 22:33:40 +0000 (18:33 -0400)]
Add htmlentities to protect nick/addr in acl_lookup

7 years agoMerge pull request #3338 from annando/issue-3336
Hypolite Petovan [Thu, 13 Apr 2017 19:48:25 +0000 (15:48 -0400)]
Merge pull request #3338 from annando/issue-3336

Issue 3336: The date format should now be okay

7 years agoIssue 3336: The date format should now be okay
Michael [Thu, 13 Apr 2017 19:25:00 +0000 (19:25 +0000)]
Issue 3336: The date format should now be okay

7 years agoChanged documentation
Michael [Thu, 13 Apr 2017 19:10:53 +0000 (19:10 +0000)]
Changed documentation

7 years agoMerge pull request #3330 from Rudloff/feature/keypress
Hypolite Petovan [Thu, 13 Apr 2017 15:42:45 +0000 (11:42 -0400)]
Merge pull request #3330 from Rudloff/feature/keypress

Scroll to next/previous thread when pressing j/k (fixes #3327)

7 years agoMerge pull request #3332 from Rudloff/feature/manifest
Hypolite Petovan [Thu, 13 Apr 2017 15:42:03 +0000 (11:42 -0400)]
Merge pull request #3332 from Rudloff/feature/manifest

Web app manifest (fixes #3317)

7 years agoDoc about j/k keyboard shortcuts
Pierre Rudloff [Thu, 13 Apr 2017 15:20:05 +0000 (17:20 +0200)]
Doc about j/k keyboard shortcuts

7 years agoWeb app manifest (fixes #3317)
Pierre Rudloff [Thu, 13 Apr 2017 00:24:27 +0000 (02:24 +0200)]
Web app manifest (fixes #3317)

7 years agoScroll to next/previous thread when pressing j/k (fixes #3327)
Pierre Rudloff [Wed, 12 Apr 2017 21:16:44 +0000 (23:16 +0200)]
Scroll to next/previous thread when pressing j/k (fixes #3327)

7 years agoRemoved it here as well
Michael [Thu, 13 Apr 2017 05:08:42 +0000 (05:08 +0000)]
Removed it here as well

7 years agoRemoved documentation
Michael [Thu, 13 Apr 2017 05:08:12 +0000 (05:08 +0000)]
Removed documentation

7 years agoIssue 3331: Removed unneeded table "deliverq"
Michael [Thu, 13 Apr 2017 04:51:16 +0000 (04:51 +0000)]
Issue 3331: Removed unneeded table "deliverq"

7 years agoMerge pull request #3329 from Alkarex/sql-type-contact.contact-type
Michael Vogel [Thu, 13 Apr 2017 04:44:41 +0000 (06:44 +0200)]
Merge pull request #3329 from Alkarex/sql-type-contact.contact-type

Allow negative contact.contat-type

7 years agoFiddling with the unknown contact array values
Hypolite Petovan [Thu, 13 Apr 2017 01:32:06 +0000 (21:32 -0400)]
Fiddling with the unknown contact array values

7 years agoBump update version
Alexandre Alapetite [Wed, 12 Apr 2017 21:20:10 +0000 (23:20 +0200)]
Bump update version

7 years agoBump DB version
Alexandre Alapetite [Wed, 12 Apr 2017 21:14:33 +0000 (23:14 +0200)]
Bump DB version

7 years agoAllow negative contact.contat-type
Alexandre Alapetite [Wed, 12 Apr 2017 21:09:22 +0000 (23:09 +0200)]
Allow negative contact.contat-type

https://github.com/friendica/friendica/issues/3328

7 years agoFix GROUP BY for search
Alexandre Alapetite [Wed, 12 Apr 2017 20:55:02 +0000 (22:55 +0200)]
Fix GROUP BY for search

https://github.com/friendica/friendica/issues/3322
Fix MySQL ERROR 1055 (42000): Expression #1 of SELECT list is not in
GROUP BY clause and contains nonaggregated column
'friendica.item.author-id' which is not functionally dependent on
columns in GROUP BY clause; this is incompatible with
sql_mode=only_full_group_by

7 years agoFix ping_init SQL
Alexandre Alapetite [Wed, 12 Apr 2017 16:54:54 +0000 (18:54 +0200)]
Fix ping_init SQL

According to review
https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628

7 years agoFix profile wrong DISTINCT + ORDER BY
Alexandre Alapetite [Wed, 12 Apr 2017 16:49:29 +0000 (18:49 +0200)]
Fix profile wrong DISTINCT + ORDER BY

Fix: ERROR 3065 (HY000) Expression #1 of ORDER BY clause is not in
SELECT list, references column 'friendica.item.created' which is not in
SELECT list; this is incompatible with DISTINCT

7 years agoDefault to utf8mb4
Alexandre Alapetite [Wed, 12 Apr 2017 14:49:05 +0000 (16:49 +0200)]
Default to utf8mb4

https://github.com/friendica/friendica/issues/3324

7 years agoFix GROUP BY in acl_selector, api, notifier, photos, messages
Alexandre Alapetite [Wed, 12 Apr 2017 13:11:50 +0000 (15:11 +0200)]
Fix GROUP BY in acl_selector, api, notifier, photos, messages

https://github.com/friendica/friendica/issues/3322

7 years agoFix missing SQL group by in ping
Alexandre Alapetite [Wed, 12 Apr 2017 12:17:16 +0000 (14:17 +0200)]
Fix missing SQL group by in ping

https://github.com/friendica/friendica/issues/3322

7 years agoAdd error handling for missing contacts
Hypolite Petovan [Wed, 12 Apr 2017 01:18:34 +0000 (21:18 -0400)]
Add error handling for missing contacts

7 years agoAnother GROUP BY fix for MySQL
Alexandre Alapetite [Tue, 11 Apr 2017 23:06:08 +0000 (01:06 +0200)]
Another GROUP BY fix for MySQL

https://github.com/friendica/friendica/issues/3322

7 years agoFix ostatus bug related to only_full_group_by
Alexandre Alapetite [Tue, 11 Apr 2017 22:19:05 +0000 (00:19 +0200)]
Fix ostatus bug related to only_full_group_by

https://github.com/friendica/friendica/issues/3322

7 years agoFix for MySQL 5.7+
Alexandre Alapetite [Tue, 11 Apr 2017 21:00:45 +0000 (23:00 +0200)]
Fix for MySQL 5.7+

https://github.com/friendica/friendica/issues/2786

Only tested on Ubuntu 16.10 with MySQL 5.7.17.

https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html

https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date
As of MySQL 5.7.4, NO_ZERO_DATE is deprecated.

Patch based on the following search & replace (and then reverting some
changes in libraries):

```sh
grep -l '= "0000-00-00"' -r . | xargs sed -i -e "s/= \"0000-00-00\"/=
'0000-00-00'/g"

grep -l "0000-00-00" -r . | xargs sed -i -e "s/0000-00-00/0001-01-01/g"

grep -l "!= '0001-01-01'" -r . | xargs sed -i -e "s/!= '0001-01-01'/>
'0001-01-01'/g"

grep -l " === '0001-01-01'" -r . | xargs sed -i -e "s/ === '0001-01-01'/
<= '0001-01-01'/g"

grep -l " == '0001-01-01'" -r . | xargs sed -i -e "s/ == '0001-01-01'/
<= '0001-01-01'/g"

grep -l "strpos(\$dob, '0000-') === 0" -r . | xargs sed -i -e
"s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 ||
strpos(\$dob, '0001-') === 0/g"

grep -l 'array("", "0001-01-01")' -r . | xargs sed -i -e 's/array("",
"0001-01-01")/array("", "0000-00-00", "0001-01-01")/g'

grep -l "\$dob = '0000-'" -r . | xargs sed -i -e "s/\$dob =
'0000-'/\$dob = '0001-'/g"
```

7 years agoMerge pull request #3315 from Hypolite/issue/#3285
Michael Vogel [Tue, 11 Apr 2017 16:28:43 +0000 (18:28 +0200)]
Merge pull request #3315 from Hypolite/issue/#3285

Add spoiler tags for Mastodon Content Warning

7 years agoUse get_contact_details_by_url for unknown contacts
Hypolite Petovan [Tue, 11 Apr 2017 06:41:19 +0000 (02:41 -0400)]
Use get_contact_details_by_url for unknown contacts

- Fix typo
- Fix comment
- Fix closure

7 years agoAdded "braces" for @annando
Hypolite Petovan [Tue, 11 Apr 2017 06:12:14 +0000 (02:12 -0400)]
Added "braces" for @annando

7 years agoMerge pull request #3320 from Hypolite/issue/#3292
Michael Vogel [Tue, 11 Apr 2017 05:39:05 +0000 (07:39 +0200)]
Merge pull request #3320 from Hypolite/issue/#3292

Ignore Activity Streams `delete` messages from Mastodon

7 years agoIgnore Activity Streams `delete` messages from Mastodon
Hypolite Petovan [Tue, 11 Apr 2017 02:20:03 +0000 (22:20 -0400)]
Ignore Activity Streams `delete` messages from Mastodon

7 years agoAdd network for unknown contacts in ACL
Hypolite Petovan [Tue, 11 Apr 2017 02:10:05 +0000 (22:10 -0400)]
Add network for unknown contacts in ACL

7 years agoLeft trim at sign from nicks in ACL
Hypolite Petovan [Tue, 11 Apr 2017 02:09:49 +0000 (22:09 -0400)]
Left trim at sign from nicks in ACL

7 years agoRewrote code according to @annando feedback
Hypolite Petovan [Tue, 11 Apr 2017 01:11:28 +0000 (21:11 -0400)]
Rewrote code according to @annando feedback

- Normalize boolean operators

7 years agoAdd Content Warning support for comments too
Hypolite Petovan [Mon, 10 Apr 2017 04:57:36 +0000 (00:57 -0400)]
Add Content Warning support for comments too

Doh!

7 years agoAdd spoiler tags for Mastodon Content Warning
Hypolite Petovan [Mon, 10 Apr 2017 04:08:14 +0000 (00:08 -0400)]
Add spoiler tags for Mastodon Content Warning

7 years agoMerge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs
Hypolite Petovan [Sun, 9 Apr 2017 13:22:20 +0000 (09:22 -0400)]
Merge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs

Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0

7 years agoBugfix: Desktop-notifs - show notifs which have seen = false or seen = 0
rabuzarus [Sun, 9 Apr 2017 12:24:26 +0000 (14:24 +0200)]
Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0

7 years agoMerge pull request #3311 from tobiasd/20170409-ru
rabuzarus [Sun, 9 Apr 2017 10:50:33 +0000 (12:50 +0200)]
Merge pull request #3311 from tobiasd/20170409-ru

RU translations THX pztrn

7 years agoRU translations THX pztrn
Tobias Diekershoff [Sun, 9 Apr 2017 05:35:12 +0000 (07:35 +0200)]
RU translations THX pztrn

7 years agoMerge pull request #3310 from annando/1704-probing
Hypolite Petovan [Sun, 9 Apr 2017 05:08:12 +0000 (01:08 -0400)]
Merge pull request #3310 from annando/1704-probing

Avoid possible problems with numeric nicknames and GNU Social

7 years agoAvoid possible problems with numeric nicknames and GNU Social
Michael [Sun, 9 Apr 2017 04:29:02 +0000 (04:29 +0000)]
Avoid possible problems with numeric nicknames and GNU Social

7 years agoMerge pull request #3307 from rebeka-catalina/space_before_t
Hypolite Petovan [Sun, 9 Apr 2017 03:18:26 +0000 (23:18 -0400)]
Merge pull request #3307 from rebeka-catalina/space_before_t

Space before t

7 years agoMerge branch 'develop' into space_before_t
Hypolite Petovan [Sun, 9 Apr 2017 03:17:31 +0000 (23:17 -0400)]
Merge branch 'develop' into space_before_t

7 years agoMerge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs
Michael Vogel [Sat, 8 Apr 2017 19:15:04 +0000 (21:15 +0200)]
Merge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs

Desktop-Notifs: include the user id into the storage key for local browser storage

7 years agoDesktop-Notifs: include the user id into the storage key for local browser storage
rabuzarus [Sat, 8 Apr 2017 18:25:10 +0000 (20:25 +0200)]
Desktop-Notifs: include the user id into the storage key for local browser storage

7 years agoMerge pull request #3304 from rebeka-catalina/local_dir_warning
Hypolite Petovan [Sat, 8 Apr 2017 17:11:27 +0000 (13:11 -0400)]
Merge pull request #3304 from rebeka-catalina/local_dir_warning

Local dir warning

7 years agoThe other lone comma in 1177
rebeka-catalina [Sat, 8 Apr 2017 16:07:30 +0000 (18:07 +0200)]
The other lone comma in 1177

7 years agoAdded a whitespace between comma and t()
rebeka-catalina [Sat, 8 Apr 2017 14:57:24 +0000 (16:57 +0200)]
Added a whitespace between comma and t()

7 years agoModified the warning message
rebeka-catalina [Sat, 8 Apr 2017 14:48:11 +0000 (16:48 +0200)]
Modified the warning message

7 years agoDeleted the lone comma between paratheses
rebeka-catalina [Sat, 8 Apr 2017 14:37:18 +0000 (16:37 +0200)]
Deleted the lone comma between paratheses

7 years agoCorrection of 1177 and added modification to 1171
rebeka-catalina [Sat, 8 Apr 2017 13:48:15 +0000 (15:48 +0200)]
Correction of 1177 and added modification to 1171

7 years agoMerge pull request #3306 from Hypolite/issue/#3274
Tobias Diekershoff [Sat, 8 Apr 2017 13:24:16 +0000 (15:24 +0200)]
Merge pull request #3306 from Hypolite/issue/#3274

Fix path to default Text_Highlighter CSS

7 years agoFix path to default Text_Highlighter CSS
Hypolite Petovan [Sat, 8 Apr 2017 12:59:41 +0000 (08:59 -0400)]
Fix path to default Text_Highlighter CSS

7 years agoMerge branch 'develop' of git://github.com/friendica/friendica into develop
rebeka-catalina [Sat, 8 Apr 2017 12:50:45 +0000 (14:50 +0200)]
Merge branch 'develop' of git://github.com/friendica/friendica into develop

7 years agoadding space for readability
rebeka-catalina [Sat, 8 Apr 2017 11:52:37 +0000 (13:52 +0200)]
adding space for readability

7 years agoMerge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button
Hypolite Petovan [Sat, 8 Apr 2017 11:49:12 +0000 (07:49 -0400)]
Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button

Bugfix: there was a gui issue on the navbar account dropdown button

7 years agoBugfix: there was a gui issue on the navbar account dropdown button
rabuzarus [Sat, 8 Apr 2017 11:30:16 +0000 (13:30 +0200)]
Bugfix: there was a gui issue on the navbar account dropdown button

7 years agoWarning, that profile published in local directory may be visible in public
rebeka-catalina [Sat, 8 Apr 2017 11:21:35 +0000 (13:21 +0200)]
Warning, that profile published in local directory may be visible in public

7 years agoMerge pull request #3303 from annando/1704-duplicate-feed
rabuzarus [Sat, 8 Apr 2017 11:20:46 +0000 (13:20 +0200)]
Merge pull request #3303 from annando/1704-duplicate-feed

Avoid duplicates with feeds and "remote self"

7 years agoWarning, that profile published in local directory may be visible in public
rebeka-catalina [Sat, 8 Apr 2017 11:13:38 +0000 (13:13 +0200)]
Warning, that profile published in local directory may be visible in public

7 years agoMerge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed
Michael [Sat, 8 Apr 2017 10:05:01 +0000 (10:05 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed

7 years agoMerge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop
rebeka-catalina [Sat, 8 Apr 2017 09:42:20 +0000 (11:42 +0200)]
Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop

7 years agoAvoid duplicates with feeds and "remote self"
Michael [Sat, 8 Apr 2017 08:12:14 +0000 (08:12 +0000)]
Avoid duplicates with feeds and "remote self"

7 years agoMerge pull request #3301 from annando/issue-3300
rabuzarus [Fri, 7 Apr 2017 21:48:32 +0000 (23:48 +0200)]
Merge pull request #3301 from annando/issue-3300

The temp path creation couldn't create a subdirectory with the hostname

7 years agoIssue 3300: The temp path creation couldn't create a subdirectory with the hostname
Michael [Fri, 7 Apr 2017 21:34:06 +0000 (21:34 +0000)]
Issue 3300: The temp path creation couldn't create a subdirectory with the hostname

7 years agoMerge pull request #3295 from Hypolite/issue/#3274
Michael Vogel [Fri, 7 Apr 2017 20:59:44 +0000 (22:59 +0200)]
Merge pull request #3295 from Hypolite/issue/#3274

Friendica code blocks aren't rendered in Diaspora

7 years agoMerge pull request #3298 from tobiasd/20170407-quattroadin
fabrixxm [Fri, 7 Apr 2017 12:31:28 +0000 (14:31 +0200)]
Merge pull request #3298 from tobiasd/20170407-quattroadin

the Quattro admin_user template was missing the users note for the admin