]> git.mxchange.org Git - friendica.git/log
friendica.git
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 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 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 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 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

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

6 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.

6 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.

6 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.

6 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

6 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.

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

6 years agoFix function name typo
Hypolite Petovan [Sun, 26 Nov 2017 20:51:07 +0000 (15:51 -0500)]
Fix function name typo

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 agoadded plusminus style sheet and sort the style sheets alphabetically
hoergen [Sun, 26 Nov 2017 19:46:55 +0000 (20:46 +0100)]
added plusminus style sheet and sort the style sheets alphabetically

6 years agoadded new style sheet plusminus
hoergen [Sun, 26 Nov 2017 19:46:20 +0000 (20:46 +0100)]
added new style sheet plusminus

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 agoAdding new stylesheet to theme vier. It aims a more clean visual
hoergen [Sun, 26 Nov 2017 19:45:17 +0000 (20:45 +0100)]
Adding new stylesheet to theme vier. It aims a more clean visual

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 agoMerge pull request #3967 from annando/forum-group
Tobias Diekershoff [Sun, 26 Nov 2017 16:19:31 +0000 (17:19 +0100)]
Merge pull request #3967 from annando/forum-group

Network page: Selecting a forum overrides the group selection

6 years agoNetwork page: Selecting a forum overrides the group selection
Michael [Sun, 26 Nov 2017 16:17:32 +0000 (16:17 +0000)]
Network page: Selecting a forum overrides the group selection

6 years agoMerge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
Hypolite Petovan [Sun, 26 Nov 2017 16:16:14 +0000 (11:16 -0500)]
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud

A tag cloud widget for the profile page

6 years agotag cloud: fix query
rabuzarus [Sun, 26 Nov 2017 15:24:26 +0000 (16:24 +0100)]
tag cloud: fix query

6 years agotag cloud: use dba for db request
rabuzarus [Sun, 26 Nov 2017 15:14:16 +0000 (16:14 +0100)]
tag cloud: use dba for db request

6 years agoMerge pull request #3965 from tobiasd/20171126-docGettingStarted
Hypolite Petovan [Sun, 26 Nov 2017 14:23:50 +0000 (09:23 -0500)]
Merge pull request #3965 from tobiasd/20171126-docGettingStarted

this and should be an or

6 years agothis and should be an or
Tobias Diekershoff [Sun, 26 Nov 2017 14:19:40 +0000 (15:19 +0100)]
this and should be an or

6 years agoMerge pull request #3964 from annando/uexport-json
Tobias Diekershoff [Sun, 26 Nov 2017 14:01:06 +0000 (15:01 +0100)]
Merge pull request #3964 from annando/uexport-json

Avoid empty user export when there are UTF8 problems

6 years agoAvoid empty user export when there are UTF8 problems
Michael [Sun, 26 Nov 2017 13:58:24 +0000 (13:58 +0000)]
Avoid empty user export when there are UTF8 problems

6 years agoMerge pull request #3963 from annando/default-features
Hypolite Petovan [Sun, 26 Nov 2017 13:51:14 +0000 (08:51 -0500)]
Merge pull request #3963 from annando/default-features

Additional features should now work with the forumlist as well

6 years agoMerge pull request #3961 from MrPetovan/task/3946-use-random-bytes
Michael Vogel [Sun, 26 Nov 2017 13:24:48 +0000 (14:24 +0100)]
Merge pull request #3961 from MrPetovan/task/3946-use-random-bytes

Use random_bytes() in random_string()

6 years agoGood looking and better performance
Michael [Sun, 26 Nov 2017 13:12:54 +0000 (13:12 +0000)]
Good looking and better performance

6 years agoAdd odd number of character support to random_string()
Hypolite Petovan [Sun, 26 Nov 2017 12:57:29 +0000 (07:57 -0500)]
Add odd number of character support to random_string()

6 years agoMerge pull request #3962 from tobiasd/20171126-makecredits
Michael Vogel [Sun, 26 Nov 2017 11:44:49 +0000 (12:44 +0100)]
Merge pull request #3962 from tobiasd/20171126-makecredits

add Ratten to the special contributors

6 years agoAdded clarification
Michael [Sun, 26 Nov 2017 11:43:02 +0000 (11:43 +0000)]
Added clarification

6 years agoDefault features should now work with the forumwidget again
Michael [Sun, 26 Nov 2017 11:31:07 +0000 (11:31 +0000)]
Default features should now work with the forumwidget again

6 years agoadd Ratten to the special contributors who are not found in git and messages.po files
Tobias Diekershoff [Sun, 26 Nov 2017 09:58:15 +0000 (10:58 +0100)]
add Ratten to the special contributors who are not found in git and messages.po files

6 years agotag cloud: clear align settings in the tagcloud widget
rabuzarus [Sun, 26 Nov 2017 03:36:45 +0000 (04:36 +0100)]
tag cloud: clear align settings in the tagcloud widget

6 years agotag cloud: add doxygen docu
rabuzarus [Sun, 26 Nov 2017 03:33:21 +0000 (04:33 +0100)]
tag cloud: add doxygen docu

6 years agoMerge pull request #3959 from annando/image-forum
Hypolite Petovan [Sun, 26 Nov 2017 02:40:33 +0000 (21:40 -0500)]
Merge pull request #3959 from annando/image-forum

Images that are uploaded to public forums are now public

6 years agoMerge pull request #3960 from annando/awaiting-acknowledge
Hypolite Petovan [Sun, 26 Nov 2017 02:39:41 +0000 (21:39 -0500)]
Merge pull request #3960 from annando/awaiting-acknowledge

When we are requesting a connection, the contact is no longer "blocked"

6 years agoWhen we are requesting a conneczion, the contactis no longer "blocked"
Michael [Sun, 26 Nov 2017 02:31:26 +0000 (02:31 +0000)]
When we are requesting a conneczion, the contactis no longer "blocked"

6 years agoUpdate random_string with random_bytes
Hypolite Petovan [Sun, 26 Nov 2017 02:15:50 +0000 (21:15 -0500)]
Update random_string with random_bytes

- Updated update.php

6 years agoMerge pull request #3958 from tobiasd/20171125-docEventsObsolete
Michael Vogel [Sun, 26 Nov 2017 02:05:54 +0000 (03:05 +0100)]
Merge pull request #3958 from tobiasd/20171125-docEventsObsolete

Events docs had an obsolete paragraph

6 years agoImages that are uploaded to public forums are now public
Michael [Sun, 26 Nov 2017 02:03:59 +0000 (02:03 +0000)]
Images that are uploaded to public forums are now public

6 years agoEvents docs had an obsolete paragraph
Tobias Diekershoff [Sat, 25 Nov 2017 23:59:27 +0000 (00:59 +0100)]
Events docs had an obsolete paragraph

6 years agoAdd paragonie/random_compat to Composer dependencies
Hypolite Petovan [Sat, 25 Nov 2017 23:42:00 +0000 (18:42 -0500)]
Add paragonie/random_compat to Composer dependencies

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 agoMerge develop into 20171122_-_port_tagcloud
rabuzarus [Sat, 25 Nov 2017 22:41:20 +0000 (23:41 +0100)]
Merge develop into 20171122_-_port_tagcloud

Conflicts:
include/features.php

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