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

17565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fabrixxm 1064da1052 New home/login page style 2018-01-14 18:45:00 +01:00
Michael Vogel 4000e81f1b
Merge pull request #4223 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix formatting in dfrn_confirm and a few other files
 2018-01-14 16:20:23 +01:00
Michael 98edd826ac Increased database version 2018-01-14 15:14:16 +00:00
Michael fabe79a798 Reworked and unified database structure, added comments 2018-01-14 15:13:00 +00:00
Hypolite Petovan 39c036e6ba Fix implode Warning in Diaspora 2018-01-14 09:05:06 -05:00
Hypolite Petovan 4dafdda99e Fix Deprecated error message 2018-01-14 09:04:46 -05:00
Hypolite Petovan c89129ad20 Fix typo when referring to dba::exists 2018-01-13 23:46:59 -05:00
Hypolite Petovan c66af117b3 Fix Scrutinizer issues in contacts/credits/crepair 
- Add back uninitialized variables
- Fix formatting
- Use dba::selectFirst whenever possible
 2018-01-13 23:46:59 -05:00
Hypolite Petovan adfabeadb1 Rename param to condition in dba::delete 
- Fix formatting
- Use new array syntax
 2018-01-13 23:46:59 -05:00
Hypolite Petovan e3b69f97cf Fix formatting in mod/delegate 
- Remove parentheses from language construct
- Add missing braces
- Use dba::* when possible
- Capitalize SQL queries keywords
- Use new array syntax
 2018-01-13 23:46:58 -05:00
Hypolite Petovan f588adb511 Fix formatting in dfrn_confirm 
- Add missing braces
- Use dba::selectFirst whenever possible
- Initialize missing variables
- Remove unused variables
- Use defaults instead of ternary operator
- Simplify sprintf(t()) structure
 2018-01-13 23:46:58 -05:00
Adam Magness e70e48abaa constant 
move define to const
 2018-01-13 13:10:14 -05:00
Adam Magness 9e81d3dc40 Attempt anonymous 
Try anonymous function based on review suggestion.
 2018-01-13 13:08:18 -05:00
Hypolite Petovan f97752383a
Merge pull request #4226 from zeroadam/Redir-#3878 
Move redir to src
 2018-01-13 12:42:38 -05:00
Adam Magness 4e7657da99 Remove redir.php 
remove old file
 2018-01-13 09:41:26 -05:00
Adam Magness 7635421d78 Update function calls 
update function calls and remove require_once
 2018-01-13 09:40:34 -05:00
Adam Magness 771163e860 Move auto_redir function 
move function into dfrn, rename and update a db insert
 2018-01-13 09:36:21 -05:00
Adam Magness 88aeddab82 Remove old file 
Remove include/uimport.php
 2018-01-13 09:15:45 -05:00
Adam Magness c1baa5ed7d Update functions 
Update function names and calls. update database functions to dba class calls.
 2018-01-13 09:14:37 -05:00
Adam Magness f5d2b83938 Create UserImport 
Create new class and copy over functions
Add missed function
 2018-01-13 09:01:32 -05:00
Hypolite Petovan 44a2ec439e
Merge pull request #4220 from annando/receive_participation 
Receive participation messages and processes them
 2018-01-13 07:46:59 -05:00
Michael a78cbf6174 The changed field name has to be changed here as well 2018-01-13 09:19:57 +00:00
Michael 915419ace3 Merge remote-tracking branch 'upstream/develop' into receive_participation 2018-01-13 08:29:44 +00:00
Michael Vogel 725bb9641a
Merge pull request #4224 from friendica/fabrixxm-patch-api-login 
Fix api login
 2018-01-13 09:28:17 +01:00
fabrixxm 2d0fe7a30f
Fix api login 2018-01-13 09:22:40 +01:00
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