]> git.mxchange.org Git - friendica.git/log
friendica.git
7 years ago"dob" is not a date field, so the changes are reverted
Michael [Sat, 18 Mar 2017 08:50:27 +0000 (08:50 +0000)]
"dob" is not a date field, so the changes are reverted

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-null-date
Michael [Sat, 18 Mar 2017 08:31:43 +0000 (08:31 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date

7 years agoMerge pull request #3228 from annando/1702-detect-server
Tobias Diekershoff [Sat, 18 Mar 2017 08:10:03 +0000 (09:10 +0100)]
Merge pull request #3228 from annando/1702-detect-server

Server type detection is improved

7 years agoStandards and some logging improvements
Michael [Fri, 17 Mar 2017 19:25:01 +0000 (19:25 +0000)]
Standards and some logging improvements

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Fri, 17 Mar 2017 15:53:19 +0000 (15:53 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

Conflicts:
include/discover_poco.php

7 years agoMerge pull request #3226 from annando/1702-only-worker
rabuzarus [Fri, 17 Mar 2017 12:22:23 +0000 (13:22 +0100)]
Merge pull request #3226 from annando/1702-only-worker

The worker is now the only background processing system

7 years agoMerge pull request #3240 from annando/bugfix-dba
rabuzarus [Fri, 17 Mar 2017 12:20:56 +0000 (13:20 +0100)]
Merge pull request #3240 from annando/bugfix-dba

Bugfix: When a query fails we mustn't use the result value.

7 years agoBetter version transformation for nodeinfo and statistics.json
Michael [Thu, 16 Mar 2017 21:34:53 +0000 (21:34 +0000)]
Better version transformation for nodeinfo and statistics.json

7 years agoBugfix: When a query fails we mustn't use the result value.
Michael [Thu, 16 Mar 2017 09:23:12 +0000 (09:23 +0000)]
Bugfix: When a query fails we mustn't use the result value.

7 years agoWithout only the worker queue we don't need the deliverq anymore.
Michael [Thu, 16 Mar 2017 07:30:59 +0000 (07:30 +0000)]
Without only the worker queue we don't need the deliverq anymore.

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Thu, 16 Mar 2017 05:51:22 +0000 (05:51 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge pull request #3227 from annando/1703-pdo
rabuzarus [Wed, 15 Mar 2017 23:25:16 +0000 (00:25 +0100)]
Merge pull request #3227 from annando/1703-pdo

We now support PDO

7 years agoMerge pull request #3239 from Hypolite/issue/#3194-2
rabuzarus [Wed, 15 Mar 2017 18:53:16 +0000 (19:53 +0100)]
Merge pull request #3239 from Hypolite/issue/#3194-2

Fix wrong deferred function name

7 years agoFix wrong deferred function name
Hypolite Petovan [Wed, 15 Mar 2017 18:42:34 +0000 (14:42 -0400)]
Fix wrong deferred function name

7 years agoMerge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...
Michael [Wed, 15 Mar 2017 13:56:17 +0000 (13:56 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Wed, 15 Mar 2017 13:55:43 +0000 (13:55 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge pull request #3236 from annando/bugfix-feed
rabuzarus [Wed, 15 Mar 2017 11:18:49 +0000 (12:18 +0100)]
Merge pull request #3236 from annando/bugfix-feed

Bugfix for pull request 3216: Feed items were mixed

7 years agoStandard stuff
Michael [Wed, 15 Mar 2017 06:00:22 +0000 (06:00 +0000)]
Standard stuff

7 years agoBugfix for pull request 3216 - feed items were mixed
Michael [Tue, 14 Mar 2017 21:14:09 +0000 (21:14 +0000)]
Bugfix for pull request 3216 - feed items were mixed

7 years agoMerge remote-tracking branch 'upstream/develop' into develop
Michael [Tue, 14 Mar 2017 21:13:02 +0000 (21:13 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop

7 years agoMerge pull request #3233 from rabuzarus/20170314_-_pagination
Michael Vogel [Tue, 14 Mar 2017 19:05:29 +0000 (20:05 +0100)]
Merge pull request #3233 from rabuzarus/20170314_-_pagination

limit pagination page buttons to  max 10

7 years agolimit pagination page buttons to max 10
rabuzarus [Tue, 14 Mar 2017 17:31:03 +0000 (18:31 +0100)]
limit pagination page buttons to  max 10

7 years agoMerge pull request #3221 from strk/remember-openid
Michael Vogel [Tue, 14 Mar 2017 15:30:15 +0000 (16:30 +0100)]
Merge pull request #3221 from strk/remember-openid

Fix "remember me" cookie for OpenID logins

7 years agoOne forgotten standard
Michael [Tue, 14 Mar 2017 15:18:56 +0000 (15:18 +0000)]
One forgotten standard

7 years agoStandard stuff
Michael [Tue, 14 Mar 2017 15:17:21 +0000 (15:17 +0000)]
Standard stuff

7 years agoMerge pull request #3232 from Hypolite/issue/#3194-2
rabuzarus [Tue, 14 Mar 2017 12:04:47 +0000 (13:04 +0100)]
Merge pull request #3232 from Hypolite/issue/#3194-2

frio: Revert guid truncation for scrollToItem() and improve dropItem()

7 years agoMerge pull request #3224 from annando/1702-no-old_pager
fabrixxm [Tue, 14 Mar 2017 09:29:03 +0000 (10:29 +0100)]
Merge pull request #3224 from annando/1702-no-old_pager

The old pager is now removed

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Tue, 14 Mar 2017 07:26:15 +0000 (07:26 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge pull request #3200 from Hypolite/issue/#3195
Michael Vogel [Tue, 14 Mar 2017 05:05:42 +0000 (06:05 +0100)]
Merge pull request #3200 from Hypolite/issue/#3195

Improve pagination on frio

7 years agoRemoved debug output
Michael [Tue, 14 Mar 2017 04:58:05 +0000 (04:58 +0000)]
Removed debug output

7 years agoDaily updating the server status
Michael [Mon, 13 Mar 2017 22:16:09 +0000 (22:16 +0000)]
Daily updating the server status

7 years agoStandards: add braces
Sandro Santilli [Mon, 13 Mar 2017 22:09:09 +0000 (23:09 +0100)]
Standards: add braces

(thanks @Hypolite)

7 years agoRemove extra space after open parentheses
Sandro Santilli [Mon, 13 Mar 2017 22:08:03 +0000 (23:08 +0100)]
Remove extra space after open parentheses

7 years agoMerge pull request #3213 from Hypolite/issue/#2792-2
Michael Vogel [Mon, 13 Mar 2017 17:35:32 +0000 (18:35 +0100)]
Merge pull request #3213 from Hypolite/issue/#2792-2

Like behavior fix/improvements

7 years agoI guess, @Hypolite will still find something to change ...
Michael [Mon, 13 Mar 2017 17:23:02 +0000 (17:23 +0000)]
I guess, @Hypolite will still find something to change ...

7 years agoEmbrace the braces and spaces ...
Michael [Mon, 13 Mar 2017 16:18:45 +0000 (16:18 +0000)]
Embrace the braces and spaces ...

7 years agoImprove dropItem() functionality
Hypolite Petovan [Mon, 13 Mar 2017 16:12:13 +0000 (12:12 -0400)]
Improve dropItem() functionality

- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc

7 years agoFix scrollToItem breaking dropItem functionality
Hypolite Petovan [Mon, 13 Mar 2017 16:10:03 +0000 (12:10 -0400)]
Fix scrollToItem breaking dropItem functionality

- Add doc
- Refactor function by removing double jQuery wrapping

7 years agoMerge remote-tracking branch 'friendica/develop' into develop
Hypolite Petovan [Mon, 13 Mar 2017 15:53:34 +0000 (11:53 -0400)]
Merge remote-tracking branch 'friendica/develop' into develop

7 years agoAdded documentation
Michael [Mon, 13 Mar 2017 14:57:11 +0000 (14:57 +0000)]
Added documentation

7 years agoz_fetch_url now always returns an array
Michael [Mon, 13 Mar 2017 14:37:51 +0000 (14:37 +0000)]
z_fetch_url now always returns an array

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Mon, 13 Mar 2017 14:10:28 +0000 (14:10 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge pull request #3202 from Hypolite/issue/#3107
rabuzarus [Mon, 13 Mar 2017 13:17:37 +0000 (14:17 +0100)]
Merge pull request #3202 from Hypolite/issue/#3107

Delete frio obsolete Colors.php library

7 years agoOnly remove the "remember me" cookie at submitting the auth form
Sandro Santilli [Mon, 13 Mar 2017 10:57:10 +0000 (11:57 +0100)]
Only remove the "remember me" cookie at submitting the auth form

Fixes loss of remember (Friendica) cookie on switching Managed accounts

7 years agoMerge branch 'master' of github.com:annando/friendica
Michael [Mon, 13 Mar 2017 10:21:35 +0000 (10:21 +0000)]
Merge branch 'master' of github.com:annando/friendica

7 years agoMerge remote-tracking branch 'upstream/master'
Michael [Mon, 13 Mar 2017 10:21:08 +0000 (10:21 +0000)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...
Michael [Mon, 13 Mar 2017 10:18:56 +0000 (10:18 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Mon, 13 Mar 2017 10:18:29 +0000 (10:18 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...
Michael [Mon, 13 Mar 2017 08:54:27 +0000 (08:54 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Mon, 13 Mar 2017 08:53:57 +0000 (08:53 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge pull request #3223 from annando/1702-no-language
Tobias Diekershoff [Mon, 13 Mar 2017 07:26:43 +0000 (08:26 +0100)]
Merge pull request #3223 from annando/1702-no-language

The language string isn't displayed anymore

7 years agoMerge pull request #3225 from annando/1702-no_old_share
Tobias Diekershoff [Mon, 13 Mar 2017 06:52:38 +0000 (07:52 +0100)]
Merge pull request #3225 from annando/1702-no_old_share

The old share option is removed

7 years agoOne error, one documentation, one brace
Michael [Mon, 13 Mar 2017 06:32:33 +0000 (06:32 +0000)]
One error, one documentation, one brace

7 years agoRemove redundancies.
Michael [Mon, 13 Mar 2017 06:09:00 +0000 (06:09 +0000)]
Remove redundancies.

7 years agomore spaces
Michael [Mon, 13 Mar 2017 05:57:37 +0000 (05:57 +0000)]
more spaces

7 years agoStandard stuff
Michael [Mon, 13 Mar 2017 00:09:32 +0000 (00:09 +0000)]
Standard stuff

7 years agoQuerying via nodeinfo
Michael [Mon, 13 Mar 2017 00:03:27 +0000 (00:03 +0000)]
Querying via nodeinfo

7 years agoMerge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...
Michael [Sun, 12 Mar 2017 22:24:06 +0000 (22:24 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server

7 years agoChanges from previous pull request applied again
Michael [Sun, 12 Mar 2017 21:57:09 +0000 (21:57 +0000)]
Changes from previous pull request applied again

7 years agoMerge remote-tracking branch 'upstream/develop' into 1703-pdo
Michael [Sun, 12 Mar 2017 21:05:10 +0000 (21:05 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1703-pdo

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-only-worker
Michael [Sun, 12 Mar 2017 21:03:44 +0000 (21:03 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker

Conflicts:
include/onepoll.php
include/queue.php

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-null-date
Michael [Sun, 12 Mar 2017 20:54:28 +0000 (20:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Conflicts:
include/onepoll.php

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-no_old_share
Michael [Sun, 12 Mar 2017 20:52:48 +0000 (20:52 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
Michael [Sun, 12 Mar 2017 20:52:14 +0000 (20:52 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager

Conflicts:
mod/profile.php

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-no-language
Michael [Sun, 12 Mar 2017 20:50:20 +0000 (20:50 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-no-language

7 years agoMerge remote-tracking branch 'upstream/develop' into 1702-detect-server
Michael [Sun, 12 Mar 2017 20:49:48 +0000 (20:49 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Sun, 12 Mar 2017 15:19:37 +0000 (11:19 -0400)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3133 from mexon/mat/cidfix
Tobias Diekershoff [Sun, 12 Mar 2017 14:44:22 +0000 (15:44 +0100)]
Merge pull request #3133 from mexon/mat/cidfix

Allow cid URLs for images

7 years agoMerge pull request #3214 from Hypolite/get_contact-rewrite
Tobias Diekershoff [Sun, 12 Mar 2017 14:42:17 +0000 (15:42 +0100)]
Merge pull request #3214 from Hypolite/get_contact-rewrite

Reformatted get_contact()

7 years agoMerge pull request #3216 from annando/1701-performance
Tobias Diekershoff [Sun, 12 Mar 2017 14:40:56 +0000 (15:40 +0100)]
Merge pull request #3216 from annando/1701-performance

Better network handling, improved structure

7 years agoMerge pull request #3222 from Hypolite/issue/#3220
Tobias Diekershoff [Sun, 12 Mar 2017 14:35:42 +0000 (15:35 +0100)]
Merge pull request #3222 from Hypolite/issue/#3220

Diaspora: Normalize line endings instead of adding <br> before Markdown()

7 years agomark the develop version in the version string
Tobias Diekershoff [Sun, 12 Mar 2017 13:40:08 +0000 (14:40 +0100)]
mark the develop version in the version string

7 years agoMerge branch 'master' into develop
Tobias Diekershoff [Sun, 12 Mar 2017 13:39:09 +0000 (14:39 +0100)]
Merge branch 'master' into develop

7 years agoFriendica Version 3.5.1
Tobias Diekershoff [Sun, 12 Mar 2017 13:38:01 +0000 (14:38 +0100)]
Friendica Version 3.5.1

7 years agoWe don't need to show the id.
Michael [Sun, 12 Mar 2017 09:41:10 +0000 (09:41 +0000)]
We don't need to show the id.

7 years agoDiscovery of new servers
Michael [Sun, 12 Mar 2017 09:13:04 +0000 (09:13 +0000)]
Discovery of new servers

7 years agoNormalize line endings instead of adding <br> before Markdown()
Hypolite Petovan [Sun, 12 Mar 2017 07:55:22 +0000 (03:55 -0400)]
Normalize line endings instead of adding <br> before Markdown()

7 years agoFix "remember me" cookie for OpenID logins
Sandro Santilli [Sun, 12 Mar 2017 00:11:35 +0000 (01:11 +0100)]
Fix "remember me" cookie for OpenID logins

Closes #2432

NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...

7 years agoMerge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...
Michael [Sat, 11 Mar 2017 19:29:55 +0000 (19:29 +0000)]
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Fri, 10 Mar 2017 02:11:14 +0000 (21:11 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMerge pull request #3208 from Hypolite/issue/#3194
fabrixxm [Thu, 9 Mar 2017 08:37:21 +0000 (09:37 +0100)]
Merge pull request #3208 from Hypolite/issue/#3194

Strip @hubzilla.server part from guid for autoscrolling purpuses

7 years agoMake Hypolite happy
Michael [Wed, 8 Mar 2017 18:03:41 +0000 (18:03 +0000)]
Make Hypolite happy

7 years agoForgotten debug output
Michael [Wed, 8 Mar 2017 13:15:24 +0000 (13:15 +0000)]
Forgotten debug output

7 years agoRemove junk from the version number
Michael [Wed, 8 Mar 2017 05:40:57 +0000 (05:40 +0000)]
Remove junk from the version number

7 years agoAdd pump.io network to probing supported networks
Hypolite Petovan [Tue, 7 Mar 2017 21:43:22 +0000 (16:43 -0500)]
Add pump.io network to probing supported networks

- Remove useless condition

7 years agoFix behavior regression
Hypolite Petovan [Tue, 7 Mar 2017 21:28:15 +0000 (16:28 -0500)]
Fix behavior regression

Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-performance
Michael [Tue, 7 Mar 2017 21:24:20 +0000 (21:24 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-performance

7 years agoBetter separation between queries with or without result
Michael [Tue, 7 Mar 2017 17:16:17 +0000 (17:16 +0000)]
Better separation between queries with or without result

7 years agoSwitch nurl and addr lookups
Hypolite Petovan [Mon, 6 Mar 2017 21:26:04 +0000 (16:26 -0500)]
Switch nurl and addr lookups

- nurl lookup is more frequent than addr lookup, saves queries

7 years agoSplit slow catch-all query into three fast queries
Hypolite Petovan [Mon, 6 Mar 2017 21:19:12 +0000 (16:19 -0500)]
Split slow catch-all query into three fast queries

Thanks @annando for the tip.

7 years agoUse Probe::uri instead of probe_url()
Hypolite Petovan [Mon, 6 Mar 2017 11:01:08 +0000 (06:01 -0500)]
Use Probe::uri instead of probe_url()

- Moved file inclusion to enable lazy loading

7 years agoReformatted get_contact()
Hypolite Petovan [Mon, 6 Mar 2017 10:37:01 +0000 (05:37 -0500)]
Reformatted get_contact()

- Resolved one `@todo` (the catch-all contact query)
- Improved code readability by naming variables
- Code standards compliance

7 years agoRewriting of do_like()
Hypolite Petovan [Mon, 6 Mar 2017 10:28:01 +0000 (05:28 -0500)]
Rewriting of do_like()

- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set

7 years agoQuickfix for SQL commands that should return "true" instead of an empty array
Michael [Mon, 6 Mar 2017 10:10:22 +0000 (10:10 +0000)]
Quickfix for SQL commands that should return "true" instead of an empty array

7 years agoFix response "self" assigment
Hypolite Petovan [Mon, 6 Mar 2017 10:07:17 +0000 (05:07 -0500)]
Fix response "self" assigment

- Switch from unreliable `uid` matching to `author-id` using
public_contact()

7 years agoAdd public_contact() function
Hypolite Petovan [Mon, 6 Mar 2017 10:06:05 +0000 (05:06 -0500)]
Add public_contact() function

- Add function to retrieve the public contact id (uid = 0) of the
current logged-in user

7 years agoEmulation for the mysqli behaviour when executing insert, update, ...
Michael [Sun, 5 Mar 2017 23:59:53 +0000 (23:59 +0000)]
Emulation for the mysqli behaviour when executing insert, update, ...

7 years agoWe now support PDO for database connections as well
Michael [Sun, 5 Mar 2017 21:56:50 +0000 (21:56 +0000)]
We now support PDO for database connections as well

7 years agoMerge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
Michael [Sun, 5 Mar 2017 16:23:58 +0000 (16:23 +0000)]
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server

7 years agoMerge pull request #3212 from annando/followup2-profile
Tobias Diekershoff [Sun, 5 Mar 2017 12:29:48 +0000 (13:29 +0100)]
Merge pull request #3212 from annando/followup2-profile

Second followup for profile issue