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

506 Commits

Author SHA1 Message Date
Hypolite Petovan 64e3dbfaa4
Merge pull request #4225 from zeroadam/UserImport-#3878 
Move include/uimport to src
 2018-01-14 17:21:26 -05:00
Hypolite Petovan b3c304c210
Merge pull request #4229 from annando/database 
Reworked and unified database structure, added comments
 2018-01-14 17:16:20 -05:00
Adam Magness 8be6989bd1 Review updates 
self:: const and fix up callback function and array_walk
 2018-01-14 15:56:36 -05:00
Michael de7dbdff14 Removed test output 2018-01-14 19:02:27 +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
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
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 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
Michael a78cbf6174 The changed field name has to be changed here as well 2018-01-13 09:19:57 +00: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
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 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
Tobias Diekershoff 61bdb7c1d6 sray X cauing PHP errors 2018-01-12 06:55:14 +01:00
Hypolite Petovan 77c1251d03 Fallback to regular attachment display on oembed error 2018-01-11 22:34:02 -05:00
Michael 1068091bbe Add the feed link to the body when not present in the feed 2018-01-11 22:57:31 +00: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
Michael a7b2db5db9 When no OEmbedding is wanted, the links are now created fine again 2018-01-11 21:31:44 +00: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
Hypolite Petovan 3f078d81ce Fix selectFirst usage in Model\Contact 2018-01-10 20:13:51 -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
Michael fa9b7a4dcc Issue 4200: Adding new contacts not possible 2018-01-10 22:56:06 +00:00
rabuzarus d123a6523d I shouldn't try to code today 2018-01-10 23:18:04 +01:00
rabuzarus b1ae8151c2 fix a silly mistake 2018-01-10 22:57:27 +01:00
rabuzarus 4d5581a9d1 use self::getApp()->contact 2018-01-10 22:39:42 +01:00
rabuzarus 186b6330b9 Bugfix: getApp() in sessionAuth() 2018-01-10 22:21:22 +01:00
Michael Vogel d23c1c0da7
Merge pull request #4194 from MrPetovan/task/fix-scrutinizer-issues 
Replace dba::select(limit => 1) by dba::selectFirst()
 2018-01-10 22:16:02 +01:00
Hypolite Petovan b007f586dd
Merge pull request #4201 from annando/commenting-on-tags 
Commenting on postings from tags on the network page does work now
 2018-01-10 16:13:53 -05:00
Michael 0ef83b2383 Commenting on postings from tags on the network page does work now 2018-01-10 21:08:23 +00:00
Hypolite Petovan 1fda0ae4ae Replace select(limit => 1) by selectFirst() in Model\Term and include/enotify 
- Add new array declaration syntax
- Add braces
 2018-01-10 13:04:00 -05:00
Hypolite Petovan ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan da60893590 Replace dba::select(limit => 1) by dba::selectOne 
- Convert array declarations to new style
 2018-01-10 12:57:21 -05:00
Adam Magness 594461189b Review updates 
require_once, foreach braces, new line EOF, and remove unneeded function.
 2018-01-10 12:51:51 -05:00
Adam Magness 483c4e3803 selectFirst 
dba::selectFirst hasn't been merged yet!
 2018-01-10 12:08:56 -05:00
Adam Magness dc175b8e12 Update functions and calls 
Change function names, calls and use dba functions.
 2018-01-10 12:05:20 -05:00
Adam Magness 55ee9a1c72 Move files to src 
Move files.php and create Term class
 2018-01-10 11:46:05 -05:00
Hypolite Petovan 3f3e1c78dd
Merge pull request #4193 from annando/item-unification 
We now are using a single function to store items
 2018-01-10 09:11:36 -05:00
Adam Magness 1f1a16b6b2 Review Updates 
Remove unused function. Add function headers.
 2018-01-10 07:14:45 -05:00