]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge remote-tracking branch 'upstream/develop' into archive-contact
Michael [Mon, 4 Dec 2017 19:05:53 +0000 (19:05 +0000)]
Merge remote-tracking branch 'upstream/develop' into archive-contact

6 years agoArchive and unarchive contacts
Michael [Mon, 4 Dec 2017 19:04:50 +0000 (19:04 +0000)]
Archive and unarchive contacts

6 years agoMerge pull request #4006 from zeroadam/Pidfile-#3878
Michael Vogel [Mon, 4 Dec 2017 18:59:41 +0000 (19:59 +0100)]
Merge pull request #4006 from zeroadam/Pidfile-#3878

Pidfile to src

6 years agoPidfile to src
Adam Magness [Mon, 4 Dec 2017 18:12:22 +0000 (13:12 -0500)]
Pidfile to src

Move pidfile to Friendica\Util namespace

6 years agoMerge pull request #4005 from zeroadam/Features-#3878
Hypolite Petovan [Mon, 4 Dec 2017 14:41:01 +0000 (09:41 -0500)]
Merge pull request #4005 from zeroadam/Features-#3878

Features to src

6 years agoStandards
Adam Magness [Mon, 4 Dec 2017 14:16:15 +0000 (09:16 -0500)]
Standards

Standards clean up.

6 years agoUpdate use statements
Adam Magness [Mon, 4 Dec 2017 14:04:36 +0000 (09:04 -0500)]
Update use statements

update use statements for rename to singular.

6 years agoRename to singular
Adam Magness [Mon, 4 Dec 2017 14:01:27 +0000 (09:01 -0500)]
Rename to singular

Rename and update references. Standards and a require_once.

6 years agoFeatures to src
Adam Magness [Mon, 4 Dec 2017 13:33:49 +0000 (08:33 -0500)]
Features to src

Move Features to class in Friendica\Content namespace. Update function calls and references.

6 years agoMerge pull request #4003 from MrPetovan/task/3942-move-user-to-src
Michael Vogel [Mon, 4 Dec 2017 09:32:45 +0000 (10:32 +0100)]
Merge pull request #4003 from MrPetovan/task/3942-move-user-to-src

Migrate password hashing Part 2: Move include/user to src

6 years agoMerge pull request #4004 from annando/vitality-check
Hypolite Petovan [Mon, 4 Dec 2017 07:45:45 +0000 (02:45 -0500)]
Merge pull request #4004 from annando/vitality-check

Improved vitality check for followers, feeds and OStatus contacts

6 years agoImproved vitality check for followers, feeds and OStatus contacts
Michael [Mon, 4 Dec 2017 06:54:08 +0000 (06:54 +0000)]
Improved vitality check for followers, feeds and OStatus contacts

6 years agoRemove include/user
Hypolite Petovan [Mon, 4 Dec 2017 03:29:13 +0000 (22:29 -0500)]
Remove include/user

6 years agoUpdate function calls to use Model\User and Object\Contact
Hypolite Petovan [Mon, 4 Dec 2017 03:29:06 +0000 (22:29 -0500)]
Update function calls to use Model\User and Object\Contact

6 years agoAdd class methods derived from include/user functions
Hypolite Petovan [Mon, 4 Dec 2017 03:27:49 +0000 (22:27 -0500)]
Add class methods derived from include/user functions

- Add User::create
- Add User::sendRegisterPendingEmail
- Add User::sendRegisterOpenEmail
- Add Contact::createSelfFromUserId

6 years agoFix formatting and add documentation
Hypolite Petovan [Mon, 4 Dec 2017 03:15:31 +0000 (22:15 -0500)]
Fix formatting and add documentation

- mod/register
- mod/regmod
- Model/User
- Worker/CronJobs

6 years agoMerge pull request #4002 from annando/onepoll
Hypolite Petovan [Sun, 3 Dec 2017 13:57:43 +0000 (08:57 -0500)]
Merge pull request #4002 from annando/onepoll

Check Diaspora contacts, don't poll unreachable contacts too often

6 years agoMerge pull request #4001 from MrPetovan/bug/3999-fix-password-change
Michael Vogel [Sun, 3 Dec 2017 13:49:10 +0000 (14:49 +0100)]
Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change

Fix password change

6 years agoMerge remote-tracking branch 'upstream/develop' into onepoll
Michael [Sun, 3 Dec 2017 13:45:48 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/develop' into onepoll

6 years agoMerge pull request #3996 from annando/no-zot
Hypolite Petovan [Sun, 3 Dec 2017 13:40:29 +0000 (08:40 -0500)]
Merge pull request #3996 from annando/no-zot

Zot was never really supported, so it is now removed completely

6 years agoFix wrong condition
Hypolite Petovan [Sun, 3 Dec 2017 13:37:01 +0000 (08:37 -0500)]
Fix wrong condition

Grmbl

6 years agoFix formatting in mod/settings
Hypolite Petovan [Sun, 3 Dec 2017 13:36:39 +0000 (08:36 -0500)]
Fix formatting in mod/settings

6 years agoAdded description to networks, renaming some network names
Michael [Sun, 3 Dec 2017 13:26:52 +0000 (13:26 +0000)]
Added description to networks, renaming some network names

6 years agoMerge pull request #4000 from hoergen/develop
Michael Vogel [Sun, 3 Dec 2017 13:16:39 +0000 (14:16 +0100)]
Merge pull request #4000 from hoergen/develop

plusminus - removed blockquote borders, adjusted font size on several…

6 years agoplusminus - removed blockquote borders, adjusted font size on several elements and...
hoergen [Sun, 3 Dec 2017 12:39:56 +0000 (13:39 +0100)]
plusminus - removed blockquote borders, adjusted font size on several elements and classes

6 years agoMerge pull request #3998 from tobiasd/20171203-install
Michael Vogel [Sun, 3 Dec 2017 09:31:12 +0000 (10:31 +0100)]
Merge pull request #3998 from tobiasd/20171203-install

missing word

6 years agomissing word
Tobias Diekershoff [Sun, 3 Dec 2017 09:26:26 +0000 (10:26 +0100)]
missing word

6 years agoNETWORK_MAIL2 was never finished, so remove it as well
Michael [Sun, 3 Dec 2017 09:19:58 +0000 (09:19 +0000)]
NETWORK_MAIL2 was never finished, so remove it as well

6 years agoCheck Diaspora contacts, don't poll unreachable contacts too often
Michael [Sun, 3 Dec 2017 08:59:24 +0000 (08:59 +0000)]
Check Diaspora contacts, don't poll unreachable contacts too often

6 years agoMerge pull request #3997 from tobiasd/20171203-admin
Michael Vogel [Sun, 3 Dec 2017 08:23:58 +0000 (09:23 +0100)]
Merge pull request #3997 from tobiasd/20171203-admin

wrong URL in directory

6 years agowrong URL in directory
Tobias Diekershoff [Sun, 3 Dec 2017 07:27:15 +0000 (08:27 +0100)]
wrong URL in directory

6 years agoZot was never really supported, so it is now removed completely
Michael [Sat, 2 Dec 2017 21:57:39 +0000 (21:57 +0000)]
Zot was never really supported, so it is now removed completely

6 years agoMerge pull request #3986 from MrPetovan/task/admin-block-list
Michael Vogel [Sat, 2 Dec 2017 21:09:04 +0000 (22:09 +0100)]
Merge pull request #3986 from MrPetovan/task/admin-block-list

Admin remote contact block list

6 years agoMerge pull request #3994 from zeroadam/Salmon-#3878
Hypolite Petovan [Sat, 2 Dec 2017 15:21:08 +0000 (10:21 -0500)]
Merge pull request #3994 from zeroadam/Salmon-#3878

Salmon move to src

6 years agoSalmon move to src
Adam Magness [Sat, 2 Dec 2017 14:32:45 +0000 (09:32 -0500)]
Salmon move to src

Salmon class, update function name and function calls. Some standards as well.

6 years agoMove includes around in global_community_block
Hypolite Petovan [Sat, 2 Dec 2017 13:43:13 +0000 (08:43 -0500)]
Move includes around in global_community_block

6 years agoRemove unused use statement
Hypolite Petovan [Sat, 2 Dec 2017 13:42:44 +0000 (08:42 -0500)]
Remove unused use statement

6 years agoMerge pull request #3993 from zeroadam/Email-#3878
Michael Vogel [Sat, 2 Dec 2017 12:03:43 +0000 (13:03 +0100)]
Merge pull request #3993 from zeroadam/Email-#3878

Email to src

6 years agoImprove page contacblock for frio theme
Hypolite Petovan [Sat, 2 Dec 2017 03:33:04 +0000 (22:33 -0500)]
Improve page contacblock for frio theme

6 years agoUse Contact::getIdForURL instead of probing
Hypolite Petovan [Sat, 2 Dec 2017 03:32:24 +0000 (22:32 -0500)]
Use Contact::getIdForURL instead of probing

- Add change to mod/admin
- Add change to util/global_community_block

6 years agoMerge branch 'develop' into task/admin-block-list
Hypolite Petovan [Sat, 2 Dec 2017 02:39:20 +0000 (21:39 -0500)]
Merge branch 'develop' into task/admin-block-list

6 years agoReview Changes
Adam Magness [Sat, 2 Dec 2017 02:05:06 +0000 (21:05 -0500)]
Review Changes

renamed some functions and adjusted corresponding calls.

6 years agoMerge pull request #3992 from zeroadam/Photo-hotfix
Hypolite Petovan [Sat, 2 Dec 2017 00:07:29 +0000 (19:07 -0500)]
Merge pull request #3992 from zeroadam/Photo-hotfix

Use Exception

6 years agoUse Exception
Adam Magness [Fri, 1 Dec 2017 23:47:52 +0000 (18:47 -0500)]
Use Exception

use exception

6 years agoCode Cleanup
Adam Magness [Fri, 1 Dec 2017 23:13:39 +0000 (18:13 -0500)]
Code Cleanup

Standards clean up

6 years agoRequire Cleanup
Adam Magness [Fri, 1 Dec 2017 19:57:13 +0000 (14:57 -0500)]
Require Cleanup

Remove instances of require_once for email.php

6 years agoEmail to src
Adam Magness [Fri, 1 Dec 2017 19:41:27 +0000 (14:41 -0500)]
Email to src

Create Email class and update/rename functions and function calls.

6 years agoMerge pull request #3991 from MrPetovan/bug/undefined-variables
Michael Vogel [Fri, 1 Dec 2017 14:10:29 +0000 (15:10 +0100)]
Merge pull request #3991 from MrPetovan/bug/undefined-variables

Fix undefined variables messages

6 years agoFix undefined variables messages
Hypolite Petovan [Fri, 1 Dec 2017 13:32:21 +0000 (08:32 -0500)]
Fix undefined variables messages

6 years agoMerge pull request #3987 from friendica/fabrixxm-patch-1
Tobias Diekershoff [Fri, 1 Dec 2017 09:14:15 +0000 (10:14 +0100)]
Merge pull request #3987 from friendica/fabrixxm-patch-1

Missing 'use' in scripts/dbstructure

6 years agoMissing 'use' in scripts/dbstructure
fabrixxm [Fri, 1 Dec 2017 08:35:05 +0000 (09:35 +0100)]
Missing 'use' in scripts/dbstructure

6 years agoMerge branch 'develop' into task/admin-block-list
Hypolite Petovan [Fri, 1 Dec 2017 05:51:02 +0000 (00:51 -0500)]
Merge branch 'develop' into task/admin-block-list

6 years agoMerge branch 'develop' into task/admin-block-list
Hypolite Petovan [Fri, 1 Dec 2017 05:48:13 +0000 (00:48 -0500)]
Merge branch 'develop' into task/admin-block-list

6 years agoAdd admin/contactblock page
Hypolite Petovan [Fri, 1 Dec 2017 05:43:39 +0000 (00:43 -0500)]
Add admin/contactblock page

- Add page template

6 years agoAdd block/unblock methods to Contact class
Hypolite Petovan [Fri, 1 Dec 2017 05:41:26 +0000 (00:41 -0500)]
Add block/unblock methods to Contact class

6 years agoMove admin templates to dedicated sub-folder
Hypolite Petovan [Fri, 1 Dec 2017 05:40:55 +0000 (00:40 -0500)]
Move admin templates to dedicated sub-folder

6 years agoImproved translation functions
Hypolite Petovan [Fri, 1 Dec 2017 05:35:40 +0000 (00:35 -0500)]
Improved translation functions

- Add built-in vsprintf to t()
- Add built-in sprintf to tt()

6 years agoImprove dba
Hypolite Petovan [Fri, 1 Dec 2017 05:34:54 +0000 (00:34 -0500)]
Improve dba

- Add dba::count
- Add support for LIMIT X,X

6 years agoMerge pull request #3982 from zeroadam/Photo-#3878
Hypolite Petovan [Fri, 1 Dec 2017 01:33:48 +0000 (20:33 -0500)]
Merge pull request #3982 from zeroadam/Photo-#3878

Photo to src

6 years agoStatic
Adam Magness [Thu, 30 Nov 2017 18:51:04 +0000 (13:51 -0500)]
Static

update functions and check calls.

6 years agoObject error
Adam Magness [Thu, 30 Nov 2017 12:48:47 +0000 (07:48 -0500)]
Object error

Uncaught Error: Using $this when not in object context

6 years agoReplace function
Adam Magness [Thu, 30 Nov 2017 12:40:20 +0000 (07:40 -0500)]
Replace function

Replace function used by addon

6 years agoFix mod/admin.php formatting
Hypolite Petovan [Thu, 30 Nov 2017 01:28:30 +0000 (20:28 -0500)]
Fix mod/admin.php formatting

6 years agoMerge pull request #3985 from hoergen/develop
Hypolite Petovan [Wed, 29 Nov 2017 23:59:58 +0000 (18:59 -0500)]
Merge pull request #3985 from hoergen/develop

Plusminus vier theme: Added some styles and removed typos

6 years agoPrivate to public
Adam Magness [Wed, 29 Nov 2017 23:37:32 +0000 (18:37 -0500)]
Private to public

change function to public as it's called from elsewhere

6 years agoadded some styles and removed typos
hoergen [Wed, 29 Nov 2017 23:13:16 +0000 (00:13 +0100)]
added some styles and removed typos

6 years agoReview and Use statements
Adam Magness [Wed, 29 Nov 2017 22:29:11 +0000 (17:29 -0500)]
Review and Use statements

use statements and review changes.

6 years agoMerge pull request #3984 from annando/best_link_url
Hypolite Petovan [Wed, 29 Nov 2017 21:39:14 +0000 (16:39 -0500)]
Merge pull request #3984 from annando/best_link_url

Bugfix for "Call to undefined function best_link_url()"

6 years agoBugfix for "Call to undefined function best_link_url()"
Michael [Wed, 29 Nov 2017 21:27:39 +0000 (21:27 +0000)]
Bugfix for "Call to undefined function best_link_url()"

6 years agoMerge pull request #3983 from annando/nogroup
Hypolite Petovan [Wed, 29 Nov 2017 21:07:27 +0000 (16:07 -0500)]
Merge pull request #3983 from annando/nogroup

Small fixes to "nogroup"

6 years agoSmall fixes to "nogroup"
Michael [Wed, 29 Nov 2017 20:59:06 +0000 (20:59 +0000)]
Small fixes to "nogroup"

6 years agoMissed use dba
Adam Magness [Wed, 29 Nov 2017 18:04:58 +0000 (13:04 -0500)]
Missed use dba

added use dba

6 years agoFunction names
Adam Magness [Wed, 29 Nov 2017 17:17:12 +0000 (12:17 -0500)]
Function names

Update function names and corresponding function calls

6 years agoMerge pull request #3981 from hoergen/develop
Hypolite Petovan [Wed, 29 Nov 2017 16:52:46 +0000 (11:52 -0500)]
Merge pull request #3981 from hoergen/develop

added some more minimalism, added annotations, removed some blank lines

6 years agoremoved tabsi, removed some blank lines.
hoergen [Wed, 29 Nov 2017 16:43:09 +0000 (17:43 +0100)]
removed tabsi, removed some blank lines.

6 years agoadded some more minimalism, added annotations, removed some blank lines
hoergen [Wed, 29 Nov 2017 16:12:25 +0000 (17:12 +0100)]
added some more minimalism, added annotations, removed some blank lines

6 years agoPhoto to src
Adam Magness [Wed, 29 Nov 2017 12:52:27 +0000 (07:52 -0500)]
Photo to src

Move Photo to Friendica\Object namespace and replace require_once statments with use statements.

6 years agoMerge pull request #3978 from annando/always-threads
Tobias Diekershoff [Tue, 28 Nov 2017 19:19:18 +0000 (20:19 +0100)]
Merge pull request #3978 from annando/always-threads

Threads are now always enabled.

6 years agoThreads are now always enabled.
Michael [Tue, 28 Nov 2017 18:54:39 +0000 (18:54 +0000)]
Threads are now always enabled.

6 years agoMerge pull request #3977 from tobiasd/20171128-docde
Michael Vogel [Tue, 28 Nov 2017 18:28:50 +0000 (19:28 +0100)]
Merge pull request #3977 from tobiasd/20171128-docde

Events doc is not in DE, but had a from link to the doc home page

6 years agoEvents doc is not in DE, but had a from link to the doc home page
Tobias Diekershoff [Tue, 28 Nov 2017 13:29:50 +0000 (14:29 +0100)]
Events doc is not in DE, but had a from link to the doc home page

6 years agoMerge pull request #3976 from rabuzarus/20171126_-_acl_forum
Michael Vogel [Tue, 28 Nov 2017 06:33:46 +0000 (07:33 +0100)]
Merge pull request #3976 from rabuzarus/20171126_-_acl_forum

acl: only one forum account should be selectable

6 years agoacl: only one forum account should be selectable
rabuzarus [Tue, 28 Nov 2017 00:08:03 +0000 (01:08 +0100)]
acl: only one forum account should be selectable

6 years agoHotfix missing use dba
Hypolite Petovan [Mon, 27 Nov 2017 19:03:47 +0000 (14:03 -0500)]
Hotfix missing use dba

6 years agoMerge pull request #3974 from tobiasd/20171127-credits
Hypolite Petovan [Mon, 27 Nov 2017 18:28:28 +0000 (13:28 -0500)]
Merge pull request #3974 from tobiasd/20171127-credits

regen credits

6 years agoMerge pull request #3973 from tobiasd/20171127-utilconfig
Hypolite Petovan [Mon, 27 Nov 2017 18:28:06 +0000 (13:28 -0500)]
Merge pull request #3973 from tobiasd/20171127-utilconfig

config tool needed some touch up to work again

6 years agoMerge pull request #3975 from tobiasd/20171127-tagcloud
Hypolite Petovan [Mon, 27 Nov 2017 18:22:32 +0000 (13:22 -0500)]
Merge pull request #3975 from tobiasd/20171127-tagcloud

missing false for the tagcloud settings

6 years agomissing false for the tagcloud settings
Tobias Diekershoff [Mon, 27 Nov 2017 18:20:43 +0000 (19:20 +0100)]
missing false for the tagcloud settings

6 years agoregen credits
Tobias Diekershoff [Mon, 27 Nov 2017 17:42:05 +0000 (18:42 +0100)]
regen credits

6 years agoconfig tool needed some touch up to work again
Tobias Diekershoff [Mon, 27 Nov 2017 17:27:57 +0000 (18:27 +0100)]
config tool needed some touch up to work again

6 years agoMerge pull request #3970 from MrPetovan/task/3942-add-user-authenticate
Michael Vogel [Mon, 27 Nov 2017 14:14:36 +0000 (15:14 +0100)]
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate

Migrate password hashing Part 1: Add User::authenticate

6 years agoImproved dba calls
Hypolite Petovan [Mon, 27 Nov 2017 13:17:56 +0000 (08:17 -0500)]
Improved dba calls

- Removed intval calls
- Used boolean values for params when relevant

6 years agoMerge pull request #3972 from tobiasd/20171127-messages
Michael Vogel [Mon, 27 Nov 2017 09:28:13 +0000 (10:28 +0100)]
Merge pull request #3972 from tobiasd/20171127-messages

regenerated master messages.po file

7 years agoregenerated master messages.po file
Tobias Diekershoff [Mon, 27 Nov 2017 08:26:44 +0000 (09:26 +0100)]
regenerated master messages.po file

7 years agoMerge pull request #3971 from annando/no_template_escape
Tobias Diekershoff [Mon, 27 Nov 2017 06:49:55 +0000 (07:49 +0100)]
Merge pull request #3971 from annando/no_template_escape

The function "template_escape" doesn't exist anymore.

7 years agoThe function "template_escape" doesn't exist anymore.
Michael [Mon, 27 Nov 2017 06:44:49 +0000 (06:44 +0000)]
The function "template_escape" doesn't exist anymore.

7 years agoMerge pull request #3969 from annando/bugfix-picture-forum
Hypolite Petovan [Sun, 26 Nov 2017 22:47:14 +0000 (17:47 -0500)]
Merge pull request #3969 from annando/bugfix-picture-forum

Posting images to public forums now really does work.

7 years agoMerge pull request #3968 from hoergen/develop
Hypolite Petovan [Sun, 26 Nov 2017 22:46:43 +0000 (17:46 -0500)]
Merge pull request #3968 from hoergen/develop

added new style sheet to theme vier

7 years agoPosting images to public forums now really does work.
Michael [Sun, 26 Nov 2017 22:28:46 +0000 (22:28 +0000)]
Posting images to public forums now really does work.

7 years agoremoved blank lines
hoergen [Sun, 26 Nov 2017 20:56:39 +0000 (21:56 +0100)]
removed blank lines