clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,190 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

18190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael ed9c50ea2e Merge remote-tracking branch 'upstream/develop' into receive_participation 2018-01-13 00:18:41 +00:00
Michael Vogel 70942202c0
Merge pull request #4216 from MrPetovan/bug/4173-fix-oembed-iframe-url 
Fix link attachment display
 2018-01-13 00:45:32 +01:00
Michael b638ed9e86 Corrected function name 2018-01-12 23:43:08 +00:00
Hypolite Petovan 779f6601f4
Merge pull request #4221 from annando/oembed-no-title 
Better treatment of Oembed detection with no OEmbed data and not title
 2018-01-12 18:39:14 -05:00
Michael 2c90c5be94 Better treatment of Oembed detection with no OEmbed data and not title 2018-01-12 23:32:58 +00:00
Michael 06751470ce Changed case 2018-01-12 23:26:55 +00:00
Michael 4c104a6cc2 Added table definition 2018-01-12 23:25:30 +00:00
Michael fc9453b7e9 Corrected field names 2018-01-12 23:20:19 +00:00
Michael 9e37b49bea copy and paste ... 2018-01-12 21:02:39 +00:00
Michael 3c027699a5 Receive participation messages and processes them 2018-01-12 20:52:43 +00:00
Michael Vogel 85eaa002a2
Merge pull request #4218 from hoergen/develop 
Changes on popup menus
 2018-01-12 08:24:32 +01:00
Michael Vogel 04ffdd9ec0
Merge pull request #4217 from tobiasd/20180112-exitnano 
stray X causing PHP errors
 2018-01-12 08:20:51 +01:00
hoergen 1f8b9b68e5 Changes on popup menus 2018-01-12 08:05:51 +01:00
Tobias Diekershoff 61bdb7c1d6 sray X cauing PHP errors 2018-01-12 06:55:14 +01:00
Hypolite Petovan 93355b574d Fix attachment display 
- Move autolink before any potential OEmbed injection
- Add original URL attribute to invalid href and src
- Add loop to video to enable animated gifs
- Add URL domain to link attachments
- Hide link attachment description if equals the title
- Change attachment span to div to respect block order
 2018-01-11 22:37:38 -05:00
Hypolite Petovan 77c1251d03 Fallback to regular attachment display on oembed error 2018-01-11 22:34:02 -05:00
Hypolite Petovan b01daf18c5 Fix formatting of get_attachment_data() 2018-01-11 22:29:56 -05:00
Hypolite Petovan 34b80227e8
Merge pull request #4215 from annando/tag-net 
Filtering by network type in hash tag following is now possible
 2018-01-11 19:34:36 -05:00
Hypolite Petovan 5c6ee6ea26
Merge pull request #4214 from annando/fix-silence 
Silencing an account does work again
 2018-01-11 19:30:51 -05:00
Hypolite Petovan 772cd6686e
Merge pull request #4213 from annando/feed-information 
Add the feed link to the body when not present in the feed
 2018-01-11 19:29:40 -05:00
Michael eee3ae9617 Only filter for hash tags on federated networks 2018-01-12 00:23:45 +00:00
Michael e52a2edcf4 Filtering by network type in hash tag following is now possible 2018-01-12 00:14:58 +00:00
Michael dfe11b1863 Silencing an account does work again 2018-01-11 23:56:33 +00:00
Michael 1068091bbe Add the feed link to the body when not present in the feed 2018-01-11 22:57:31 +00:00
Hypolite Petovan ef09f7f958
Merge pull request #4212 from annando/develop 
Unbalanced HTML ...
 2018-01-11 17:55:45 -05:00
Michael dc45bc3c84 Merge remote-tracking branch 'upstream/develop' into develop 2018-01-11 22:51:53 +00:00
Hypolite Petovan c4db9edbe1
Merge pull request #4211 from annando/develop 
bookmark elements weren't always parsed correctly
 2018-01-11 17:51:10 -05:00
Michael c0eecfc55f Unbalanced html fixed 2018-01-11 22:34:56 +00:00
Michael e18e081b47 bookmark elements weren't always parsed correctly 2018-01-11 22:28:46 +00:00
Hypolite Petovan 5f229e6030
Merge pull request #4210 from annando/fix-notification 
Bugfix: The name of the item owner was empty in notifications
 2018-01-11 17:14:42 -05:00
Michael 6f1b1aee4b Bugfix: The name of the item owner was empty in notifications 2018-01-11 22:07:41 +00:00
Hypolite Petovan d74292b7e1
Merge pull request #4209 from annando/oembed-link 
When no OEmbedding is wanted, the links are now created fine again
 2018-01-11 16:39:25 -05:00
Michael a7b2db5db9 When no OEmbedding is wanted, the links are now created fine again 2018-01-11 21:31:44 +00:00
Michael Vogel 91198cb53d
Merge pull request #4206 from MrPetovan/task/fix-scrutinizer-issues 
Improve dba::selectFirst calls
 2018-01-11 20:35:41 +01:00
Hypolite Petovan c54a2c1e83
Merge pull request #4208 from annando/thr-parent 
When commenting on comments, the comment now appears under the comment
 2018-01-11 14:21:24 -05:00
Michael 220106c90a When commenting on comments, the comment now appears again under the comment 2018-01-11 19:17:40 +00:00
Hypolite Petovan 5ccbc95cef Guard dba::lastInsertId() with result conditions 2018-01-11 03:49:02 -05:00
Hypolite Petovan ed2ac8dc03 Fix formatting in NotificationsManager and Model\Contact 2018-01-11 03:43:57 -05:00
Hypolite Petovan 5fc4927764 Improve dba::selectFirst calls 
- Fix remaining $r[0] references
- Rename $r to meaningful names
 2018-01-11 03:43:57 -05:00
Michael Vogel 465e1d6a5c
Merge pull request #4191 from MrPetovan/bug/4173-fix-oembed-iframe-url 
Fix oembed iframe url for Facebook attachments
 2018-01-11 08:11:01 +01:00
Michael Vogel 10b4171b36
Merge pull request #4205 from MrPetovan/bug/4200-fix-contact-selectfirst 
Fix selectFirst usage in Model\Contact
 2018-01-11 06:00:04 +01:00
Hypolite Petovan 3f078d81ce Fix selectFirst usage in Model\Contact 2018-01-10 20:13:51 -05:00
Hypolite Petovan ebbf6089b4 Add database doc about the new oembed.maxwidth field 2018-01-10 19:25:08 -05:00
Hypolite Petovan 2f2ded4e55 [frio] Set videowidth to 622px 2018-01-10 19:25:08 -05:00
Hypolite Petovan 5691564220 Trust OEmbed HTML when it's available 
- Reworked bb_attachment() to trust OEmbed content when it's
successfully pulled
- Fix coding standard by renaming parameter and variables
 2018-01-10 19:25:08 -05:00
Hypolite Petovan da9523ed23 Add maxwidth column to oembed table 
- Match Caching key for OEmbed queries
 2018-01-10 19:25:08 -05:00
Hypolite Petovan 47e0900220
Merge pull request #4202 from rabuzarus/20180110_-_init_app_in_sessionAuth 
Bugfix: getApp() in sessionAuth()
 2018-01-10 19:14:44 -05:00
rabuzarus 1bce1b57eb convert line endings 2018-01-11 01:06:00 +01:00
Hypolite Petovan b8fc30e061
Merge pull request #4204 from annando/issue-4200 
Issue 4200: Adding new contacts not possible
 2018-01-10 17:59:15 -05:00
Michael fa9b7a4dcc Issue 4200: Adding new contacts not possible 2018-01-10 22:56:06 +00:00