]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoRevert "Add new legacy password field"
Hypolite Petovan [Sun, 26 Nov 2017 20:45:59 +0000 (15:45 -0500)]
Revert "Add new legacy password field"

This reverts commit 2236f60cfa5814f74719ecb2641130cb32e6aa36.

6 years agoForgotten change in src/Worker/Queue.php
Hypolite Petovan [Sun, 26 Nov 2017 19:56:50 +0000 (14:56 -0500)]
Forgotten change in src/Worker/Queue.php

6 years agoRemove unused upubkey and uprvkey from queries
Hypolite Petovan [Sun, 26 Nov 2017 19:55:47 +0000 (14:55 -0500)]
Remove unused upubkey and uprvkey from queries

- Switched queries to new dba::* functions

6 years agoSwitch to User::authenticate
Hypolite Petovan [Sun, 26 Nov 2017 19:46:08 +0000 (14:46 -0500)]
Switch to User::authenticate

- Removed hash('whirlpool') to check password

6 years agoAdd User::authenticate()
Hypolite Petovan [Sun, 26 Nov 2017 19:25:25 +0000 (14:25 -0500)]
Add User::authenticate()

6 years agoFix formatting
Hypolite Petovan [Sun, 26 Nov 2017 19:18:45 +0000 (14:18 -0500)]
Fix formatting

- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php

6 years agoAdd new legacy password field
Hypolite Petovan [Sat, 25 Nov 2017 23:05:32 +0000 (18:05 -0500)]
Add new legacy password field

6 years agoMerge pull request #3957 from tobiasd/20171125-docEvents
Hypolite Petovan [Sat, 25 Nov 2017 22:58:16 +0000 (17:58 -0500)]
Merge pull request #3957 from tobiasd/20171125-docEvents

calendar documentation

6 years agoMerge pull request #3956 from tobiasd/20171125-FAQlinks
Hypolite Petovan [Sat, 25 Nov 2017 22:57:00 +0000 (17:57 -0500)]
Merge pull request #3956 from tobiasd/20171125-FAQlinks

updated links to Friendiqa

6 years agoadded German translation to the events documentation, THX Ratten
Tobias Diekershoff [Sat, 25 Nov 2017 21:57:00 +0000 (22:57 +0100)]
added German translation to the events documentation, THX Ratten

6 years agoexport cal is now in core
Tobias Diekershoff [Sat, 25 Nov 2017 20:57:19 +0000 (21:57 +0100)]
export cal is now in core

6 years agoupdated links to Friendiqa
Tobias Diekershoff [Sat, 25 Nov 2017 20:43:36 +0000 (21:43 +0100)]
updated links to Friendiqa

6 years agoMerge pull request #3955 from silke/develop
Tobias Diekershoff [Sat, 25 Nov 2017 17:16:30 +0000 (18:16 +0100)]
Merge pull request #3955 from silke/develop

Markdown formatting and minor changes

6 years agoMarkdown formatting and minor changes
Silke Meyer [Sat, 25 Nov 2017 16:26:36 +0000 (17:26 +0100)]
Markdown formatting and minor changes

6 years agoMerge pull request #3952 from tobiasd/20171125-silentium2
Hypolite Petovan [Sat, 25 Nov 2017 16:14:54 +0000 (11:14 -0500)]
Merge pull request #3952 from tobiasd/20171125-silentium2

update to the silence script

6 years agolet there be SPACE
Tobias Diekershoff [Sat, 25 Nov 2017 16:10:29 +0000 (17:10 +0100)]
let there be SPACE

6 years agoMerge pull request #3953 from annando/preview-again
Hypolite Petovan [Sat, 25 Nov 2017 16:06:23 +0000 (11:06 -0500)]
Merge pull request #3953 from annando/preview-again

Show the preview picture even if the posting contains the huge image

6 years agosome minor stuff
Tobias Diekershoff [Sat, 25 Nov 2017 16:05:27 +0000 (17:05 +0100)]
some minor stuff

6 years agoMerge pull request #3951 from tobiasd/20171125-blockaccount
Hypolite Petovan [Sat, 25 Nov 2017 16:04:22 +0000 (11:04 -0500)]
Merge pull request #3951 from tobiasd/20171125-blockaccount

 Script to block an account from the node

6 years agosome more minor stuff
Tobias Diekershoff [Sat, 25 Nov 2017 16:02:42 +0000 (17:02 +0100)]
some more minor stuff

6 years agoShow the preview picture even if the posting contains the huge image
Michael [Sat, 25 Nov 2017 16:00:51 +0000 (16:00 +0000)]
Show the preview picture even if the posting contains the huge image

6 years agoupdate to the silence script
Tobias Diekershoff [Sat, 25 Nov 2017 15:55:58 +0000 (16:55 +0100)]
update to the silence script

6 years agosome minor stuff
Tobias Diekershoff [Sat, 25 Nov 2017 15:45:20 +0000 (16:45 +0100)]
some minor stuff

6 years agoScript to block an account from the node
Tobias Diekershoff [Sat, 25 Nov 2017 15:40:03 +0000 (16:40 +0100)]
Script to block an account from the node

6 years agoMerge pull request #3948 from tobiasd/20172511-silentium
Michael Vogel [Sat, 25 Nov 2017 15:30:13 +0000 (16:30 +0100)]
Merge pull request #3948 from tobiasd/20172511-silentium

silence accounts from global community page

6 years agouse all profile formats, typos
Tobias Diekershoff [Sat, 25 Nov 2017 15:25:53 +0000 (16:25 +0100)]
use all profile formats, typos

6 years agoMerge pull request #3949 from annando/further-information
Tobias Diekershoff [Sat, 25 Nov 2017 14:57:21 +0000 (15:57 +0100)]
Merge pull request #3949 from annando/further-information

Documentation for "fetch further information"

6 years agoDocumentation for "fetch further information"
Michael [Sat, 25 Nov 2017 14:43:28 +0000 (14:43 +0000)]
Documentation for "fetch further information"

6 years agosilence accounts from global community page
Tobias Diekershoff [Sat, 25 Nov 2017 14:16:55 +0000 (15:16 +0100)]
silence accounts from global community page

6 years agoMerge pull request #3945 from annando/issue-3911
Hypolite Petovan [Sat, 25 Nov 2017 12:10:03 +0000 (07:10 -0500)]
Merge pull request #3945 from annando/issue-3911

Issue 3911: Fetch keywords for feeds

6 years agoIssue 3911: Fetch keywords for feeds
Michael [Sat, 25 Nov 2017 11:59:20 +0000 (11:59 +0000)]
Issue 3911: Fetch keywords for feeds

6 years agoMerge pull request #3944 from annando/always-preview
Tobias Diekershoff [Sat, 25 Nov 2017 10:18:29 +0000 (11:18 +0100)]
Merge pull request #3944 from annando/always-preview

Always show small preview pictures, not the big ones

6 years agoAlways show small preview pictures, not the big ones
Michael [Sat, 25 Nov 2017 10:07:49 +0000 (10:07 +0000)]
Always show small preview pictures, not the big ones

6 years agoMerge pull request #3940 from hoergen/develop
Hypolite Petovan [Sat, 25 Nov 2017 00:51:35 +0000 (19:51 -0500)]
Merge pull request #3940 from hoergen/develop

Bookmarklet for sharing links to friendica

6 years agoAdded Description for creating a bookmark
hoergen [Sat, 25 Nov 2017 00:49:18 +0000 (01:49 +0100)]
Added Description for creating a bookmark

6 years agoMerge pull request #3943 from annando/getposts
Tobias Diekershoff [Fri, 24 Nov 2017 22:20:30 +0000 (23:20 +0100)]
Merge pull request #3943 from annando/getposts

getPostsFromUrl hadn't worked

6 years agogetpostsbyurl hadn't worked
Michael [Fri, 24 Nov 2017 22:15:35 +0000 (22:15 +0000)]
getpostsbyurl hadn't worked

6 years agoMerge pull request #3941 from annando/children-merge
Hypolite Petovan [Fri, 24 Nov 2017 21:49:21 +0000 (16:49 -0500)]
Merge pull request #3941 from annando/children-merge

Some posts weren't shown

6 years agoSome posts weren't shown
Michael [Fri, 24 Nov 2017 21:39:12 +0000 (21:39 +0000)]
Some posts weren't shown

6 years agoBookmarklet for sharing links to friendica
hoergen [Fri, 24 Nov 2017 21:11:57 +0000 (22:11 +0100)]
Bookmarklet for sharing links to friendica

6 years agoMerge pull request #3939 from annando/fix-sql
Tobias Diekershoff [Fri, 24 Nov 2017 08:53:36 +0000 (09:53 +0100)]
Merge pull request #3939 from annando/fix-sql

Fix some SQL problems

6 years agoMerge pull request #3938 from MrPetovan/task/3878-mov-HTTPExceptions-to-src
Michael Vogel [Fri, 24 Nov 2017 08:44:44 +0000 (09:44 +0100)]
Merge pull request #3938 from MrPetovan/task/3878-mov-HTTPExceptions-to-src

Move HTTPExceptions to src

6 years agoFix some SQL problems
Michael [Fri, 24 Nov 2017 07:44:02 +0000 (07:44 +0000)]
Fix some SQL problems

6 years agoRemove include/HTTPExceptions.php
Hypolite Petovan [Fri, 24 Nov 2017 04:52:23 +0000 (23:52 -0500)]
Remove include/HTTPExceptions.php

6 years agoUse new HTTPExceptions in API
Hypolite Petovan [Fri, 24 Nov 2017 04:48:15 +0000 (23:48 -0500)]
Use new HTTPExceptions in API

6 years agoFix httpdesc to work with new namespace
Hypolite Petovan [Fri, 24 Nov 2017 04:47:52 +0000 (23:47 -0500)]
Fix httpdesc to work with new namespace

6 years agoAdd HTTPException class files
Hypolite Petovan [Fri, 24 Nov 2017 04:40:54 +0000 (23:40 -0500)]
Add HTTPException class files

6 years agoMerge pull request #3935 from MrPetovan/task/3878-move-ExAuth-to-src
Michael Vogel [Fri, 24 Nov 2017 04:40:06 +0000 (05:40 +0100)]
Merge pull request #3935 from MrPetovan/task/3878-move-ExAuth-to-src

Move ExAuth class to src

6 years agoMerge pull request #3934 from zeroadam/Contact
Hypolite Petovan [Fri, 24 Nov 2017 02:01:02 +0000 (21:01 -0500)]
Merge pull request #3934 from zeroadam/Contact

Second Contact

6 years agowhitespace
Adam Magness [Fri, 24 Nov 2017 01:59:00 +0000 (20:59 -0500)]
whitespace

remove whitespace

6 years agoMerge pull request #3937 from annando/additional
Hypolite Petovan [Fri, 24 Nov 2017 01:43:46 +0000 (20:43 -0500)]
Merge pull request #3937 from annando/additional

Additional features still had got problems

6 years agoMerge pull request #3936 from zeroadam/Standards
Hypolite Petovan [Fri, 24 Nov 2017 01:43:10 +0000 (20:43 -0500)]
Merge pull request #3936 from zeroadam/Standards

src Standards

6 years agoDon't cache the xmpp/password PConfig value
Hypolite Petovan [Fri, 24 Nov 2017 01:34:35 +0000 (20:34 -0500)]
Don't cache the xmpp/password PConfig value

6 years agoReview
Adam Magness [Fri, 24 Nov 2017 00:22:30 +0000 (19:22 -0500)]
Review

null_date and spaces at end of line

6 years agoAdditional features still had got problems
Michael [Thu, 23 Nov 2017 20:41:35 +0000 (20:41 +0000)]
Additional features still had got problems

6 years agosrc Standards
Adam Magness [Thu, 23 Nov 2017 19:01:58 +0000 (14:01 -0500)]
src Standards

This basically completes coding standards changes for the entire src directory, with the exception of App.php

6 years agoAdd use dba
Hypolite Petovan [Thu, 23 Nov 2017 15:23:16 +0000 (10:23 -0500)]
Add use dba

6 years agoMove ExAuth class to src
Hypolite Petovan [Thu, 23 Nov 2017 14:46:04 +0000 (09:46 -0500)]
Move ExAuth class to src

- Move executed code to separate readStdin function

6 years agoMore Review
Adam Magness [Thu, 23 Nov 2017 13:15:38 +0000 (08:15 -0500)]
More Review

put back some q( calls and change some integer to boolean

6 years agoReview dba updates
Adam Magness [Thu, 23 Nov 2017 04:32:24 +0000 (23:32 -0500)]
Review dba updates

updates based on review comments.

6 years agoReview updates
Adam Magness [Thu, 23 Nov 2017 04:13:12 +0000 (23:13 -0500)]
Review updates

Updates based on review.

6 years agoMerge pull request #3932 from annando/more-dba
Hypolite Petovan [Thu, 23 Nov 2017 02:52:06 +0000 (21:52 -0500)]
Merge pull request #3932 from annando/more-dba

Some more replaced old database functions

6 years agoSome handling for empty parameters
Michael [Wed, 22 Nov 2017 22:50:45 +0000 (22:50 +0000)]
Some handling for empty parameters

6 years agoCleanup
Adam Magness [Wed, 22 Nov 2017 21:29:47 +0000 (16:29 -0500)]
Cleanup

Clean up messy commits.

6 years agoContact Standards
Adam Magness [Wed, 22 Nov 2017 14:02:55 +0000 (09:02 -0500)]
Contact Standards

Some updates for Contact

6 years ago/src is now free from old style delete queries
Michael [Wed, 22 Nov 2017 09:14:42 +0000 (09:14 +0000)]
/src is now free from old style delete queries

6 years agoSome more changed calls
Michael [Wed, 22 Nov 2017 09:11:44 +0000 (09:11 +0000)]
Some more changed calls

6 years agoMerge pull request #3931 from tobiasd/20171122-IT
Michael Vogel [Wed, 22 Nov 2017 07:24:38 +0000 (08:24 +0100)]
Merge pull request #3931 from tobiasd/20171122-IT

IT translations THX Mauro Batini

6 years agoSome more replaced old database functions
Michael [Wed, 22 Nov 2017 07:21:19 +0000 (07:21 +0000)]
Some more replaced old database functions

6 years agoIT translations THX Mauro Batini
Tobias Diekershoff [Wed, 22 Nov 2017 06:34:37 +0000 (07:34 +0100)]
IT translations THX Mauro Batini

6 years agoMerge pull request #3930 from annando/cache-dba
Hypolite Petovan [Tue, 21 Nov 2017 23:39:56 +0000 (18:39 -0500)]
Merge pull request #3930 from annando/cache-dba

Cache.php is now using dba methods

6 years agoCache.php is now using dba methods
Michael [Tue, 21 Nov 2017 23:03:33 +0000 (23:03 +0000)]
Cache.php is now using dba methods

6 years agoMerge pull request #3929 from annando/remove-old-mysql
Hypolite Petovan [Tue, 21 Nov 2017 21:06:22 +0000 (16:06 -0500)]
Merge pull request #3929 from annando/remove-old-mysql

No obsolete mysql_* anymore

6 years agoNo obsolete mysql_* anymore
Michael [Tue, 21 Nov 2017 21:00:11 +0000 (21:00 +0000)]
No obsolete mysql_* anymore

6 years agoMerge pull request #3928 from zeroadam/ForumManager-#3878
Hypolite Petovan [Tue, 21 Nov 2017 16:54:19 +0000 (11:54 -0500)]
Merge pull request #3928 from zeroadam/ForumManager-#3878

ForumManager to src

6 years agoForumManager to src
Adam Magness [Tue, 21 Nov 2017 12:20:22 +0000 (07:20 -0500)]
ForumManager to src

ForumManager moved to Friendica\Content namespace

6 years agoMerge pull request #3927 from rabuzarus/20171121_-_fix_reg_notifs
Hypolite Petovan [Tue, 21 Nov 2017 04:54:11 +0000 (23:54 -0500)]
Merge pull request #3927 from rabuzarus/20171121_-_fix_reg_notifs

Bugfix: show no registrations notifs if there are none

6 years agoMerge pull request #3925 from zeroadam/Emailer-#3878
Hypolite Petovan [Tue, 21 Nov 2017 04:53:21 +0000 (23:53 -0500)]
Merge pull request #3925 from zeroadam/Emailer-#3878

Emailer to src

6 years agoBugfix: show no registrations notifs if there are none
rabuzarus [Tue, 21 Nov 2017 02:45:13 +0000 (03:45 +0100)]
Bugfix: show no registrations notifs if there are none

6 years agoIndentation fix
Adam Magness [Tue, 21 Nov 2017 00:03:58 +0000 (19:03 -0500)]
Indentation fix

errant indentation change

6 years agoMerge pull request #3926 from annando/worker-correction
Hypolite Petovan [Mon, 20 Nov 2017 21:35:39 +0000 (16:35 -0500)]
Merge pull request #3926 from annando/worker-correction

Queue and GProbe should now be executed

6 years agoQueue and GProbe should now be executed
Michael [Mon, 20 Nov 2017 21:30:57 +0000 (21:30 +0000)]
Queue and GProbe should now be executed

6 years agoEmailer to src
Adam Magness [Mon, 20 Nov 2017 20:37:30 +0000 (15:37 -0500)]
Emailer to src

Move emailer to src Friendica\Util namespace

6 years agoMerge pull request #3924 from zeroadam/Xml-PSR2
Hypolite Petovan [Mon, 20 Nov 2017 20:18:17 +0000 (15:18 -0500)]
Merge pull request #3924 from zeroadam/Xml-PSR2

XML class standards

6 years agoFormatting change
Adam Magness [Mon, 20 Nov 2017 20:17:20 +0000 (15:17 -0500)]
Formatting change

change multi line format.

6 years agoXML class standards
Adam Magness [Mon, 20 Nov 2017 17:56:31 +0000 (12:56 -0500)]
XML class standards

updated the xml class for PSR-2

6 years agoMerge pull request #3923 from zeroadam/MoreStandards
Hypolite Petovan [Mon, 20 Nov 2017 17:37:05 +0000 (12:37 -0500)]
Merge pull request #3923 from zeroadam/MoreStandards

More standards

6 years agoIndentation
Adam Magness [Mon, 20 Nov 2017 16:29:55 +0000 (11:29 -0500)]
Indentation

modified to multi line function call.

6 years agoNew from rebase
Adam Magness [Mon, 20 Nov 2017 16:14:35 +0000 (11:14 -0500)]
New from rebase

more adjustments after rebase

6 years agoNew function
Adam Magness [Sun, 19 Nov 2017 22:33:07 +0000 (17:33 -0500)]
New function

new function from recent develop branch merge

6 years agoMore Standards
Adam Magness [Sun, 19 Nov 2017 22:04:40 +0000 (17:04 -0500)]
More Standards

More coding standards updates.

6 years agoMerge pull request #3921 from MrPetovan/issue/3878-move-Contact-to-src
Michael Vogel [Mon, 20 Nov 2017 15:53:29 +0000 (16:53 +0100)]
Merge pull request #3921 from MrPetovan/issue/3878-move-Contact-to-src

Move Contact to src

6 years agoMerge pull request #3922 from annando/scripts2
Hypolite Petovan [Sun, 19 Nov 2017 23:11:40 +0000 (18:11 -0500)]
Merge pull request #3922 from annando/scripts2

One script needed to be moved, one script was obsolete

6 years agoMerge branch 'develop' into issue/3878-move-Contact-to-src
Hypolite Petovan [Sun, 19 Nov 2017 23:09:59 +0000 (18:09 -0500)]
Merge branch 'develop' into issue/3878-move-Contact-to-src

6 years agoMerge branch 'develop' into issue/3878-move-Contact-to-src
Hypolite Petovan [Sun, 19 Nov 2017 23:09:14 +0000 (18:09 -0500)]
Merge branch 'develop' into issue/3878-move-Contact-to-src

6 years agoSome small changes
Michael [Sun, 19 Nov 2017 22:52:35 +0000 (22:52 +0000)]
Some small changes

6 years agoOne script needed to be moved, one script was obsolete
Michael [Sun, 19 Nov 2017 22:47:12 +0000 (22:47 +0000)]
One script needed to be moved, one script was obsolete

6 years agoMerge pull request #3920 from annando/scripts
Hypolite Petovan [Sun, 19 Nov 2017 22:25:14 +0000 (17:25 -0500)]
Merge pull request #3920 from annando/scripts

The poller is now the worker and we have a "scripts" folder

6 years agoCode cleanup
Hypolite Petovan [Sun, 19 Nov 2017 22:06:18 +0000 (17:06 -0500)]
Code cleanup

- Remove extraneous use statements
- Format require_once

6 years agoRemove include/Contact.php
Hypolite Petovan [Sun, 19 Nov 2017 22:05:21 +0000 (17:05 -0500)]
Remove include/Contact.php

- Remove all mentions to include/Contact.php