]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #4247 from zeroadam/ProfileSel-#3878
Hypolite Petovan [Mon, 15 Jan 2018 16:34:35 +0000 (11:34 -0500)]
Merge pull request #4247 from zeroadam/ProfileSel-#3878

Move profile_selector to src

6 years agoReview updates
Adam Magness [Mon, 15 Jan 2018 16:33:02 +0000 (11:33 -0500)]
Review updates

update array to short form syntax

6 years agoMerge pull request #4249 from MrPetovan/develop
Hypolite Petovan [Mon, 15 Jan 2018 15:40:50 +0000 (10:40 -0500)]
Merge pull request #4249 from MrPetovan/develop

Add use dba to Content\Widget

6 years agoAdd use dba to Content\Widget
Hypolite Petovan [Mon, 15 Jan 2018 15:39:27 +0000 (10:39 -0500)]
Add use dba to Content\Widget

6 years agoMerge pull request #4246 from zeroadam/Widget-#3878
Hypolite Petovan [Mon, 15 Jan 2018 15:27:42 +0000 (10:27 -0500)]
Merge pull request #4246 from zeroadam/Widget-#3878

Move contact_widgets to src

6 years agoRemove old file
Adam Magness [Mon, 15 Jan 2018 15:16:21 +0000 (10:16 -0500)]
Remove old file

remove include/profile_selectors.php

6 years agoUpdate functions and calls
Adam Magness [Mon, 15 Jan 2018 15:15:00 +0000 (10:15 -0500)]
Update functions and calls

Update function name and calls.

6 years agoFunctions to ContactSelector
Adam Magness [Mon, 15 Jan 2018 15:08:47 +0000 (10:08 -0500)]
Functions to ContactSelector

put function in ContactSelector class

6 years agoRemove old file
Adam Magness [Mon, 15 Jan 2018 14:50:45 +0000 (09:50 -0500)]
Remove old file

remove include/contact_widgets.php

6 years agoRename functions and calls
Adam Magness [Mon, 15 Jan 2018 14:50:06 +0000 (09:50 -0500)]
Rename functions and calls

Rename functions and update calls

6 years agoCreate Widget class
Adam Magness [Mon, 15 Jan 2018 14:22:01 +0000 (09:22 -0500)]
Create Widget class

create widget class in Friendica/Content.

6 years agoMerge pull request #4245 from zeroadam/Mimetype-#3878
Hypolite Petovan [Mon, 15 Jan 2018 14:17:15 +0000 (09:17 -0500)]
Merge pull request #4245 from zeroadam/Mimetype-#3878

Move attach to src

6 years agoMerge pull request #4241 from annando/network-update
Hypolite Petovan [Mon, 15 Jan 2018 14:16:00 +0000 (09:16 -0500)]
Merge pull request #4241 from annando/network-update

Update after comment on public post should now work on the network page

6 years agoDon't use count
Michael [Mon, 15 Jan 2018 14:02:34 +0000 (14:02 +0000)]
Don't use count

6 years agoMerge pull request #4244 from MrPetovan/develop
Michael Vogel [Mon, 15 Jan 2018 13:58:38 +0000 (14:58 +0100)]
Merge pull request #4244 from MrPetovan/develop

Composer: php-markdown updated to 1.8.0

6 years agoComposer: php-markdown updated to 1.8.0
Hypolite Petovan [Mon, 15 Jan 2018 13:56:45 +0000 (08:56 -0500)]
Composer: php-markdown updated to 1.8.0

- Classmaps updated

6 years agoRemove old file
Adam Magness [Mon, 15 Jan 2018 13:33:12 +0000 (08:33 -0500)]
Remove old file

remove include/attach.php

6 years agoFunction calls
Adam Magness [Mon, 15 Jan 2018 13:32:11 +0000 (08:32 -0500)]
Function calls

Rename function, update calls

6 years agoCreate mimetype class
Adam Magness [Mon, 15 Jan 2018 13:30:12 +0000 (08:30 -0500)]
Create mimetype class

move attach.php function to mimetype class

6 years agoMerge pull request #4240 from annando/sql-definition
Hypolite Petovan [Mon, 15 Jan 2018 12:37:13 +0000 (07:37 -0500)]
Merge pull request #4240 from annando/sql-definition

SQL structure had changed

6 years agoMerge pull request #4237 from zeroadam/Profile-#3878
Hypolite Petovan [Mon, 15 Jan 2018 12:32:30 +0000 (07:32 -0500)]
Merge pull request #4237 from zeroadam/Profile-#3878

Move identity to src

6 years agoSome SQL servers report different lengths for unsigned types
Michael [Mon, 15 Jan 2018 07:42:05 +0000 (07:42 +0000)]
Some SQL servers report different lengths for unsigned types

6 years agoMerge pull request #4238 from tobiasd/20180115-messages
Michael Vogel [Mon, 15 Jan 2018 07:04:16 +0000 (08:04 +0100)]
Merge pull request #4238 from tobiasd/20180115-messages

regenerated master messages.po file

6 years agoMerge pull request #4239 from tobiasd/20180115-2018
Michael Vogel [Mon, 15 Jan 2018 07:03:54 +0000 (08:03 +0100)]
Merge pull request #4239 from tobiasd/20180115-2018

Happy new year!

6 years agoUpdate after comment on public post should now work on the network page
Michael [Mon, 15 Jan 2018 06:59:20 +0000 (06:59 +0000)]
Update after comment on public post should now work on the network page

6 years agoHappy new year!
Tobias Diekershoff [Mon, 15 Jan 2018 06:45:12 +0000 (07:45 +0100)]
Happy new year!

6 years agoSQL structure had changed
Michael [Mon, 15 Jan 2018 06:43:28 +0000 (06:43 +0000)]
SQL structure had changed

6 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 15 Jan 2018 06:37:47 +0000 (07:37 +0100)]
regenerated master messages.po file

Signed-off-by: Tobias Diekershoff <tobias.diekershoff@gmx.net>
6 years agoMerge pull request #4235 from MrPetovan/task/4116-remove-library-oauth2
Michael Vogel [Mon, 15 Jan 2018 06:33:26 +0000 (07:33 +0100)]
Merge pull request #4235 from MrPetovan/task/4116-remove-library-oauth2

Delete unused library/oauth2-php library

6 years agoReview updates
Adam Magness [Mon, 15 Jan 2018 04:44:39 +0000 (23:44 -0500)]
Review updates

Update function name, descriptive variable names.

6 years agouse
Adam Magness [Mon, 15 Jan 2018 02:41:56 +0000 (21:41 -0500)]
use

6 years agoMore use
Adam Magness [Mon, 15 Jan 2018 02:38:26 +0000 (21:38 -0500)]
More use

more missing use statements

6 years agoMissing use
Adam Magness [Mon, 15 Jan 2018 02:29:19 +0000 (21:29 -0500)]
Missing use

missing use statement for profile

6 years agoRemove requires
Adam Magness [Mon, 15 Jan 2018 02:26:07 +0000 (21:26 -0500)]
Remove requires

remove requires_once statment

6 years agoRemove include/identity
Adam Magness [Mon, 15 Jan 2018 02:23:18 +0000 (21:23 -0500)]
Remove include/identity

remove no longer used file

6 years agoUpdate function calls
Adam Magness [Mon, 15 Jan 2018 02:22:39 +0000 (21:22 -0500)]
Update function calls

update function calls to use profile class

6 years agoMove include/identity to src
Adam Magness [Mon, 15 Jan 2018 01:13:02 +0000 (20:13 -0500)]
Move include/identity to src

Copy functions from identity to Profile class

6 years agoMerge pull request #4231 from MrPetovan/bug/3639-fix-diaspora-lf-in-code-blocks
Michael Vogel [Mon, 15 Jan 2018 00:37:13 +0000 (01:37 +0100)]
Merge pull request #4231 from MrPetovan/bug/3639-fix-diaspora-lf-in-code-blocks

Fix Diaspora LF in code blocks/Move php-markdown to composer

6 years agoDelete unused library/oauth2-php library
Hypolite Petovan [Mon, 15 Jan 2018 00:28:55 +0000 (19:28 -0500)]
Delete unused library/oauth2-php library

6 years agoMove library/markdown.php to src
Hypolite Petovan [Sun, 14 Jan 2018 23:59:08 +0000 (18:59 -0500)]
Move library/markdown.php to src

6 years agoImprove babel page display
Hypolite Petovan [Sun, 14 Jan 2018 18:13:36 +0000 (13:13 -0500)]
Improve babel page display

6 years agoImprove html2bbcode
Hypolite Petovan [Sun, 14 Jan 2018 18:13:16 +0000 (13:13 -0500)]
Improve html2bbcode

- trim code blocks
- Add <code> conversion to <code> (from Diaspora)

6 years agoExtend multi-line code blocks regular expression
Hypolite Petovan [Sun, 14 Jan 2018 18:12:29 +0000 (13:12 -0500)]
Extend multi-line code blocks regular expression

- Covers the case where there's no new line after the [code] tag

6 years agoRemove library/php-markdown
Hypolite Petovan [Sun, 14 Jan 2018 15:06:12 +0000 (10:06 -0500)]
Remove library/php-markdown

6 years agoAdd michelf/php-markdown to Composer
Hypolite Petovan [Sun, 14 Jan 2018 15:05:51 +0000 (10:05 -0500)]
Add michelf/php-markdown to Composer

6 years agoUpdate Composer version
Hypolite Petovan [Sun, 14 Jan 2018 15:04:23 +0000 (10:04 -0500)]
Update Composer version

6 years agoMerge pull request #4234 from annando/participation-2
Hypolite Petovan [Sun, 14 Jan 2018 23:57:05 +0000 (18:57 -0500)]
Merge pull request #4234 from annando/participation-2

On participation send all the old content of the thread

6 years agoOn participation send all the old content of the thread
Michael [Sun, 14 Jan 2018 22:53:00 +0000 (22:53 +0000)]
On participation send all the old content of the thread

6 years agoMerge pull request #4232 from fabrixxm/frio-login
Hypolite Petovan [Sun, 14 Jan 2018 22:22:36 +0000 (17:22 -0500)]
Merge pull request #4232 from fabrixxm/frio-login

[WIP] Frio: restyle login page

6 years agoMerge pull request #4225 from zeroadam/UserImport-#3878
Hypolite Petovan [Sun, 14 Jan 2018 22:21:26 +0000 (17:21 -0500)]
Merge pull request #4225 from zeroadam/UserImport-#3878

Move include/uimport to src

6 years agoMerge pull request #4229 from annando/database
Hypolite Petovan [Sun, 14 Jan 2018 22:16:20 +0000 (17:16 -0500)]
Merge pull request #4229 from annando/database

Reworked and unified database structure, added comments

6 years agoReview updates
Adam Magness [Sun, 14 Jan 2018 20:56:36 +0000 (15:56 -0500)]
Review updates

self:: const and fix up callback function and array_walk

6 years agospaces to tabs
fabrixxm [Sun, 14 Jan 2018 20:53:37 +0000 (21:53 +0100)]
spaces to tabs

6 years agoMerge pull request #4233 from MrPetovan/task/4116-move-smarty-to-composer
Michael Vogel [Sun, 14 Jan 2018 19:05:52 +0000 (20:05 +0100)]
Merge pull request #4233 from MrPetovan/task/4116-move-smarty-to-composer

Move Smarty to composer

6 years agoRemoved test output
Michael [Sun, 14 Jan 2018 19:02:27 +0000 (19:02 +0000)]
Removed test output

6 years agoFix formatting in include/friendica_smarty
Hypolite Petovan [Sun, 14 Jan 2018 18:36:48 +0000 (13:36 -0500)]
Fix formatting in include/friendica_smarty

6 years agoRemove library/Smarty
Hypolite Petovan [Sun, 14 Jan 2018 18:36:27 +0000 (13:36 -0500)]
Remove library/Smarty

6 years agoAdd Smarty to Composer
Hypolite Petovan [Sun, 14 Jan 2018 18:35:25 +0000 (13:35 -0500)]
Add Smarty to Composer

6 years agoFrio: add input for login backround image in admin settings
fabrixxm [Sun, 14 Jan 2018 18:19:24 +0000 (19:19 +0100)]
Frio: add input for login backround image in admin settings

6 years agoNew home/login page style
fabrixxm [Sun, 14 Jan 2018 17:45:00 +0000 (18:45 +0100)]
New home/login page style

6 years agoMerge pull request #4223 from MrPetovan/task/fix-scrutinizer-issues
Michael Vogel [Sun, 14 Jan 2018 15:20:23 +0000 (16:20 +0100)]
Merge pull request #4223 from MrPetovan/task/fix-scrutinizer-issues

[Scrutinizer] Fix formatting in dfrn_confirm and a few other files

6 years agoIncreased database version
Michael [Sun, 14 Jan 2018 15:14:16 +0000 (15:14 +0000)]
Increased database version

6 years agoReworked and unified database structure, added comments
Michael [Sun, 14 Jan 2018 15:13:00 +0000 (15:13 +0000)]
Reworked and unified database structure, added comments

6 years agoFix implode Warning in Diaspora
Hypolite Petovan [Sun, 14 Jan 2018 14:05:06 +0000 (09:05 -0500)]
Fix implode Warning in Diaspora

6 years agoFix Deprecated error message
Hypolite Petovan [Sun, 14 Jan 2018 14:04:46 +0000 (09:04 -0500)]
Fix Deprecated error message

6 years agoFix typo when referring to dba::exists
Hypolite Petovan [Sat, 13 Jan 2018 04:54:16 +0000 (23:54 -0500)]
Fix typo when referring to dba::exists

6 years agoFix Scrutinizer issues in contacts/credits/crepair
Hypolite Petovan [Sat, 13 Jan 2018 04:41:18 +0000 (23:41 -0500)]
Fix Scrutinizer issues in contacts/credits/crepair

- Add back uninitialized variables
- Fix formatting
- Use dba::selectFirst whenever possible

6 years agoRename param to condition in dba::delete
Hypolite Petovan [Sat, 13 Jan 2018 04:35:35 +0000 (23:35 -0500)]
Rename param to condition in dba::delete

- Fix formatting
- Use new array syntax

6 years agoFix formatting in mod/delegate
Hypolite Petovan [Sat, 13 Jan 2018 04:29:49 +0000 (23:29 -0500)]
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

6 years agoFix formatting in dfrn_confirm
Hypolite Petovan [Sat, 13 Jan 2018 04:23:51 +0000 (23:23 -0500)]
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

6 years agoconstant
Adam Magness [Sat, 13 Jan 2018 18:10:14 +0000 (13:10 -0500)]
constant

move define to const

6 years agoAttempt anonymous
Adam Magness [Sat, 13 Jan 2018 18:08:18 +0000 (13:08 -0500)]
Attempt anonymous

Try anonymous function based on review suggestion.

6 years agoMerge pull request #4226 from zeroadam/Redir-#3878
Hypolite Petovan [Sat, 13 Jan 2018 17:42:38 +0000 (12:42 -0500)]
Merge pull request #4226 from zeroadam/Redir-#3878

Move redir to src

6 years agoRemove redir.php
Adam Magness [Sat, 13 Jan 2018 14:41:26 +0000 (09:41 -0500)]
Remove redir.php

remove old file

6 years agoUpdate function calls
Adam Magness [Sat, 13 Jan 2018 14:40:34 +0000 (09:40 -0500)]
Update function calls

update function calls and remove require_once

6 years agoMove auto_redir function
Adam Magness [Sat, 13 Jan 2018 14:36:21 +0000 (09:36 -0500)]
Move auto_redir function

move function into dfrn, rename and update a db insert

6 years agoRemove old file
Adam Magness [Sat, 13 Jan 2018 14:15:45 +0000 (09:15 -0500)]
Remove old file

Remove include/uimport.php

6 years agoUpdate functions
Adam Magness [Sat, 13 Jan 2018 14:14:37 +0000 (09:14 -0500)]
Update functions

Update function names and calls. update database functions to dba class calls.

6 years agoCreate UserImport
Adam Magness [Sat, 13 Jan 2018 14:01:32 +0000 (09:01 -0500)]
Create UserImport

Create new class and copy over functions
Add missed function

6 years agoMerge pull request #4220 from annando/receive_participation
Hypolite Petovan [Sat, 13 Jan 2018 12:46:59 +0000 (07:46 -0500)]
Merge pull request #4220 from annando/receive_participation

Receive participation messages and processes them

6 years agoThe changed field name has to be changed here as well
Michael [Sat, 13 Jan 2018 09:19:57 +0000 (09:19 +0000)]
The changed field name has to be changed here as well

6 years agoMerge remote-tracking branch 'upstream/develop' into receive_participation
Michael [Sat, 13 Jan 2018 08:29:44 +0000 (08:29 +0000)]
Merge remote-tracking branch 'upstream/develop' into receive_participation

6 years agoMerge pull request #4224 from friendica/fabrixxm-patch-api-login
Michael Vogel [Sat, 13 Jan 2018 08:28:17 +0000 (09:28 +0100)]
Merge pull request #4224 from friendica/fabrixxm-patch-api-login

Fix api login

6 years agoFix api login
fabrixxm [Sat, 13 Jan 2018 08:22:40 +0000 (09:22 +0100)]
Fix api login

6 years agoMerge remote-tracking branch 'upstream/develop' into receive_participation
Michael [Sat, 13 Jan 2018 00:18:41 +0000 (00:18 +0000)]
Merge remote-tracking branch 'upstream/develop' into receive_participation

6 years agoMerge pull request #4216 from MrPetovan/bug/4173-fix-oembed-iframe-url
Michael Vogel [Fri, 12 Jan 2018 23:45:32 +0000 (00:45 +0100)]
Merge pull request #4216 from MrPetovan/bug/4173-fix-oembed-iframe-url

Fix link attachment display

6 years agoCorrected function name
Michael [Fri, 12 Jan 2018 23:43:08 +0000 (23:43 +0000)]
Corrected function name

6 years agoMerge pull request #4221 from annando/oembed-no-title
Hypolite Petovan [Fri, 12 Jan 2018 23:39:14 +0000 (18:39 -0500)]
Merge pull request #4221 from annando/oembed-no-title

Better treatment of Oembed detection with no OEmbed data and not title

6 years agoBetter treatment of Oembed detection with no OEmbed data and not title
Michael [Fri, 12 Jan 2018 23:32:58 +0000 (23:32 +0000)]
Better treatment of Oembed detection with no OEmbed data and not title

6 years agoChanged case
Michael [Fri, 12 Jan 2018 23:26:55 +0000 (23:26 +0000)]
Changed case

6 years agoAdded table definition
Michael [Fri, 12 Jan 2018 23:25:30 +0000 (23:25 +0000)]
Added table definition

6 years agoCorrected field names
Michael [Fri, 12 Jan 2018 23:20:19 +0000 (23:20 +0000)]
Corrected field names

6 years agocopy and paste ...
Michael [Fri, 12 Jan 2018 21:02:39 +0000 (21:02 +0000)]
copy and paste ...

6 years agoReceive participation messages and processes them
Michael [Fri, 12 Jan 2018 20:52:43 +0000 (20:52 +0000)]
Receive participation messages and processes them

6 years agoMerge pull request #4218 from hoergen/develop
Michael Vogel [Fri, 12 Jan 2018 07:24:32 +0000 (08:24 +0100)]
Merge pull request #4218 from hoergen/develop

Changes on popup menus

6 years agoMerge pull request #4217 from tobiasd/20180112-exitnano
Michael Vogel [Fri, 12 Jan 2018 07:20:51 +0000 (08:20 +0100)]
Merge pull request #4217 from tobiasd/20180112-exitnano

stray X causing PHP errors

6 years agoChanges on popup menus
hoergen [Fri, 12 Jan 2018 07:05:51 +0000 (08:05 +0100)]
Changes on popup menus

6 years agosray X cauing PHP errors
Tobias Diekershoff [Fri, 12 Jan 2018 05:55:14 +0000 (06:55 +0100)]
sray X cauing PHP errors

6 years agoFix attachment display
Hypolite Petovan [Fri, 12 Jan 2018 03:37:38 +0000 (22:37 -0500)]
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

6 years agoFallback to regular attachment display on oembed error
Hypolite Petovan [Fri, 12 Jan 2018 03:34:02 +0000 (22:34 -0500)]
Fallback to regular attachment display on oembed error