4e5b926d23
Merge pull request #3343 from annando/1704-mastodon
...
Discover Mastodon servers
2017-04-16 10:23:07 +02:00
dc0ce4e08c
Discover Mastodon servers
2017-04-16 07:46:04 +00:00
Hypolite Petovan
d1fd797d6e
Merge pull request #3323 from Alkarex/ostatus-only_full_group_by
...
Fix MySQL bugs related to only_full_group_by
2017-04-15 18:32:50 -04:00
Alexandre Alapetite
062070058e
Move any_value_fallback() to dba class
...
https://github.com/friendica/friendica/pull/3323#discussion_r111666245
2017-04-15 17:31:32 +02:00
Alexandre Alapetite
06f374b26b
Document any_value_fallback()
...
https://github.com/friendica/friendica/pull/3323#discussion_r111663767
2017-04-15 14:39:41 +02:00
Alexandre Alapetite
5007be3cf5
Use server_info to fallback from ANY_VALUE if needed
2017-04-15 12:40:32 +02:00
Alexandre Alapetite
d2b3e0daf5
Merge develop
2017-04-15 01:03:21 +02:00
Alexandre Alapetite
1058b28cea
MySQL ANY_VALUE with fallback to MIN
...
https://github.com/friendica/friendica/issues/3322
2017-04-15 00:42:44 +02:00
e7783e2018
Merge remote-tracking branch 'upstream/develop' into issue-3326
2017-04-14 22:30:48 +00:00
d7537e7346
We only need to define the collation.
2017-04-14 12:22:36 +00:00
2930601719
it should work now
2017-04-14 11:26:47 +00:00
fdcb6d3c6f
Issue 3326: We are now completely working with utf8mb4
2017-04-14 07:58:56 +00:00
b8fd48dddc
Merge pull request #3335 from annando/issue-3331
...
Issue 3331: Remove unneeded table "deliverq"
2017-04-14 07:32:30 +02:00
Michael Vogel
79e827417c
Merge pull request #3319 from Hypolite/issue/#3316
...
Use get_contact_by_url for unknown contacts in acl_lookup
2017-04-14 07:24:27 +02:00
Hypolite Petovan
bffd3f2304
Add htmlentities to protect nick/addr in acl_lookup
2017-04-13 18:33:40 -04:00
Hypolite Petovan
ad53764832
Merge pull request #3338 from annando/issue-3336
...
Issue 3336: The date format should now be okay
2017-04-13 15:48:25 -04:00
319284c665
Issue 3336: The date format should now be okay
2017-04-13 19:25:00 +00:00
d5c6f67a4a
Changed documentation
2017-04-13 19:10:53 +00:00
Hypolite Petovan
96b1a00e91
Fiddling with the unknown contact array values
2017-04-12 21:32:06 -04:00
Alexandre Alapetite
325d3afe18
Bump DB version
2017-04-12 23:14:33 +02:00
Alexandre Alapetite
b8e4094e7b
Allow negative contact.contat-type
...
https://github.com/friendica/friendica/issues/3328
2017-04-12 23:09:22 +02:00
Alexandre Alapetite
74b6d09e89
Fix GROUP BY in acl_selector, api, notifier, photos, messages
...
https://github.com/friendica/friendica/issues/3322
2017-04-12 15:11:50 +02:00
Hypolite Petovan
6b8ad57399
Add error handling for missing contacts
2017-04-11 21:18:34 -04:00
Alexandre Alapetite
15a44d945b
Another GROUP BY fix for MySQL
...
https://github.com/friendica/friendica/issues/3322
2017-04-12 01:06:08 +02:00
Alexandre Alapetite
dbbe6efd27
Fix ostatus bug related to only_full_group_by
...
https://github.com/friendica/friendica/issues/3322
2017-04-12 00:19:05 +02:00
Michael Vogel
0d2bf557de
Merge pull request #3315 from Hypolite/issue/#3285
...
Add spoiler tags for Mastodon Content Warning
2017-04-11 18:28:43 +02:00
Hypolite Petovan
762e8eda7a
Use get_contact_details_by_url for unknown contacts
...
- Fix typo
- Fix comment
- Fix closure
2017-04-11 02:41:19 -04:00
Hypolite Petovan
21bb47a2e5
Added "braces" for @annando
2017-04-11 02:12:14 -04:00
Hypolite Petovan
ca7c2bfa00
Ignore Activity Streams delete messages from Mastodon
2017-04-10 22:20:03 -04:00
Hypolite Petovan
7f2fddea69
Add network for unknown contacts in ACL
2017-04-10 22:10:05 -04:00
Hypolite Petovan
05a5e1792d
Left trim at sign from nicks in ACL
2017-04-10 22:09:49 -04:00
Hypolite Petovan
e45da5bcd3
Rewrote code according to @annando feedback
...
- Normalize boolean operators
2017-04-10 21:11:28 -04:00
Hypolite Petovan
ada5c4cc6a
Add Content Warning support for comments too
...
Doh!
2017-04-10 00:57:36 -04:00
Hypolite Petovan
69d157c319
Add spoiler tags for Mastodon Content Warning
2017-04-10 00:08:14 -04:00
5c75fe4c14
Avoid possible problems with numeric nicknames and GNU Social
2017-04-09 04:29:02 +00:00
c94525938d
Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed
2017-04-08 10:05:01 +00:00
8786bcdf0a
Avoid duplicates with feeds and "remote self"
2017-04-08 08:12:14 +00:00
Michael Vogel
56c0675fba
Merge pull request #3295 from Hypolite/issue/#3274
...
Friendica code blocks aren't rendered in Diaspora
2017-04-07 22:59:44 +02:00
6060f311e9
small fix for #3254
2017-04-07 11:26:11 +02:00
Hypolite Petovan
b0accf4d4c
Fix code blocks to Diaspora
...
- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code> instead of <key> for Diaspora inline code blocks
2017-04-06 23:49:56 -04:00
Hypolite Petovan
8149e21add
Enforce standards
2017-04-06 23:43:55 -04:00
Hypolite Petovan
1ab28bbe03
Add Text_Highlighter to Composer
...
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments
Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
2017-04-05 00:31:49 -04:00
Hypolite Petovan
9237b2611a
Merge branch 'develop' into rewrites/coding-convention-split2
2017-04-03 06:35:27 -04:00
c574c317ef
Removed unneeded comment
2017-04-02 20:43:54 +00:00
884c75a350
Issue 3278: Attachments in Reshares should now work
2017-04-02 19:18:11 +00:00
Michael Vogel
d9451ef969
Merge pull request #3279 from Hypolite/improvement/add-composer
...
Add Composer
2017-04-02 14:57:37 +02:00
94f3f0887b
Issue 2957: The avatar problem with mastodon should now finally be solved
2017-04-02 12:37:22 +00:00
54f49169d4
Show real platform names
2017-04-02 07:53:55 +00:00
07fd61b912
Mastodon: plink for reshares, missing hostnames for avatars
2017-04-01 23:39:19 +00:00
Roland Häder
49527b70d3
Merge branch 'develop' into rewrites/coding-convention-split2
2017-04-01 22:16:08 +02:00
