 Hypolite Petovan
|
8a86171a7f
|
Merge pull request #8591 from annando/fix-fatal
fix a fatal error when displaying photos
|
2020-05-06 10:26:46 -04:00 |
|
 Michael
|
180b4e51df
|
fix a fatal error when displaying photos
|
2020-05-06 04:58:25 +00:00 |
|
Michael Vogel
|
652efd1a5d
|
Merge pull request #8590 from MrPetovan/bug/8568-markdown-to-bbcode-autolink
Remove preemptive autolinker from Text\Markdown::toBBCode
|
2020-05-06 06:43:18 +02:00 |
|
|
Hypolite Petovan
|
36a7eceb89
|
Remove preemptive autolinker from Text\Markdown::toBBCode
- Autolinker is done centrally in Text\BBCode::convert
|
2020-05-05 23:41:35 -04:00 |
|
|
Hypolite Petovan
|
ccb69414d2
|
Combine getFollowers and getFollowing into getContacts in ActivityPub\Transmitter
|
2020-05-05 22:32:45 -04:00 |
|
|
Hypolite Petovan
|
f4083f6031
|
Merge pull request #8585 from annando/legacy-tag
Removed legacy usage of the "tag" field
|
2020-05-05 18:10:22 -04:00 |
|
|
Hypolite Petovan
|
16e9b3fdca
|
Merge pull request #8587 from annando/warning-notices
Fix warning, notice and DB Error
|
2020-05-05 18:08:43 -04:00 |
|
|
Michael
|
d33f6fc167
|
Renamed function
|
2020-05-05 21:58:25 +00:00 |
|
|
Michael
|
0f042b064a
|
Fix warning, notice and DB Error
|
2020-05-05 21:49:48 +00:00 |
|
|
Hypolite Petovan
|
1c39f2523c
|
Merge pull request #8584 from annando/composer
The composer lock file had been updated
|
2020-05-05 16:45:34 -04:00 |
|
|
Michael
|
980de37047
|
Removed legacy usage of the "tag" field
|
2020-05-05 19:54:25 +00:00 |
|
|
Michael
|
9c36b63b33
|
The composer lock file had been updated
|
2020-05-05 18:53:38 +00:00 |
|
|
Hypolite Petovan
|
f7a45e4153
|
Merge pull request #8577 from annando/no-term2
File and category aren't using "term" anymore
|
2020-05-05 13:45:48 -04:00 |
|
|
Michael
|
349e1d2015
|
Tests could work again
|
2020-05-05 17:32:11 +00:00 |
|
|
Michael
|
f67c8a7315
|
Fix test
|
2020-05-05 16:42:29 +00:00 |
|
|
Hypolite Petovan
|
24713e289e
|
Merge pull request #8563 from annando/issue-8550
Issue 8550: Check for a good table_definition_cache value
|
2020-05-05 12:26:28 -04:00 |
|
|
Michael
|
3d4ace7a9d
|
Merge branch 'no-term3' into no-term2
|
2020-05-05 16:09:50 +00:00 |
|
|
Michael
|
d67b9cb693
|
Formula according to documentation
|
2020-05-05 16:01:20 +00:00 |
|
|
Michael
|
7de6e60328
|
Merge remote-tracking branch 'upstream/develop' into issue-8550
|
2020-05-05 15:56:24 +00:00 |
|
|
Michael
|
5725784055
|
Update database definition, cleaned code
|
2020-05-05 15:47:35 +00:00 |
|
|
Michael
|
59675c4f0b
|
Merge remote-tracking branch 'upstream/develop' into no-term2
|
2020-05-05 15:44:24 +00:00 |
|
|
Hypolite Petovan
|
c1460ee3e8
|
Merge pull request #8575 from annando/post-delivery-data
"item-delivery-data" is now "post-delivery-data"
|
2020-05-05 10:29:27 -04:00 |
|
|
Michael
|
d838dcbd8c
|
Removed unused fields
|
2020-05-05 14:10:39 +00:00 |
|
|
Michael
|
2ee14bf5fe
|
Merge remote-tracking branch 'upstream/develop' into post-delivery-data
|
2020-05-05 14:08:29 +00:00 |
|
|
Hypolite Petovan
|
df7eb7fcc5
|
Merge pull request #8576 from annando/new-participation
Diaspora participations are now stored as activities
|
2020-05-05 09:29:04 -04:00 |
|
|
Michael
|
84e3892955
|
Merge remote-tracking branch 'upstream/develop' into post-delivery-data
|
2020-05-05 13:16:01 +00:00 |
|
|
Hypolite Petovan
|
995a81b144
|
Merge pull request #8573 from annando/notification-uri-id
Notifications are now storing the uri-id as well
|
2020-05-05 09:03:18 -04:00 |
|
|
Michael
|
2f42e68dc8
|
Merge remote-tracking branch 'upstream/develop' into new-participation
|
2020-05-05 12:48:33 +00:00 |
|
|
Michael
|
7e24861def
|
Merge remote-tracking branch 'upstream/develop' into notification-uri-id
|
2020-05-05 12:47:45 +00:00 |
|
|
Hypolite Petovan
|
2301cc2205
|
Merge pull request #8581 from annando/perfect-scrollbar
Integrate perfect-scrollbar to make tests happy
|
2020-05-05 08:46:19 -04:00 |
|
|
Michael
|
f3bf723cc7
|
Moved to view/js
|
2020-05-05 12:42:30 +00:00 |
|
|
Michael
|
6d47324342
|
Integrate perfect-scrollbar to make tests happy
|
2020-05-05 05:22:14 +00:00 |
|
|
Michael
|
b7e25d16e7
|
Removed usage of "tag" field
|
2020-05-05 05:11:59 +00:00 |
|
|
Michael Vogel
|
64069f8bd6
|
Merge pull request #8579 from MrPetovan/bug/fatal-errors
Ensure Tag::getByURIId parameter value in OStatus::entryFooter
|
2020-05-05 06:25:31 +02:00 |
|
|
Hypolite Petovan
|
340bc57952
|
Ensure Tag::getByURIId parameter value in OStatus;;entryFooter
- Address https://github.com/friendica/friendica/issues/8473#issuecomment-623701081
- $item['uri-id'] isn't present for follow entry pseudo-items
|
2020-05-04 18:51:03 -04:00 |
|
|
Michael
|
b261df14af
|
Updated database versions
|
2020-05-04 15:23:45 +00:00 |
|
|
Michael
|
1362748f59
|
Merge remote-tracking branch 'upstream/develop' into no-term2
|
2020-05-04 15:20:30 +00:00 |
|
|
Michael
|
4c86f2a3ec
|
Merge remote-tracking branch 'upstream/develop' into new-participation
|
2020-05-04 15:01:42 +00:00 |
|
|
Michael
|
48f3234318
|
Useless space and useless "null" check
|
2020-05-04 14:50:22 +00:00 |
|
|
Michael
|
6b1b052308
|
Updated database version in sql file
|
2020-05-04 14:42:24 +00:00 |
|
|
Michael
|
16d486dd24
|
Merge remote-tracking branch 'upstream/develop' into post-delivery-data
|
2020-05-04 14:40:52 +00:00 |
|
|
Michael
|
49db63da2b
|
Merge remote-tracking branch 'upstream/develop' into notification-uri-id
|
2020-05-04 14:38:19 +00:00 |
|
|
Hypolite Petovan
|
05cac4c186
|
Merge pull request #8570 from annando/tag-notice
Fix for "Undefined index: uri-id""
|
2020-05-04 09:30:14 -04:00 |
|
|
Hypolite Petovan
|
97f8ea2c3a
|
Merge pull request #8571 from annando/no-term
The old tag handling is removed
|
2020-05-04 09:29:43 -04:00 |
|
|
Michael
|
d5edc9e3ae
|
Fix tests
|
2020-05-03 16:02:51 +00:00 |
|
|
Michael
|
4fa26c81e8
|
Fix for wrong table and wrong field name
|
2020-05-03 15:44:39 +00:00 |
|
|
Michael
|
875d6b36e9
|
File and category aren't using "term" anymore
|
2020-05-03 15:13:40 +00:00 |
|
|
Michael
|
1ec3cc2fdc
|
Fixing test again?
|
2020-05-02 23:16:42 +00:00 |
|
|
Michael
|
f291b96cbc
|
Fixing tests
|
2020-05-02 22:49:47 +00:00 |
|
|
Michael
|
c141a3eb79
|
Corrected variable name
|
2020-05-02 22:02:29 +00:00 |
|