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

7 years agoMerge pull request #3211 from tobiasd/3.5.1rc
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

7 years agoissue solved
Tobias Diekershoff [Sun, 5 Mar 2017 11:41:02 +0000 (12:41 +0100)]
issue solved

7 years agoDE translations
Tobias Diekershoff [Sun, 5 Mar 2017 11:40:31 +0000 (12:40 +0100)]
DE translations

7 years agoSecond followup for profile issue
Michael [Sun, 5 Mar 2017 11:07:10 +0000 (11:07 +0000)]
Second followup for profile issue

7 years agoMerge pull request #3209 from annando/followup-3196
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

7 years agoFollow 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

7 years agoStrip @hubzilla.server part from guid for autoscrolling purpuses
Hypolite Petovan [Sat, 4 Mar 2017 02:45:36 +0000 (21:45 -0500)]
Strip @hubzilla.server part from guid for autoscrolling purpuses

7 years agoMerge pull request #3205 from tobiasd/20170226-issue3187
Michael Vogel [Fri, 3 Mar 2017 20:36:37 +0000 (21:36 +0100)]
Merge pull request #3205 from tobiasd/20170226-issue3187

Bugfix issue 3187

7 years agotag change
Tobias Diekershoff [Fri, 3 Mar 2017 16:18:09 +0000 (17:18 +0100)]
tag change

7 years agoregenerated master messages.po file
Tobias Diekershoff [Fri, 3 Mar 2017 09:31:10 +0000 (10:31 +0100)]
regenerated master messages.po file

7 years agobetter wording and placeholder for name
Tobias Diekershoff [Fri, 3 Mar 2017 09:28:29 +0000 (10:28 +0100)]
better wording and placeholder for name

7 years agoMerge pull request #3201 from tobiasd/20170302-changelog
Michael Vogel [Thu, 2 Mar 2017 09:16:14 +0000 (10:16 +0100)]
Merge pull request #3201 from tobiasd/20170302-changelog

issues solved

7 years agoissues solved
Tobias Diekershoff [Thu, 2 Mar 2017 08:05:24 +0000 (09:05 +0100)]
issues solved

7 years agoMerge pull request #3199 from annando/issue-3196
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

7 years agoAdded index for performance issues
Michael [Thu, 2 Mar 2017 05:46:44 +0000 (05:46 +0000)]
Added index for performance issues

7 years agoIssue 3196: Not all forum posts weren't shown
Michael [Wed, 1 Mar 2017 21:47:10 +0000 (21:47 +0000)]
Issue 3196: Not all forum posts weren't shown

7 years agoMerge pull request #3193 from tobiasd/20170228-CHANGELOG
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

7 years agothis line is superfluous by now
Tobias Diekershoff [Tue, 28 Feb 2017 07:21:33 +0000 (08:21 +0100)]
this line is superfluous by now

7 years agoMerge pull request #3192 from annando/gstools-isnt-anymore
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.

7 years agoThe 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.

7 years agochange Fan/Admirer to Subscriber
Tobias Diekershoff [Sun, 26 Feb 2017 15:47:11 +0000 (16:47 +0100)]
change Fan/Admirer to Subscriber

7 years agoMerge pull request #3190 from annando/bugfix-dbstructure
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

7 years agoBugfix: "ALTER IGNORE" was missing on structure and index change
Michael [Sun, 26 Feb 2017 08:36:05 +0000 (08:36 +0000)]
Bugfix: "ALTER IGNORE" was missing on structure and index change

7 years agoMerge pull request #3188 from annando/bugfix-fetch_url
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

7 years agoBugfix: 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

7 years agoMerge pull request #3186 from tobiasd/20170224-changelog
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

7 years agoissues closed
Tobias Diekershoff [Fri, 24 Feb 2017 18:41:07 +0000 (19:41 +0100)]
issues closed

7 years agoMerge pull request #3185 from annando/3.5.1rc
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

7 years agoNew version string for RC
Michael [Fri, 24 Feb 2017 15:02:16 +0000 (15:02 +0000)]
New version string for RC

7 years agoMerge pull request #3184 from tobiasd/20170224-doc
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

7 years agocoding standard for the docs
Tobias Diekershoff [Fri, 24 Feb 2017 07:37:36 +0000 (08:37 +0100)]
coding standard for the docs

7 years agoMerge pull request #2841 from Hypolite/issue/#2103-alt
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

7 years agoMerge pull request #2916 from tobiasd/20160925-changes
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

7 years agoMerge pull request #3182 from annando/bugfix-sql-date
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

7 years agoFor 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
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

7 years agoDefine the lowest possible datetime string as "0001-01-01 00:00:00"
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"

7 years agoMerge remote-tracking branch 'upstream/develop' into 1701-performance
Michael [Thu, 23 Feb 2017 06:55:35 +0000 (06:55 +0000)]
Merge remote-tracking branch 'upstream/develop' into 1701-performance

7 years agoMerge remote-tracking branch 'upstream/develop' into bugfix-sql-date
Michael [Thu, 23 Feb 2017 06:54:50 +0000 (06:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date

7 years agoMerge pull request #3173 from annando/more-temp-stuff
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

7 years agoBugfix for bugfix :-)
Michael [Thu, 23 Feb 2017 05:45:06 +0000 (05:45 +0000)]
Bugfix for bugfix :-)

7 years agoAdded check for invalid "contact-type"
Michael [Wed, 22 Feb 2017 22:25:35 +0000 (22:25 +0000)]
Added check for invalid "contact-type"

7 years agoBugfix for badly formatted date time string.
Michael [Wed, 22 Feb 2017 22:04:56 +0000 (22:04 +0000)]
Bugfix for badly formatted date time string.

7 years agoMerge pull request #3181 from tobiasd/20170222-docinstall
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

7 years agoMerge pull request #3177 from annando/disable-fulltext
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

7 years agoMerge pull request #3179 from tobiasd/20170222-docquickstarten
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

7 years agomake it a code block
Tobias Diekershoff [Wed, 22 Feb 2017 08:37:00 +0000 (09:37 +0100)]
make it a code block

7 years agoMerge remote-tracking branch 'upstream/develop' into more-temp-stuff
Michael [Wed, 22 Feb 2017 06:38:56 +0000 (06:38 +0000)]
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff

7 years agoEN quickstart had some dead links in it, DE version is ok
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

7 years agoregen credits
Tobias Diekershoff [Tue, 21 Feb 2017 20:31:31 +0000 (21:31 +0100)]
regen credits

7 years agoMerge pull request #3178 from eelcomaljaars/sql_mode_doc_update
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

7 years agoDocument reformat as requested - 1 sentence per line
Eelco Maljaars [Tue, 21 Feb 2017 18:32:03 +0000 (19:32 +0100)]
Document reformat as requested - 1 sentence per line

7 years agoAdded note about MySQL sql_mode on newer versions of MySQL
Eelco Maljaars [Tue, 21 Feb 2017 14:59:12 +0000 (15:59 +0100)]
Added note about MySQL sql_mode on newer versions of MySQL

7 years agoSee issue 3157: Fulltext is now disabled
Michael [Tue, 21 Feb 2017 05:23:37 +0000 (05:23 +0000)]
See issue 3157: Fulltext is now disabled

7 years agoissues and stuff
Tobias Diekershoff [Mon, 20 Feb 2017 13:09:32 +0000 (14:09 +0100)]
issues and stuff

7 years agoMerge remote-tracking branch 'upstream/develop' into more-temp-stuff
Michael [Sun, 19 Feb 2017 18:46:20 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff

7 years agoMerge pull request #3171 from Hypolite/bug/fix-diaspora-attachment-links
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

7 years agoMerge pull request #3176 from eelcomaljaars/sql_mode_doc_update
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

7 years agoTypos fixed
Eelco Maljaars [Sun, 19 Feb 2017 15:36:40 +0000 (16:36 +0100)]
Typos fixed

7 years agoRan into an installation problem today that is linked to newer MySQL builds
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.

7 years agoAdded missing mbstring php module to xenial setup in vagrant
Eelco Maljaars [Sun, 19 Feb 2017 14:44:48 +0000 (15:44 +0100)]
Added missing mbstring php module to xenial setup in vagrant

7 years agoEnsure that the spool path is set
Michael [Sun, 19 Feb 2017 10:13:40 +0000 (10:13 +0000)]
Ensure that the spool path is set

7 years agoBugfix for not createable spool path
Michael [Sun, 19 Feb 2017 08:23:21 +0000 (08:23 +0000)]
Bugfix for not createable spool path

7 years agoAdd original_url() param documentation
Hypolite Petovan [Sun, 19 Feb 2017 01:39:16 +0000 (20:39 -0500)]
Add original_url() param documentation

7 years agoAdd param documentation
Hypolite Petovan [Sun, 19 Feb 2017 01:35:31 +0000 (20:35 -0500)]
Add param documentation

7 years agoMerge pull request #3170 from tobiasd/20170217-de
rabuzarus [Sat, 18 Feb 2017 14:20:14 +0000 (15:20 +0100)]
Merge pull request #3170 from tobiasd/20170217-de

DE translations

7 years agoMerge pull request #3167 from Hypolite/bug/comment-box-undefined
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

7 years agoFix Diaspora link attachment probe
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

7 years agoClean trailing whitespaces
Hypolite Petovan [Sat, 18 Feb 2017 03:32:33 +0000 (22:32 -0500)]
Clean trailing whitespaces

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Sat, 18 Feb 2017 01:44:57 +0000 (20:44 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoDE translations
Tobias Diekershoff [Fri, 17 Feb 2017 09:14:38 +0000 (10:14 +0100)]
DE translations

7 years agoMerge pull request #3169 from annando/bugfix-delete-spool
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

7 years agoMerge pull request #3168 from annando/bugfix-contact-posts
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.

7 years agoWe have to delete spool files after posting in any case
Michael [Thu, 16 Feb 2017 20:23:07 +0000 (20:23 +0000)]
We have to delete spool files after posting in any case

7 years agoHandle the case when a contact is unknown.
Michael [Thu, 16 Feb 2017 20:03:44 +0000 (20:03 +0000)]
Handle the case when a contact is unknown.

7 years agoMerge pull request #3166 from annando/bugfix-tempdir
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

7 years ago[frio] Fix comment box not opening on focus, undefined on blur
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

7 years agoMerge pull request #3164 from tobiasd/20170215-quattro
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

7 years agoMerge remote-tracking branch 'refs/remotes/friendica/develop' into develop
Hypolite Petovan [Thu, 16 Feb 2017 03:00:02 +0000 (22:00 -0500)]
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

7 years agoMore analytics to analyze the reason for constantly changing temp paths
Michael [Wed, 15 Feb 2017 21:46:29 +0000 (21:46 +0000)]
More analytics to analyze the reason for constantly changing temp paths

7 years agoMerge pull request #3165 from tobiasd/20170215-sv
fabrixxm [Wed, 15 Feb 2017 08:12:54 +0000 (09:12 +0100)]
Merge pull request #3165 from tobiasd/20170215-sv

SV update to the strings

7 years agoSV update to the strings
Tobias Diekershoff [Wed, 15 Feb 2017 07:13:06 +0000 (08:13 +0100)]
SV update to the strings

7 years agofix for less file of quattro, regen CSS
Tobias Diekershoff [Wed, 15 Feb 2017 06:55:30 +0000 (07:55 +0100)]
fix for less file of quattro, regen CSS

7 years agoMerge pull request #3162 from annando/bugfix-spooling
Tobias Diekershoff [Wed, 15 Feb 2017 06:29:38 +0000 (07:29 +0100)]
Merge pull request #3162 from annando/bugfix-spooling

Bugfix: Only delete spool files that are spool files

7 years agoBugfix: Only delete spool files that are spool files
Michael [Tue, 14 Feb 2017 21:13:00 +0000 (21:13 +0000)]
Bugfix: Only delete spool files that are spool files

7 years agoMerge pull request #3161 from annando/logging-diaspora-relay
rabuzarus [Sat, 11 Feb 2017 23:56:11 +0000 (00:56 +0100)]
Merge pull request #3161 from annando/logging-diaspora-relay

Better logging to analyze unwanted messages from Diaspora

7 years agoBetter logging to analyze unwanted messages from Diaspora
Michael [Sat, 11 Feb 2017 23:37:15 +0000 (23:37 +0000)]
Better logging to analyze unwanted messages from Diaspora

7 years agoMerge pull request #3159 from annando/bugfix-diaspora-relay
Tobias Diekershoff [Sat, 11 Feb 2017 07:58:38 +0000 (08:58 +0100)]
Merge pull request #3159 from annando/bugfix-diaspora-relay

Bugfix: Only accept postings from anyone when the relay is configured

7 years agoMerge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts
Michael Vogel [Fri, 10 Feb 2017 20:51:17 +0000 (21:51 +0100)]
Merge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts

Bugfix: pending contacts shouldn't be available in contacts widget and viewcontacts

7 years agoDiaspora Relay: Only accept postings from anyone when the relay is configured
Michael [Fri, 10 Feb 2017 20:45:22 +0000 (20:45 +0000)]
Diaspora Relay: Only accept postings from anyone when the relay is configured