]>
git.mxchange.org Git - friendica.git/log
Michael [Mon, 13 Mar 2017 00:09:32 +0000 (00:09 +0000)]
Standard stuff
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
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
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()
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
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()
Tobias Diekershoff [Sun, 12 Mar 2017 13:40:08 +0000 (14:40 +0100)]
mark the develop version in the version string
Tobias Diekershoff [Sun, 12 Mar 2017 13:39:09 +0000 (14:39 +0100)]
Merge branch 'master' into develop
Tobias Diekershoff [Sun, 12 Mar 2017 13:38:01 +0000 (14:38 +0100)]
Friendica Version 3.5.1
Hypolite Petovan [Sun, 12 Mar 2017 07:55:22 +0000 (03:55 -0400)]
Normalize line endings instead of adding <br> before Markdown()
Hypolite Petovan [Fri, 10 Mar 2017 02:11:14 +0000 (21:11 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
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
Michael [Wed, 8 Mar 2017 18:03:41 +0000 (18:03 +0000)]
Make Hypolite happy
Hypolite Petovan [Tue, 7 Mar 2017 21:43:22 +0000 (16:43 -0500)]
Add pump.io network to probing supported networks
- Remove useless condition
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.
Michael [Tue, 7 Mar 2017 21:24:20 +0000 (21:24 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-performance
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
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.
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
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
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
Michael Vogel [Sun, 5 Mar 2017 12:09:28 +0000 (13:09 +0100)]
Merge pull request #3211 from tobiasd/3.5.1rc
DE translation and one solved issue for the CHANGELOG
Tobias Diekershoff [Sun, 5 Mar 2017 11:41:02 +0000 (12:41 +0100)]
issue solved
Tobias Diekershoff [Sun, 5 Mar 2017 11:40:31 +0000 (12:40 +0100)]
DE translations
Michael [Sun, 5 Mar 2017 11:07:10 +0000 (11:07 +0000)]
Second followup for profile issue
Tobias Diekershoff [Sat, 4 Mar 2017 08:41:00 +0000 (09:41 +0100)]
Merge pull request #3209 from annando/followup-3196
Follow up for issue 3196: We need an index hint for performance issues
Michael [Sat, 4 Mar 2017 08:25:47 +0000 (08:25 +0000)]
Follow up for issue 3196: We need an index hint for performance issues
Hypolite Petovan [Sat, 4 Mar 2017 02:45:36 +0000 (21:45 -0500)]
Strip @hubzilla.server part from guid for autoscrolling purpuses
Michael Vogel [Fri, 3 Mar 2017 20:36:37 +0000 (21:36 +0100)]
Merge pull request #3205 from tobiasd/
20170226 -issue3187
Bugfix issue 3187
Tobias Diekershoff [Fri, 3 Mar 2017 16:18:09 +0000 (17:18 +0100)]
tag change
Tobias Diekershoff [Fri, 3 Mar 2017 09:31:10 +0000 (10:31 +0100)]
regenerated master messages.po file
Tobias Diekershoff [Fri, 3 Mar 2017 09:28:29 +0000 (10:28 +0100)]
better wording and placeholder for name
Michael Vogel [Thu, 2 Mar 2017 09:16:14 +0000 (10:16 +0100)]
Merge pull request #3201 from tobiasd/
20170302 -changelog
issues solved
Tobias Diekershoff [Thu, 2 Mar 2017 08:05:24 +0000 (09:05 +0100)]
issues solved
Tobias Diekershoff [Thu, 2 Mar 2017 06:29:45 +0000 (07:29 +0100)]
Merge pull request #3199 from annando/issue-3196
Bugfix Issue 3196: Not all forum posts weren't shown
Michael [Thu, 2 Mar 2017 05:46:44 +0000 (05:46 +0000)]
Added index for performance issues
Michael [Wed, 1 Mar 2017 21:47:10 +0000 (21:47 +0000)]
Issue 3196: Not all forum posts weren't shown
Michael Vogel [Tue, 28 Feb 2017 08:30:35 +0000 (09:30 +0100)]
Merge pull request #3193 from tobiasd/
20170228 -CHANGELOG
this line is superfluous by now
Tobias Diekershoff [Tue, 28 Feb 2017 07:21:33 +0000 (08:21 +0100)]
this line is superfluous by now
Tobias Diekershoff [Tue, 28 Feb 2017 06:35:04 +0000 (07:35 +0100)]
Merge pull request #3192 from annando/gstools-isnt-anymore
The service at gstools.org doesn't exist anymore.
Michael [Tue, 28 Feb 2017 06:26:50 +0000 (06:26 +0000)]
The service at gstools.org doesn't exist anymore.
Michael [Mon, 27 Feb 2017 21:46:37 +0000 (21:46 +0000)]
The old pager is removed
Tobias Diekershoff [Sun, 26 Feb 2017 15:47:11 +0000 (16:47 +0100)]
change Fan/Admirer to Subscriber
Tobias Diekershoff [Sun, 26 Feb 2017 09:05:02 +0000 (10:05 +0100)]
Merge pull request #3190 from annando/bugfix-dbstructure
Bugfix: "ALTER IGNORE" was missing on structure and index alteration
Michael [Sun, 26 Feb 2017 08:36:05 +0000 (08:36 +0000)]
Bugfix: "ALTER IGNORE" was missing on structure and index change
Tobias Diekershoff [Sun, 26 Feb 2017 03:19:22 +0000 (04:19 +0100)]
Merge pull request #3188 from annando/bugfix-fetch_url
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
Michael [Sat, 25 Feb 2017 13:59:24 +0000 (13:59 +0000)]
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
Michael Vogel [Fri, 24 Feb 2017 23:17:10 +0000 (00:17 +0100)]
Merge pull request #3186 from tobiasd/
20170224 -changelog
small update for the CHANGELOG
Tobias Diekershoff [Fri, 24 Feb 2017 18:41:07 +0000 (19:41 +0100)]
issues closed
Tobias Diekershoff [Fri, 24 Feb 2017 18:29:37 +0000 (19:29 +0100)]
Merge pull request #3185 from annando/3.5.1rc
New version string for RC
Michael [Fri, 24 Feb 2017 15:02:16 +0000 (15:02 +0000)]
New version string for RC
Michael Vogel [Fri, 24 Feb 2017 07:50:30 +0000 (08:50 +0100)]
Merge pull request #3184 from tobiasd/
20170224 -doc
coding standard for the docs
Tobias Diekershoff [Fri, 24 Feb 2017 07:37:36 +0000 (08:37 +0100)]
coding standard for the docs
Michael Vogel [Fri, 24 Feb 2017 06:46:29 +0000 (07:46 +0100)]
Merge pull request #2841 from Hypolite/issue/#2103-alt
Issue/#2103 alt - define coding standards for Friendica
Michael Vogel [Fri, 24 Feb 2017 06:46:07 +0000 (07:46 +0100)]
Merge pull request #2916 from tobiasd/
20160925 -changes
updateing credits and CHANGELOG
Tobias Diekershoff [Fri, 24 Feb 2017 05:28:32 +0000 (06:28 +0100)]
Merge pull request #3182 from annando/bugfix-sql-date
Bugfix for badly formatted date time string
Michael [Thu, 23 Feb 2017 07:21:47 +0000 (07:21 +0000)]
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
Michael [Thu, 23 Feb 2017 07:09:55 +0000 (07:09 +0000)]
Define the lowest possible datetime string as "0001-01-01 00:00:00"
Michael [Thu, 23 Feb 2017 06:55:35 +0000 (06:55 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-performance
Michael [Thu, 23 Feb 2017 06:54:50 +0000 (06:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
Tobias Diekershoff [Thu, 23 Feb 2017 06:15:46 +0000 (07:15 +0100)]
Merge pull request #3173 from annando/more-temp-stuff
Workaround for not createable spool path
Michael [Thu, 23 Feb 2017 05:45:06 +0000 (05:45 +0000)]
Bugfix for bugfix :-)
Michael [Wed, 22 Feb 2017 22:25:35 +0000 (22:25 +0000)]
Added check for invalid "contact-type"
Michael [Wed, 22 Feb 2017 22:04:56 +0000 (22:04 +0000)]
Bugfix for badly formatted date time string.
rabuzarus [Wed, 22 Feb 2017 12:53:21 +0000 (13:53 +0100)]
Merge pull request #3181 from tobiasd/
20170222 -docinstall
sql_mode setting in code block
rabuzarus [Wed, 22 Feb 2017 12:51:53 +0000 (13:51 +0100)]
Merge pull request #3177 from annando/disable-fulltext
See issue 3157: Fulltext is now disabled
Michael Vogel [Wed, 22 Feb 2017 11:35:27 +0000 (12:35 +0100)]
Merge pull request #3179 from tobiasd/
20170222 -docquickstarten
EN quickstart had some dead links in it, DE version is ok
Tobias Diekershoff [Wed, 22 Feb 2017 08:37:00 +0000 (09:37 +0100)]
make it a code block
Michael [Wed, 22 Feb 2017 06:38:56 +0000 (06:38 +0000)]
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
Tobias Diekershoff [Wed, 22 Feb 2017 06:21:36 +0000 (07:21 +0100)]
EN quickstart had some dead links in it, DE version is ok
Tobias Diekershoff [Tue, 21 Feb 2017 20:31:31 +0000 (21:31 +0100)]
regen credits
Tobias Diekershoff [Tue, 21 Feb 2017 18:57:25 +0000 (19:57 +0100)]
Merge pull request #3178 from eelcomaljaars/sql_mode_doc_update
Added note about MySQL sql_mode on newer versions of MySQL
Eelco Maljaars [Tue, 21 Feb 2017 18:32:03 +0000 (19:32 +0100)]
Document reformat as requested - 1 sentence per line
Eelco Maljaars [Tue, 21 Feb 2017 14:59:12 +0000 (15:59 +0100)]
Added note about MySQL sql_mode on newer versions of MySQL
Michael [Tue, 21 Feb 2017 05:23:37 +0000 (05:23 +0000)]
See issue 3157: Fulltext is now disabled
Tobias Diekershoff [Mon, 20 Feb 2017 13:09:32 +0000 (14:09 +0100)]
issues and stuff
Michael [Sun, 19 Feb 2017 18:46:20 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
Michael Vogel [Sun, 19 Feb 2017 18:44:20 +0000 (19:44 +0100)]
Merge pull request #3171 from Hypolite/bug/fix-diaspora-attachment-links
Bug/fix diaspora attachment links
Michael Vogel [Sun, 19 Feb 2017 18:41:17 +0000 (19:41 +0100)]
Merge pull request #3176 from eelcomaljaars/sql_mode_doc_update
Sql mode doc update
Eelco Maljaars [Sun, 19 Feb 2017 15:36:40 +0000 (16:36 +0100)]
Typos fixed
Eelco Maljaars [Sun, 19 Feb 2017 14:53:29 +0000 (15:53 +0100)]
Ran into an installation problem today that is linked to newer MySQL builds
This commit expands the INSTALL.txt with notes when this problem arises and
how it should be handled. In the end the database code should probably be fixed
but this should help in the short term.
Eelco Maljaars [Sun, 19 Feb 2017 14:44:48 +0000 (15:44 +0100)]
Added missing mbstring php module to xenial setup in vagrant
Michael [Sun, 19 Feb 2017 10:13:40 +0000 (10:13 +0000)]
Ensure that the spool path is set
Michael [Sun, 19 Feb 2017 08:23:21 +0000 (08:23 +0000)]
Bugfix for not createable spool path
Hypolite Petovan [Sun, 19 Feb 2017 01:39:16 +0000 (20:39 -0500)]
Add original_url() param documentation
Hypolite Petovan [Sun, 19 Feb 2017 01:35:31 +0000 (20:35 -0500)]
Add param documentation
rabuzarus [Sat, 18 Feb 2017 14:20:14 +0000 (15:20 +0100)]
Merge pull request #3170 from tobiasd/
20170217 -de
DE translations
rabuzarus [Sat, 18 Feb 2017 12:29:39 +0000 (13:29 +0100)]
Merge pull request #3167 from Hypolite/bug/comment-box-undefined
Bug comment box undefined
Hypolite Petovan [Sat, 18 Feb 2017 03:35:46 +0000 (22:35 -0500)]
Fix Diaspora link attachment probe
- Move analytics param stripping out of original_url
- Remove HEAD curl request in ParseUrl::getSiteInfo
- Replace original_url with strip_tracking_query_params in
ParseUrl::getSiteInfo to prevent massive curl fest in border cases
Hypolite Petovan [Sat, 18 Feb 2017 03:32:33 +0000 (22:32 -0500)]
Clean trailing whitespaces
Hypolite Petovan [Sat, 18 Feb 2017 01:44:57 +0000 (20:44 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Tobias Diekershoff [Fri, 17 Feb 2017 09:14:38 +0000 (10:14 +0100)]
DE translations
Tobias Diekershoff [Fri, 17 Feb 2017 07:04:22 +0000 (08:04 +0100)]
Merge pull request #3169 from annando/bugfix-delete-spool
We have to delete spool files after posting in any case
Tobias Diekershoff [Fri, 17 Feb 2017 07:03:15 +0000 (08:03 +0100)]
Merge pull request #3168 from annando/bugfix-contact-posts
posts_from_contact_url: Handle the case when a contact is unknown.
Michael [Thu, 16 Feb 2017 20:23:07 +0000 (20:23 +0000)]
We have to delete spool files after posting in any case
Michael [Thu, 16 Feb 2017 20:03:44 +0000 (20:03 +0000)]
Handle the case when a contact is unknown.
Tobias Diekershoff [Thu, 16 Feb 2017 15:58:18 +0000 (16:58 +0100)]
Merge pull request #3166 from annando/bugfix-tempdir
More analytics to analyze the reason for constantly changing temp paths
Hypolite Petovan [Thu, 16 Feb 2017 12:06:11 +0000 (07:06 -0500)]
[frio] Fix comment box not opening on focus, undefined on blur
- Remove the callback system for commentOpenUI
- Remove comments
Fixes #3062
Michael Vogel [Thu, 16 Feb 2017 05:26:54 +0000 (06:26 +0100)]
Merge pull request #3164 from tobiasd/
20170215 -quattro
fix for less file of quattro, regen CSS
Hypolite Petovan [Thu, 16 Feb 2017 03:00:02 +0000 (22:00 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop