]> git.mxchange.org Git - friendica.git/log
friendica.git
9 years agoMerge pull request #1677 from annando/1506-vier-threads
Tobias Diekershoff [Mon, 22 Jun 2015 05:55:39 +0000 (07:55 +0200)]
Merge pull request #1677 from annando/1506-vier-threads

Vier: Improved threading

9 years agoVier: Improved threading
Michael Vogel [Sun, 21 Jun 2015 18:40:39 +0000 (20:40 +0200)]
Vier: Improved threading

9 years agoMerge pull request #1676 from tobiasd/20150620-markdown
fabrixxm [Sun, 21 Jun 2015 09:46:13 +0000 (11:46 +0200)]
Merge pull request #1676 from tobiasd/20150620-markdown

markdownification problems

9 years agohide some HTML coded chars from markdownification
Tobias Diekershoff [Sat, 20 Jun 2015 12:27:42 +0000 (14:27 +0200)]
hide some HTML coded chars from markdownification

9 years ago<3 causes troubles in D*
Tobias Diekershoff [Sat, 20 Jun 2015 10:31:34 +0000 (12:31 +0200)]
<3 causes troubles in D*

9 years agoMerge pull request #1674 from fraengii/patch-2
Tobias Diekershoff [Wed, 17 Jun 2015 08:52:11 +0000 (10:52 +0200)]
Merge pull request #1674 from fraengii/patch-2

Update Quick-Start-groupsandpages.md

9 years agoUpdate Quick-Start-groupsandpages.md
Frank Dieckmann [Wed, 17 Jun 2015 08:48:23 +0000 (10:48 +0200)]
Update Quick-Start-groupsandpages.md

Changed the style in line 12. I think it is better now.

9 years agoMerge pull request #1673 from fraengii/patch-1
Tobias Diekershoff [Wed, 17 Jun 2015 08:39:41 +0000 (10:39 +0200)]
Merge pull request #1673 from fraengii/patch-1

Update Connectors.md

9 years agoUpdate Connectors.md
Frank Dieckmann [Wed, 17 Jun 2015 08:32:50 +0000 (10:32 +0200)]
Update Connectors.md

Changed '<domain_des_friendica-servers>/friendica' to '&lt;domain_des_friendica-servers&gt;/friendica'

9 years agoMerge pull request #1672 from tobiasd/20150614-frank
fabrixxm [Mon, 15 Jun 2015 12:00:18 +0000 (14:00 +0200)]
Merge pull request #1672 from tobiasd/20150614-frank

resolving merge issues with DE doc merging

9 years agoMerge pull request #1670 from annando/setup-rewrite-check
Tobias Diekershoff [Mon, 15 Jun 2015 11:25:54 +0000 (13:25 +0200)]
Merge pull request #1670 from annando/setup-rewrite-check

The installation prozess has a problem with self signed certificates

9 years agoMerge pull request #1671 from annando/issue-1642-b
Tobias Diekershoff [Mon, 15 Jun 2015 11:25:26 +0000 (13:25 +0200)]
Merge pull request #1671 from annando/issue-1642-b

This is working fix for issue 1642

9 years agoBOSH server for Jappixmini addon
Tobias Diekershoff [Mon, 15 Jun 2015 11:19:02 +0000 (13:19 +0200)]
BOSH server for Jappixmini addon

9 years agohint in the docs to start from develop
Tobias Diekershoff [Mon, 15 Jun 2015 11:18:32 +0000 (13:18 +0200)]
hint in the docs to start from develop

9 years agoMerge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style'...
Tobias Diekershoff [Mon, 15 Jun 2015 11:07:36 +0000 (13:07 +0200)]
Merge remote-tracking branch 'frank/2015-06-12-fraengii-doc.de-linguistic_style' into 20150614-frank

9 years agoThis is working fix for issue 1642
Michael Vogel [Sun, 14 Jun 2015 23:20:04 +0000 (01:20 +0200)]
This is working fix for issue 1642

9 years agoMerge remote-tracking branch 'upstream/develop' into setup-rewrite-check
Michael Vogel [Sun, 14 Jun 2015 22:55:05 +0000 (00:55 +0200)]
Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check

9 years agoMerge pull request #1668 from annando/issue-1642
fabrixxm [Sun, 14 Jun 2015 13:58:52 +0000 (15:58 +0200)]
Merge pull request #1668 from annando/issue-1642

Better detection for the mobile client to avoid "{0}" in notifications

9 years agoMerge pull request #1669 from annando/1506-ostatus-v3
fabrixxm [Sun, 14 Jun 2015 13:52:10 +0000 (15:52 +0200)]
Merge pull request #1669 from annando/1506-ostatus-v3

Yet another OStatus improvement

9 years agoMerge pull request #1667 from annando/1506-remote-subscribe
fabrixxm [Sun, 14 Jun 2015 13:49:03 +0000 (15:49 +0200)]
Merge pull request #1667 from annando/1506-remote-subscribe

Remote subscribe from a GNU Social site is now possible

9 years agoJust a to-do added
Michael Vogel [Sun, 14 Jun 2015 09:39:15 +0000 (11:39 +0200)]
Just a to-do added

9 years agoOStatus: Force parent when storing item.
Michael Vogel [Sun, 14 Jun 2015 08:56:57 +0000 (10:56 +0200)]
OStatus: Force parent when storing item.

9 years agoprobe_url: Better detection for non-standard installations of GNU Social
Michael Vogel [Sat, 13 Jun 2015 23:52:26 +0000 (01:52 +0200)]
probe_url: Better detection for non-standard installations of GNU Social

9 years agoBetter support for non standard installations of GNU Social in "probe_url"
Michael Vogel [Sat, 13 Jun 2015 23:49:14 +0000 (01:49 +0200)]
Better support for non standard installations of GNU Social in "probe_url"

9 years agoThe installation prozess has a problem with self signed certificates.
Michael Vogel [Sat, 13 Jun 2015 19:58:40 +0000 (21:58 +0200)]
The installation prozess has a problem with self signed certificates.

9 years agoBetter detection for the mobile client to avoid "{0}" in notifications.
Michael Vogel [Sat, 13 Jun 2015 18:23:26 +0000 (20:23 +0200)]
Better detection for the mobile client to avoid "{0}" in notifications.

9 years agoRemote subscribe from a GNU Social site is now possible
Michael Vogel [Sat, 13 Jun 2015 17:51:45 +0000 (19:51 +0200)]
Remote subscribe from a GNU Social site is now possible

9 years agoSend poco data in the atom entries.
Michael Vogel [Sat, 13 Jun 2015 07:59:17 +0000 (09:59 +0200)]
Send poco data in the atom entries.

9 years agoSend a salmon notification when its a ostatus thread or you reply to an ostatus message
Michael Vogel [Sat, 13 Jun 2015 07:12:28 +0000 (09:12 +0200)]
Send a salmon notification when its a ostatus thread or you reply to an ostatus message

9 years agoUpdate contact from poco fields when importing messages/repeated items now het the...
Michael Vogel [Sat, 13 Jun 2015 07:11:17 +0000 (09:11 +0200)]
Update contact from poco fields when importing messages/repeated items now het the same uri.

9 years agofetch the full name of a contact from the poco fields (if present)
Michael Vogel [Sat, 13 Jun 2015 07:08:52 +0000 (09:08 +0200)]
fetch the full name of a contact from the poco fields (if present)

9 years agoUse the display name (full name) instead of the nick name when importing.
Michael Vogel [Sat, 13 Jun 2015 07:07:13 +0000 (09:07 +0200)]
Use the display name (full name) instead of the nick name when importing.

9 years agoCapitalization of german addressing and work on linguistic style
Frank Dieckmann [Fri, 12 Jun 2015 19:10:47 +0000 (21:10 +0200)]
Capitalization of german addressing and work on linguistic style

9 years agoSome bugfixing.
Michael Vogel [Thu, 11 Jun 2015 23:08:06 +0000 (01:08 +0200)]
Some bugfixing.

9 years agoOStatus: Notifier for Friendica, better thread completion
Michael Vogel [Thu, 11 Jun 2015 22:39:56 +0000 (00:39 +0200)]
OStatus: Notifier for Friendica, better thread completion

9 years agoMerge pull request #1662 from annando/issue-1628
Tobias Diekershoff [Thu, 11 Jun 2015 04:33:38 +0000 (06:33 +0200)]
Merge pull request #1662 from annando/issue-1628

The values for "sitename" and "register_text" was nedlessly encoded

9 years agoMerge pull request #1663 from rabuzarus/vier-remote-link
Tobias Diekershoff [Thu, 11 Jun 2015 04:33:07 +0000 (06:33 +0200)]
Merge pull request #1663 from rabuzarus/vier-remote-link

remote-link button in vier

9 years agoMerge pull request #1661 from annando/issue-1640
Tobias Diekershoff [Thu, 11 Jun 2015 04:32:37 +0000 (06:32 +0200)]
Merge pull request #1661 from annando/issue-1640

Improved OEmbed detection

9 years agoMerge pull request #1660 from annando/issue-1657
Tobias Diekershoff [Thu, 11 Jun 2015 04:30:50 +0000 (06:30 +0200)]
Merge pull request #1660 from annando/issue-1657

This fixes issue 1657

9 years agofix remote-link button in vier
rabuzarus [Thu, 11 Jun 2015 00:49:09 +0000 (02:49 +0200)]
fix remote-link button in vier

9 years agoThe values for "sitename" and "register_text" was nedlessly encoded with "htmlentities"
Michael Vogel [Wed, 10 Jun 2015 22:12:16 +0000 (00:12 +0200)]
The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities"

9 years agoImproved OEmbed detection
Michael Vogel [Wed, 10 Jun 2015 21:45:56 +0000 (23:45 +0200)]
Improved OEmbed detection

9 years agoThis fixes issue 1657
Michael Vogel [Wed, 10 Jun 2015 20:54:41 +0000 (22:54 +0200)]
This fixes issue 1657

9 years agoMerge pull request #1659 from annando/1506-ostatus-enclosures
fabrixxm [Wed, 10 Jun 2015 07:23:42 +0000 (09:23 +0200)]
Merge pull request #1659 from annando/1506-ostatus-enclosures

Many OStatus improvements

9 years agoJust two to-dos added
Michael Vogel [Wed, 10 Jun 2015 06:36:51 +0000 (08:36 +0200)]
Just two to-dos added

9 years agoFetch the hub adress while parsing OStatus messages.
Michael Vogel [Tue, 9 Jun 2015 21:53:53 +0000 (23:53 +0200)]
Fetch the hub adress while parsing OStatus messages.

9 years agoMerge pull request #1648 from tobiasd/20150603
fabrixxm [Tue, 9 Jun 2015 06:55:49 +0000 (08:55 +0200)]
Merge pull request #1648 from tobiasd/20150603

uncomment replacement

9 years agoSend a salmon notification to every mentioned person.
Michael Vogel [Tue, 9 Jun 2015 06:27:04 +0000 (08:27 +0200)]
Send a salmon notification to every mentioned person.

9 years agoBetter behaviour when contact wasn't found.
Michael Vogel [Sun, 7 Jun 2015 23:19:40 +0000 (01:19 +0200)]
Better behaviour when contact wasn't found.

9 years agoBugfix: The user id wasn't fetched correctly.
Michael Vogel [Sun, 7 Jun 2015 22:50:02 +0000 (00:50 +0200)]
Bugfix: The user id wasn't fetched correctly.

9 years agoAdding link information
Michael Vogel [Sun, 7 Jun 2015 22:18:44 +0000 (00:18 +0200)]
Adding link information

9 years agoSome code beautification.
Michael Vogel [Sun, 7 Jun 2015 21:53:51 +0000 (23:53 +0200)]
Some code beautification.

9 years agoComplete new OStatus import.
Michael Vogel [Sun, 7 Jun 2015 21:18:02 +0000 (23:18 +0200)]
Complete new OStatus import.

9 years agoOStatus: Attachment links are now added as enclosures
Michael Vogel [Sat, 6 Jun 2015 11:15:37 +0000 (13:15 +0200)]
OStatus: Attachment links are now added as enclosures

9 years agoMerge pull request #1654 from annando/1506-tag-users
Tobias Diekershoff [Thu, 4 Jun 2015 14:49:06 +0000 (16:49 +0200)]
Merge pull request #1654 from annando/1506-tag-users

Bugfix: Feeds weren't imported correctly

9 years agoMerge remote-tracking branch 'upstream/develop' into 1506-tag-users
Michael Vogel [Thu, 4 Jun 2015 05:36:38 +0000 (07:36 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1506-tag-users

9 years agoMerge pull request #1649 from annando/1506-vanished-comments
Tobias Diekershoff [Thu, 4 Jun 2015 04:20:45 +0000 (06:20 +0200)]
Merge pull request #1649 from annando/1506-vanished-comments

The duplication check caused the killing of too much items

9 years agoRemoved bad plink detection.
Michael Vogel [Wed, 3 Jun 2015 19:03:46 +0000 (21:03 +0200)]
Removed bad plink detection.

9 years agoThe duplication check made problems with killing too much items
Michael Vogel [Wed, 3 Jun 2015 14:21:21 +0000 (16:21 +0200)]
The duplication check made problems with killing too much items

9 years agoImproved tagging
Michael Vogel [Wed, 3 Jun 2015 09:27:56 +0000 (11:27 +0200)]
Improved tagging

9 years agouncomment replacement
Tobias Diekershoff [Wed, 3 Jun 2015 08:17:54 +0000 (10:17 +0200)]
uncomment replacement

9 years agoOStatus: New fields in OStatus export/ Auto-tagging of replyed authors.
Michael Vogel [Tue, 2 Jun 2015 23:26:46 +0000 (01:26 +0200)]
OStatus: New fields in OStatus export/ Auto-tagging of replyed authors.

9 years agoMerge remote-tracking branch 'upstream/develop' into 1506-tag-users
Michael Vogel [Tue, 2 Jun 2015 21:19:00 +0000 (23:19 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1506-tag-users

9 years agoMerge pull request #1645 from annando/1506-api
Tobias Diekershoff [Tue, 2 Jun 2015 20:47:41 +0000 (22:47 +0200)]
Merge pull request #1645 from annando/1506-api

Small change in the API (some new Twitter fields - but without function)

9 years agoMerge pull request #1646 from annando/1506-no-url-cleaning
Tobias Diekershoff [Tue, 2 Jun 2015 20:46:37 +0000 (22:46 +0200)]
Merge pull request #1646 from annando/1506-no-url-cleaning

BBCode: In [url] the removing of unknown protocols is disabled

9 years agoMerge pull request #1647 from annando/1506-performance
Tobias Diekershoff [Tue, 2 Jun 2015 20:46:07 +0000 (22:46 +0200)]
Merge pull request #1647 from annando/1506-performance

Performance improvements when searching for existing GUIDs

9 years agoStore the GUID from here as well.
Michael Vogel [Tue, 2 Jun 2015 20:10:28 +0000 (22:10 +0200)]
Store the GUID from here as well.

9 years agoFixes slow performance after one of the last pull requests.
Michael Vogel [Tue, 2 Jun 2015 20:07:39 +0000 (22:07 +0200)]
Fixes slow performance after one of the last pull requests.

9 years agoAlways add the addressed contacts in a post to the tags.
Michael Vogel [Tue, 2 Jun 2015 18:36:10 +0000 (20:36 +0200)]
Always add the addressed contacts in a post to the tags.

9 years agoAvoiding performance problems.
Michael Vogel [Tue, 2 Jun 2015 18:34:48 +0000 (20:34 +0200)]
Avoiding performance problems.

9 years agoMerge pull request #1643 from fabrixxm/issue-1612
Tobias Diekershoff [Tue, 2 Jun 2015 17:38:42 +0000 (19:38 +0200)]
Merge pull request #1643 from fabrixxm/issue-1612

close correctly `span` tag in `oembed_format_object()`

9 years agoMerge pull request #1644 from fabrixxm/issue-1514
Tobias Diekershoff [Tue, 2 Jun 2015 17:38:03 +0000 (19:38 +0200)]
Merge pull request #1644 from fabrixxm/issue-1514

mask '#' in `[url]` url

9 years agomask '#' in `[url]` url
fabrixxm [Tue, 2 Jun 2015 16:59:46 +0000 (18:59 +0200)]
mask '#' in `[url]` url

fix #1514

9 years agoclose correctly `span` tag in `oembed_format_object()`
fabrixxm [Tue, 2 Jun 2015 16:38:16 +0000 (18:38 +0200)]
close correctly `span` tag in `oembed_format_object()`

fix issue #1612

9 years agoMerge pull request #1619 from rabuzarus/block-local-dir
fabrixxm [Tue, 2 Jun 2015 15:53:19 +0000 (17:53 +0200)]
Merge pull request #1619 from rabuzarus/block-local-dir

block local directory for public access

9 years agoSmall change in the API (some new Twitter fields - but without function)
Michael Vogel [Tue, 2 Jun 2015 14:19:40 +0000 (16:19 +0200)]
Small change in the API (some new Twitter fields - but without function)

9 years agoBBCode: In [url] the removing of unknown protocols is disabled
Michael Vogel [Tue, 2 Jun 2015 14:16:40 +0000 (16:16 +0200)]
BBCode: In [url] the removing of unknown protocols is disabled

9 years agoMerge pull request #1641 from tobiasd/20150601-navinfo_hook
fabrixxm [Mon, 1 Jun 2015 12:01:47 +0000 (14:01 +0200)]
Merge pull request #1641 from tobiasd/20150601-navinfo_hook

nav_info hook and documentation in en and de

9 years agonav_info hook and documentation in en and de
Tobias Diekershoff [Mon, 1 Jun 2015 10:00:00 +0000 (12:00 +0200)]
nav_info hook and documentation in en and de

9 years agoMerge pull request #1632 from annando/1505-ostatus2
fabrixxm [Mon, 1 Jun 2015 07:00:17 +0000 (09:00 +0200)]
Merge pull request #1632 from annando/1505-ostatus2

Send a hubsub notification for every comment

9 years agoMerge pull request #1639 from rabuzarus/albums_widget
fabrixxm [Mon, 1 Jun 2015 06:34:18 +0000 (08:34 +0200)]
Merge pull request #1639 from rabuzarus/albums_widget

fix photo_albums upload

9 years agoblock poco if block_local_dir is true
rabuzarus [Sun, 31 May 2015 23:50:27 +0000 (01:50 +0200)]
block poco if block_local_dir is true

9 years agofix Issue #1638
rabuzarus [Sun, 31 May 2015 23:36:37 +0000 (01:36 +0200)]
fix Issue #1638

9 years agoMerge pull request #1636 from rabuzarus/albums_widget
Michael Vogel [Sun, 31 May 2015 16:04:40 +0000 (18:04 +0200)]
Merge pull request #1636 from rabuzarus/albums_widget

make use of global.css

9 years agomake use of global.css
rabuzarus [Sun, 31 May 2015 11:55:21 +0000 (13:55 +0200)]
make use of global.css

9 years agoBugfix: You wasn't able to add an OStatus contact when you are following the same...
Michael Vogel [Sun, 31 May 2015 11:28:16 +0000 (13:28 +0200)]
Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector.

9 years agoSend a hubsub notification for every comment
Michael Vogel [Sun, 31 May 2015 08:38:00 +0000 (10:38 +0200)]
Send a hubsub notification for every comment

9 years agoMerge pull request #1630 from annando/1505-ostatus
fabrixxm [Sun, 31 May 2015 08:08:24 +0000 (10:08 +0200)]
Merge pull request #1630 from annando/1505-ostatus

OStatus communication improvements

9 years agoMerge pull request #1622 from rabuzarus/albums_widget
fabrixxm [Sun, 31 May 2015 08:07:43 +0000 (10:07 +0200)]
Merge pull request #1622 from rabuzarus/albums_widget

move html to photo_albums.tpl

9 years agoMerge pull request #1627 from rabuzarus/section-title
Michael Vogel [Sun, 31 May 2015 07:52:46 +0000 (09:52 +0200)]
Merge pull request #1627 from rabuzarus/section-title

move html of h2 headings to section_title.tpl

9 years agoMerge pull request #1620 from tobiasd/20150529-de
Michael Vogel [Sat, 30 May 2015 23:05:11 +0000 (01:05 +0200)]
Merge pull request #1620 from tobiasd/20150529-de

DE update to the strings

9 years agoOStatus replies should now work even if the thread starter isn't in the mentions.
Michael Vogel [Sat, 30 May 2015 22:26:11 +0000 (00:26 +0200)]
OStatus replies should now work even if the thread starter isn't in the mentions.

9 years agoOstatus: The automatical adding of @-replies now uses the correct contact.
Michael Vogel [Sat, 30 May 2015 19:45:43 +0000 (21:45 +0200)]
Ostatus: The automatical adding of @-replies now uses the correct contact.

9 years agoCleaning the code from several tests.
Michael Vogel [Sat, 30 May 2015 19:08:24 +0000 (21:08 +0200)]
Cleaning the code from several tests.

9 years agoCleaning the code.
Michael Vogel [Sat, 30 May 2015 19:00:38 +0000 (21:00 +0200)]
Cleaning the code.

9 years agoPuSH: Publishing moved to a new process. OStatus comments are now published to all...
Michael Vogel [Sat, 30 May 2015 18:47:53 +0000 (20:47 +0200)]
PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers.

9 years agohtml to section_title.tpl
rabuzarus [Sat, 30 May 2015 00:21:30 +0000 (02:21 +0200)]
html to section_title.tpl

9 years agosection_title
rabuzarus [Sat, 30 May 2015 00:16:43 +0000 (02:16 +0200)]
section_title

9 years agocleaning after local merge
rabuzarus [Fri, 29 May 2015 14:30:42 +0000 (16:30 +0200)]
cleaning after local merge

9 years agoMerge photo-template into develop
rabuzarus [Fri, 29 May 2015 14:24:58 +0000 (16:24 +0200)]
Merge photo-template into develop