Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-13 20:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
26990 commits 3 branches 64 tags 246 MiB
Commit graph

26990 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael
3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +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
Michael
1a4beaf061 post update function added 2020-05-02 21:27:37 +00:00
Michael
098ba4a667 "item-delivery-data" is now "post-delivery-data" 2020-05-02 19:34:02 +00:00
Michael
00035f7ba0 Notifications are now storing the uri-id as well 2020-05-02 13:12:11 +00:00
Michael
2a1cdfa36b Diaspora participations are now atored as activities 2020-05-02 08:52:11 +00:00
Michael
233d6eea2b Tags are now added to the body again 2020-05-02 05:43:00 +00:00
Michael
11406fd3b6 Fix for "Undefined index: uri-id"" 2020-05-02 05:14:30 +00:00
Michael
b0cb6536dd The old tag handling is removed 2020-05-02 05:08:05 +00:00
Hypolite Petovan
92cf4879e5
Merge pull request #8566 from annando/write-tags 
From "term" to "tag" - We are now using "tag" where appropriate
 2020-05-01 13:07:09 -04:00
Michael
776a1dd7c3 Renamed function 2020-05-01 15:43:50 +00:00
Michael
c3ecc19b41 Last "term" element renamed 2020-05-01 15:27:56 +00:00
Michael
729c6b67aa the "term" field now is called "name", workaround removed 2020-05-01 15:18:48 +00:00
Michael
74081a71ff Removed unused "use" 2020-05-01 13:26:13 +00:00
Michael
ede69a8673 Function renamed 2020-05-01 13:13:58 +00:00
Michael
70022393b7 Fix notice for missing "uri-id" 2020-05-01 12:42:22 +00:00
Michael
2b1fef469a Notification moved to usage of the "tag" table 2020-05-01 12:41:17 +00:00
Michael
029a379060 Move "isType" to Tag.php 2020-05-01 12:39:41 +00:00