Commit graph

3246 commits

Author SHA1 Message Date
Michael Vogel
7f052b654f PuSH now supports answers to OStatus messages inside of Friendica threads as well. 2015-06-25 07:18:02 +02:00
Michael Vogel
7581bd0f36 Send a salmon notice whenever an OStatus user is mentioned. 2015-06-25 00:47:59 +02:00
64655ee546 Merge pull request #1687 from annando/1506-location-api
API: Return the geo coordinates
2015-06-25 00:00:01 +02:00
Michael Vogel
db256217e6 Removed test 2015-06-24 22:51:46 +02:00
Michael Vogel
5bf7a3b7a5 Fixed inReplyTo in conversations 2015-06-24 22:31:38 +02:00
Michael Vogel
87ade53162 Some test code added 2015-06-24 14:21:42 +02:00
Fabrixxm
511c2d2c91 rino: settings in admin, choose lowest common on notify 2015-06-23 17:36:26 +02:00
Fabrixxm
6fbb02fb93 RINO 2 based on php-encryption
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
2015-06-23 16:13:09 +02:00
Fabrixxm
7d83a19fd4 Disable RINO
Comment out functions for RINO crypt and disable RINO request and response.
2015-06-23 12:02:35 +02:00
Fabrixxm
4203132e1a Remove various unused crypto functions 2015-06-23 10:52:02 +02:00
Michael Vogel
7e4fc930b4 API: Return the geo coordinates 2015-06-23 07:32:14 +02:00
Michael Vogel
a7cf3639f0 Just some more fixing for issue 1642 2015-06-22 23:47:08 +02:00
a58596e00a Merge pull request #1678 from annando/1506-ostatus-completion
OStatus: Still some room for improvements
2015-06-22 07:59:40 +02:00
Michael Vogel
e9542a8d17 OStatus: Support for events and questions 2015-06-21 22:36:24 +02:00
Michael Vogel
da9bbc92d3 OStatus: Support for bookmarks 2015-06-21 22:02:44 +02:00
Michael Vogel
2afc9c31f9 Changed logging behaviour 2015-06-21 08:32:03 +02:00
Michael Vogel
5221f38db7 ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them. 2015-06-21 01:37:09 +02:00
Michael Vogel
8229737d2d Small restructuring 2015-06-21 01:36:23 +02:00
Michael Vogel
846edd5bbb Bugfix for repeated items in conversations 2015-06-20 17:26:47 +02:00
Michael Vogel
1bbbf2a5f2 Stuff ... 2015-06-20 14:41:53 +02:00
Michael Vogel
c8430f4c44 Moved all OStatus code in a single file. 2015-06-20 14:40:30 +02:00
7c48ed60eb hide some HTML coded chars from markdownification 2015-06-20 14:27:42 +02:00
8fa2030023 <3 causes troubles in D* 2015-06-20 12:31:34 +02:00
Michael Vogel
168906f9c9 Code cleanup 2015-06-20 09:15:19 +02:00
Michael Vogel
6fbb03801c The OStatus completion is now called before the original item is stored. 2015-06-20 08:44:29 +02:00
Michael Vogel
9ca04e4e69 Just a to-do added 2015-06-14 11:39:15 +02:00
Michael Vogel
fa288173c3 OStatus: Force parent when storing item. 2015-06-14 10:56:57 +02:00
Michael Vogel
b7f270de28 probe_url: Better detection for non-standard installations of GNU Social 2015-06-14 01:52:26 +02:00
Michael Vogel
e0147a24ad Send poco data in the atom entries. 2015-06-13 09:59:17 +02:00
Michael Vogel
9a6511dc38 Send a salmon notification when its a ostatus thread or you reply to an ostatus message 2015-06-13 09:12:28 +02:00
Michael Vogel
740bc41680 Update contact from poco fields when importing messages/repeated items now het the same uri. 2015-06-13 09:11:17 +02:00
Michael Vogel
e36627c7b7 fetch the full name of a contact from the poco fields (if present) 2015-06-13 09:08:52 +02:00
Michael Vogel
4704933b6e Use the display name (full name) instead of the nick name when importing. 2015-06-13 09:07:13 +02:00
Michael Vogel
60ad7af6f3 Some bugfixing. 2015-06-12 01:08:06 +02:00
Michael Vogel
ad45ff7eb1 OStatus: Notifier for Friendica, better thread completion 2015-06-12 00:39:56 +02:00
Michael Vogel
cad591b1ec Improved OEmbed detection 2015-06-10 23:45:56 +02:00
fabrixxm
8e800af306 Merge pull request #1659 from annando/1506-ostatus-enclosures
Many OStatus improvements
2015-06-10 09:23:42 +02:00
Michael Vogel
f1fe38d5c7 Just two to-dos added 2015-06-10 08:36:51 +02:00
Michael Vogel
81b609562e Fetch the hub adress while parsing OStatus messages. 2015-06-09 23:53:53 +02:00
fabrixxm
a32147f722 Merge pull request #1648 from tobiasd/20150603
uncomment replacement
2015-06-09 08:55:49 +02:00
Michael Vogel
cb0351dba0 Send a salmon notification to every mentioned person. 2015-06-09 08:27:04 +02:00
Michael Vogel
fb72871f66 Bugfix: The user id wasn't fetched correctly. 2015-06-08 00:50:02 +02:00
Michael Vogel
b24a46f889 Adding link information 2015-06-08 00:18:44 +02:00
Michael Vogel
af79cd316c Some code beautification. 2015-06-07 23:53:51 +02:00
Michael Vogel
a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel
f34135f34d OStatus: Attachment links are now added as enclosures 2015-06-06 13:15:37 +02:00
Michael Vogel
ba36910343 Removed bad plink detection. 2015-06-03 21:03:46 +02:00
c00f73c836 uncomment replacement 2015-06-03 10:17:54 +02:00
Michael Vogel
b60677ef1b OStatus: New fields in OStatus export/ Auto-tagging of replyed authors. 2015-06-03 01:26:46 +02:00
209e957de4 Merge pull request #1645 from annando/1506-api
Small change in the API (some new Twitter fields - but without function)
2015-06-02 22:47:41 +02:00
6e5ba7bb9b Merge pull request #1646 from annando/1506-no-url-cleaning
BBCode: In [url] the removing of unknown protocols is disabled
2015-06-02 22:46:37 +02:00
7305a27392 Merge pull request #1647 from annando/1506-performance
Performance improvements when searching for existing GUIDs
2015-06-02 22:46:07 +02:00
Michael Vogel
bea70296bf Fixes slow performance after one of the last pull requests. 2015-06-02 22:07:39 +02:00
Michael Vogel
dd06912493 Avoiding performance problems. 2015-06-02 20:34:48 +02:00
941c784fa2 Merge pull request #1643 from fabrixxm/issue-1612
close correctly `span` tag in `oembed_format_object()`
2015-06-02 19:38:42 +02:00
fabrixxm
20b14b053a mask '#' in [url] url
fix #1514
2015-06-02 18:59:46 +02:00
fabrixxm
e028263ca8 close correctly span tag in oembed_format_object()
fix issue #1612
2015-06-02 18:38:16 +02:00
Michael Vogel
896cb6ebf0 Small change in the API (some new Twitter fields - but without function) 2015-06-02 16:19:40 +02:00
Michael Vogel
939e5abfee BBCode: In [url] the removing of unknown protocols is disabled 2015-06-02 16:16:40 +02:00
fabrixxm
620455c4de Merge pull request #1641 from tobiasd/20150601-navinfo_hook
nav_info hook and documentation in en and de
2015-06-01 14:01:47 +02:00
ec7f70e9aa nav_info hook and documentation in en and de 2015-06-01 12:00:00 +02:00
Michael Vogel
2856042824 Send a hubsub notification for every comment 2015-05-31 10:38:00 +02:00
fabrixxm
18e44001e5 Merge pull request #1630 from annando/1505-ostatus
OStatus communication improvements
2015-05-31 10:08:24 +02:00
Michael Vogel
d732d9d1a8 OStatus replies should now work even if the thread starter isn't in the mentions. 2015-05-31 00:26:11 +02:00
Michael Vogel
a3118e0a6e Cleaning the code from several tests. 2015-05-30 21:08:24 +02:00
Michael Vogel
4750775752 Cleaning the code. 2015-05-30 21:00:38 +02:00
Michael Vogel
e66489d67f PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers. 2015-05-30 20:47:53 +02:00
rabuzarus
74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
Michael Vogel
594f3e2815 Merge remote-tracking branch 'upstream/develop' into 1505-ostatus 2015-05-29 10:55:07 +02:00
Michael Vogel
b763c810fb OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now) 2015-05-29 10:35:13 +02:00
fabrixxm
f12430a285 Merge pull request #1617 from annando/1505-diaspora-objecttype
OStatus and Diaspora improvements
2015-05-29 08:40:58 +02:00
Michael Vogel
487d57df45 Fetch the author url and not the id. 2015-05-28 08:02:34 +02:00
Michael Vogel
24962f3002 OStatus completion: The id and the plink for fetched items should now have reliable values. 2015-05-28 07:51:12 +02:00
fabrixxm
b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574
Issue #1574
2015-05-27 11:07:30 +02:00
Michael Vogel
bdd5c05668 OStatus: Don't be confused by posts from the statusnet connector. 2015-05-27 08:16:05 +02:00
Michael Vogel
03214254ff OStatus: Improved duplicate check. 2015-05-26 23:33:38 +02:00
Michael Vogel
7e401ca199 Improved check for duplicates. Improvements with reshared Diaspora items. 2015-05-25 19:07:59 +02:00
Michael Vogel
0c752a2190 Diaspora: Store the original XML and the object type. 2015-05-25 13:27:45 +02:00
rabuzarus
b3054ee9d0 template for searchbox 2015-05-24 20:01:08 +02:00
fabrixxm
b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm
4554526515 Merge pull request #1570 from rabuzarus/archive-widget
port of red matrix archive widget
2015-05-24 10:18:10 +02:00
fabrixxm
3a71978b0d Merge pull request #1598 from rabuzarus/datepicker
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm
83697cf3e5 Delete attachments on item deletion
Delete video from videos page
2015-05-23 22:35:02 +02:00
Michael Vogel
ab67788b4e SQL speed increase for query and search. 2015-05-23 01:23:31 +02:00
rabuzarus
2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
fabrixxm
51f8427333 Merge pull request #1585 from annando/issue-1572
Contact requests to a "FREELOVE" account resulted in "read only" contacts
2015-05-21 08:40:37 +02:00
Michael Vogel
1c8b9b73f7 Issue 1572: Contact requests to a "FREELOVE" account resulted in "read only" contacts 2015-05-20 21:35:57 +02:00
rabuzarus
30348a1bc0 port of red matrix archive-widget 2015-05-19 01:03:08 +02:00
fabrixxm
996224a8a4 Merge pull request #1567 from fabrixxm/feature/map
Fix stupid typo in include/event.php
2015-05-18 10:08:30 +02:00
fabrixxm
fc54ee2928 Fix stupid typo in include/event.php
That leads to blank events page
2015-05-18 09:54:43 +02:00
Michael Vogel
2038e65a57 Bugfix: The function "z_fetch_url" created warnings under certain circumstances. 2015-05-16 22:38:41 +02:00
72e3ffbb4d Merge pull request #1563 from annando/1505-no-intelligent-shortening
Disable intelligent shortening - issue 1540
2015-05-16 12:04:28 +02:00
fabrixxm
19ee5797fa add map to events 2015-05-15 21:10:43 +02:00
Michael Vogel
d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
fabrixxm
6258a21434 map bbcode tag from Red 2015-05-15 20:41:10 +02:00
2dd8db7de8 Merge pull request #1554 from FlxAlbroscheit/develop-1
Issue #1504: Creating groups directly from the sidebar in contacts-page
2015-05-13 19:59:58 +02:00
FlxAlbroscheit
57c47a8e36 Add a group with one click 2015-05-12 14:04:42 +02:00
a138d5d8c0 Merge pull request #1549 from annando/1505-diaspora-fetch-missing
Fetch missing Diaspora posts
2015-05-12 07:14:16 +02:00
Michael Vogel
33e572409d There was no check for duplicated GUIDs, so doubled posts could occur. 2015-05-10 20:43:41 +02:00
Michael Vogel
5d1bd96076 Set the login date for every identity of the user. 2015-05-09 23:47:45 +02:00
Michael Vogel
9d257df700 Fetch missing Diaspora posts 2015-05-09 19:39:47 +02:00
Michael Vogel
b2ecf805ea Missing $ 2015-05-03 22:40:20 +02:00
Michael Vogel
faeae280c7 Bugfix: There should be no problems anymore with empty Diaspora reshares. 2015-05-03 22:15:26 +02:00
Michael Vogel
d4a172c142 Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures 2015-05-03 21:25:03 +02:00
a37f31b82f Merge pull request #1545 from annando/1503-load-issues
Value for maximum load until the frontend quits service
2015-05-03 09:15:54 +02:00
Michael Vogel
0812b7a7ac Merge remote-tracking branch 'upstream/develop' into 1503-load-issues 2015-05-02 21:47:34 +02:00
Michael Vogel
439aee0a82 Automatically resize iframe if no height was provided. 2015-05-01 14:29:53 +02:00
Michael Vogel
747607fe97 Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode 2015-05-01 11:06:39 +02:00
Michael Vogel
be96b1eaa4 rich content in oembed now replaces the content in attachments 2015-05-01 10:42:43 +02:00
Michael Vogel
b5e10329f2 The oembed iframe now has a class name to use it for stylesheets. 2015-04-30 06:12:21 +02:00
Michael Vogel
d8558366aa Redefined the conditions when notifications and introductions are shown. 2015-04-26 22:16:38 +02:00
Michael Vogel
58aeb1879b API: The "conversation" function can now be called with every message id of a post in that conversation. Not only the parent. 2015-04-26 13:26:48 +02:00
Michael Vogel
20fc0e5285 Don't generate a preview in an item from Diaspora if it is a posting from red matrix. 2015-04-25 00:50:48 +02:00
Michael Vogel
e2827c0af7 The ID field will be stored with notifications as well. 2015-04-21 10:14:20 +02:00
Michael Vogel
261cd441c7 Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications 2015-04-21 10:13:28 +02:00
Hauke Altmann
62b4f117bf bug fix: "local_" has 6 not 5 characters 2015-04-17 10:02:17 +02:00
Hauke Altmann
c292d01723 bug fix: substring is not a PHP function %-) 2015-04-17 09:59:28 +02:00
hauke
00cbc383f5 code cleanup 2015-04-16 21:07:46 +02:00
hauke
0d61e462fe preserve local index of friendica database when updating 2015-04-16 21:05:37 +02:00
Michael Vogel
d42cea51a2 The item id is now stored in every notification as well 2015-04-16 07:18:06 +02:00
Michael Vogel
2285b3b7a7 Storing the parent with every notification 2015-04-14 06:54:41 +02:00
Michael Vogel
178b7eba1b Merge pull request #1487 from fabrixxm/projects
new api dfrn/remoteauth, allow plugins to use update_structure
2015-04-13 15:47:11 +02:00
Gregory Smith
ce821d0891 use ImageMagick for orientation when available 2015-04-12 21:09:25 -04:00
Michael Vogel
9a35e861ce New field in the contact table to better detect "dead profiles" 2015-04-12 11:40:38 +02:00
fabrixxm
a0adf8c6a2 change remoteauth endpoint path 2015-04-12 08:53:30 +02:00
fabrixxm
8b2742dc7d Merge pull request #1505 from annando/1504-unified-follow
The behaviour when following a new contact is now unified
2015-04-12 08:48:36 +02:00
Michael Vogel
04d9d9863d Fixed "Copy and paste" bug. 2015-04-11 23:56:53 +02:00
Michael Vogel
0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Michael Vogel
f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
fabrixxm
73248f7dda allow to update generic subsets of tables 2015-04-06 21:03:11 +02:00
fabrixxm
11a83b2345 add new api dfrn/remoteauth
allow 'user@server' as username in api_login()
2015-04-06 21:03:11 +02:00
Michael Vogel
5e2c93e80c Merge remote-tracking branch 'upstream/develop' into 1503-load-issues 2015-04-06 13:30:22 +02:00
81901f39e5 Merge pull request #1484 from annando/1504-bugfix-sql-warning
Bugfix: Avoid SQL warnings because of empty id list
2015-04-06 12:56:03 +02:00
Michael Vogel
4768c6c6b6 Diaspora: Central "plink" function 2015-04-06 12:26:31 +02:00
Michael Vogel
739219278b Avoid SQL warnings because of empty id list. 2015-04-06 10:12:37 +02:00
Michael Vogel
3cbd72d907 API: New picture upload function (Enhanced Twidere support) 2015-04-06 03:19:12 +02:00
Michael Vogel
cdebdc777e Removed test logger 2015-04-05 21:06:32 +02:00
Michael Vogel
57528cb987 New function for building the "share" header 2015-04-05 20:43:06 +02:00
fabrixxm
1523aecebd Merge pull request #1472 from annando/issue-1063
The unseen marker is now set according to the api output
2015-04-03 15:07:56 +02:00
Michael Vogel
e9a2cf7a91 The unseen marker is now set according to the query that is used for the home timeline. 2015-04-03 14:58:42 +02:00
Michael Vogel
796b13673d Reshared posts weren't always recognized as such. 2015-04-03 13:06:19 +02:00
Michael Vogel
7c0c56d20b The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote. 2015-04-03 12:37:29 +02:00
Michael Vogel
c3f3a239f4 Issue 1038: Send update to directory when account is removed. 2015-03-30 22:22:11 +02:00
Michael Vogel
51cd55c8ad Some more logging added for the DDoS prevention 2015-03-28 08:49:24 +01:00
Michael Vogel
0206f447e1 Preventing a DDoS with the zrl parameter. 2015-03-28 08:29:01 +01:00
Michael Vogel
dbb164ca4a Merge pull request #1449 from fabrixxm/issue-1370
Create `database.sql` from `include\dbstructure.php`
2015-03-25 22:02:50 +01:00
fabrixxm
7c33c9cca1 fix SQL generation, update database.sql 2015-03-25 10:03:17 +01:00
fabrixxm
b2b1de5a01 Create database.sql from include\dbstructure.php
add two commands to `dbstructure.php` when called from cli:
'update' updates the database schema
'dumpsql' dump database sql to stdout
2015-03-25 09:47:59 +01:00
Michael Vogel
25dbf26345 Removed the special detection for facebook and app.net since both provide RSS feeds. 2015-03-24 23:08:46 +01:00
Michael Vogel
3d297c065e Merge pull request #1444 from fabrixxm/issue-1341
fix paginate url
2015-03-23 15:19:35 +01:00
fabrixxm
8b5d9c32a7 Merge pull request #1446 from annando/issue-905
Diaspora: The signature of likes are checked now correctly
2015-03-23 12:06:46 +01:00
Michael Vogel
b40f19262a Diaspora: The signature of likes are checked now correctly.
enter the commit message for your changes. Lines starting
2015-03-22 21:53:13 +01:00
fabrixxm
a98d2ee387 ignore tags inside code block
should fix issue #1041
2015-03-22 17:12:51 +01:00
fabrixxm
add3411542 fix paginate url
pagination url wasn't alway stripping 'page' parameter from url
related to issue #1341
2015-03-22 16:38:05 +01:00
hauke
b2a86ceeaa bugfix #1307 2015-03-22 10:02:00 +01:00
Michael Vogel
81b199cfdc The global copy now copies comments as well. This is important for the search. 2015-03-21 20:23:47 +01:00
Michael Vogel
ae172a9cec If the load is too high, now not only the poller but also the page delivery will stop. 2015-03-15 07:45:50 +01:00
82abc32a14 Merge pull request #1426 from annando/1503-term-search
The index for the term search is now massively improved
2015-03-12 07:15:05 +01:00
Michael Vogel
7a39626a6c The index for the term search is now massively improved. 2015-03-10 00:23:49 +01:00
Michael Vogel
94302a7924 Reworked guid function. 2015-03-09 20:59:57 +01:00
Michael Vogel
ea06a1ec45 There is now a "global" field in the item table that tells if this item is present as global copy as well. 2015-03-09 00:45:53 +01:00
Michael Vogel
2260415ca9 "global" flag for terms that indicate if the term is present in the global posts. 2015-03-08 03:27:14 +01:00
Michael Vogel
e2965c9ec5 Removed the timestamp for parser. 2015-03-08 03:25:32 +01:00
Michael Vogel
dbe8275ae5 Added some more timestamp measuring 2015-03-07 23:14:26 +01:00
Michael Vogel
7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00
Michael Vogel
e5fc28bb31 Removed some unnecessary code 2015-03-07 21:10:02 +01:00
Michael Vogel
dc380d7800 Adding some more data to Diaspora reshares 2015-03-07 21:09:32 +01:00
Michael Vogel
30548dfeed Improving performance measuring for the bbcode parser. 2015-03-07 21:08:22 +01:00
Michael Vogel
df880f7fd2 Adding performance measuring to the photo functions. 2015-03-07 21:07:26 +01:00
Michael Vogel
4a10cb1b99 Disabled the rewriting of hashtag links 2015-03-03 14:10:42 +01:00
Michael Vogel
027b11ebb5 Small bugfix for likes 2015-03-02 23:34:59 +01:00
Michael Vogel
3b9a8daeeb Merge remote-tracking branch 'upstream/develop' into 1503-hashtag-handling 2015-03-02 07:37:31 +01:00
Michael Vogel
9e55dbf1db There is already a setting for that ... 2015-03-02 00:32:46 +01:00
Michael Vogel
52e33d50ad Changing header sizes and changing the header type of oembed data. 2015-03-01 21:58:31 +01:00
Michael Vogel
da49814cbb Use a header element for the oembed data. 2015-03-01 21:24:10 +01:00
Michael Vogel
579ac83547 Fixing problems with single linefeeds in the Markdown conversion. 2015-03-01 21:22:06 +01:00
Michael Vogel
3f1d186106 Remove the old hashtag functions, change it to the new functionality. 2015-03-01 20:40:38 +01:00
Michael Vogel
bf0f7c3d0a New bbcode elements h1 to h6 for a better conversion of Diaspora content 2015-03-01 20:07:56 +01:00
Michael Vogel
ac3a4824df Check for hashtags when storing them and eventually adding hashtag links 2015-03-01 17:33:55 +01:00
Michael Vogel
5cb6d6e537 We have to disable the SSL checks, otherwise the communication will fail for servers with self-signed certificates 2015-03-01 10:53:49 +01:00
20208acb23 Merge pull request #1417 from annando/1502-improved-markdown
Updated libraries for Markdown and mobile detection
2015-02-28 08:17:22 +01:00
f1b0258fdd Merge pull request #1415 from annando/1502-like-no-update-commented
New Global setting: like shouldn't set "commented"
2015-02-28 08:15:12 +01:00
Michael Vogel
b827824faf Trying to avoid parser problems. 2015-02-24 20:39:02 +01:00
Michael Vogel
5c94a2420a Removed old library 2015-02-24 11:08:23 +01:00
Michael Vogel
671a36682a Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown 2015-02-24 10:24:07 +01:00
Michael Vogel
d4b0a9ea2a Solving parsing problems with the markdown library and html elements. 2015-02-24 10:21:09 +01:00
Fabrixxm
caa21e6021 Merge branch 'master' into develop 2015-02-24 09:09:02 +01:00
Michael Vogel
fcaf71691f Diaspora: Bugfix for the hashtag detection of incoming posts 2015-02-24 00:12:30 +01:00
Michael Vogel
17bd46793e Some fixes for the Markdown converter especially for Libertree. 2015-02-24 00:05:50 +01:00
Michael Vogel
440e2d82b1 Global setting for the behaviour of likes. 2015-02-23 12:44:50 +01:00
Johannes Schwab
1cd1f7587c fix validate_email 2015-02-23 12:20:05 +01:00
Michael Vogel
4a6a6ca937 Bugfix for spaces in links 2015-02-22 20:06:13 +01:00
Michael Vogel
2f46675a89 New routines for markdown to html and html to markdown. 2015-02-22 17:38:28 +01:00
Michael Vogel
9eeff0d891 Received "likes" and "dislikes" don't update the "commented" value anymore. 2015-02-22 17:34:04 +01:00
Michael Vogel
dfdb804323 Beautified the poller logging 2015-02-19 22:38:02 +01:00
Michael Vogel
ab5bf06873 Restructured and simplified the poller check 2015-02-19 22:30:16 +01:00
Michael Vogel
68c9707221 The poller now always respects the priority setting for feeds. 2015-02-19 22:04:05 +01:00
Michael Vogel
4c901e60cc More logging for the poller. Changed the query for the contacts to reduce the amount of contacts 2015-02-19 21:36:29 +01:00
Michael Vogel
6d8c126179 Do the directory change only when it is needed. 2015-02-19 10:45:46 +01:00
Michael Vogel
96c642661e The poller can now be called even inside the "include" directory. 2015-02-19 10:26:49 +01:00
Michael Vogel
2f79e98cda Issue 1228: Pictures aren't sent via API in comments. 2015-02-17 20:43:11 +01:00
Michael Vogel
d9f222b330 Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco) 2015-02-17 07:34:04 +01:00
Michael Vogel
2e1acf7611 Just some more code beautification 2015-02-16 22:30:46 +01:00
Michael Vogel
9d920033e8 Just removing unused codelines 2015-02-16 22:28:24 +01:00
Michael Vogel
8b1b886797 Improved probe_url, fixed wrong network detection. 2015-02-16 22:11:51 +01:00
Michael Vogel
2dafc9eac1 Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter 2015-02-15 10:54:41 +01:00
Michael Vogel
d1d794f1ab The global contacts now contain a "generation" value that defines how we know this contact 2015-02-15 10:52:45 +01:00
d39612ac25 Merge pull request #1393 from annando/1502-cleaned-item-storage-code
Additional check for notifications
2015-02-14 15:40:35 +01:00
Michael Vogel
75797c61f2 Improved logging with receiving mails 2015-02-13 08:09:27 +01:00
Johannes Schwab
12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
Michael Vogel
3c8fc863a8 The "share a post" notification is now sent based upon mentions as well. 2015-02-11 07:19:48 +01:00
Michael Vogel
9287a0521a Merge remote-tracking branch 'upstream/develop' into 1502-cleaned-item-storage-code 2015-02-11 07:07:31 +01:00
Matthew Exon
2bb8b77123 Close cURL handle before recursing, so that cookie file is flushed 2015-02-11 03:42:07 +00:00
Fabrixxm
135869fd1c Merge branch 'release-3.3.3' into develop 2015-02-10 16:04:22 +01:00
Fabrixxm
87f9258834 Merge branch 'mat/mergerequest' of https://github.com/mexon/friendica into mexon-mat/mergerequest 2015-02-10 10:57:26 +01:00
Michael Vogel
1a75503b1c Relocated the cache code. 2015-02-10 08:22:21 +01:00
Matthew Exon
d12b929c96 Accept lowercase location header 2015-02-10 03:14:08 +00:00
Michael Vogel
2dc5f1aefc Removed cache code, since it was superfluous. 2015-02-09 23:04:18 +01:00
Michael Vogel
091c3e75ca Rearranged code in item storage. 2015-02-09 21:52:08 +01:00
e051da8203 Merge pull request #1382 from fabrixxm/localize-activity-poke
Fix localization of poke activity + update IT strings
2015-02-09 13:25:50 +01:00
Fabrixxm
5d19b21298 fix translation of poke activity body 2015-02-09 11:54:50 +01:00
Matthew Exon
1c31dca5d6 Support feeds without XML headers 2015-02-09 10:21:27 +00:00
Fabrixxm
ff41cc24bd Emailer: fix text-only email 2015-02-09 11:21:10 +01:00
Michael Vogel
136626c199 Just a little bit more code clean up. 2015-02-08 21:03:04 +01:00
Michael Vogel
7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel
a97d4383a1 Searching for items now always searches public entries from the central item storage with uid=0. 2015-02-08 15:59:22 +01:00
fabrixxm
f620834d97 Merge branch 'release-3.3.3' into develop 2015-02-07 12:57:12 +01:00
Michael Vogel
d87ab3cd97 Correct the contact data if it was changed although the system don't thinks so. 2015-02-06 21:02:33 +01:00
Johannes Schwab
1114ae4c81 fix urls for pager 2015-02-06 17:04:48 +01:00
fabrixxm
aa720eb277 Merge pull request #1357 from annando/1502-html-poco-2
html to bbcode convertion in poco - 2nd try
2015-02-05 11:21:23 +01:00
Michael Vogel
9641436996 The relocate message hadn't changed the "nurl" value. 2015-02-04 20:22:05 +01:00
Michael Vogel
742a6dcf6e Due to some git problems, just the same stuff again (html to bbcode conversation in poco) 2015-02-04 19:49:43 +01:00
710bd08c30 adopting red matrix iconography for red# 2015-02-04 08:47:57 +01:00
Michael Vogel
226b551c85 Only some code beautification. 2015-02-03 07:00:01 +01:00
Michael Vogel
9851965090 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-03 00:30:37 +01:00
Michael Vogel
86a968002d Look for links to diaspora posts and try to fetch them if they aren't on the system. 2015-02-03 00:29:21 +01:00
Michael Vogel
8d0030c9d5 Revert some stuff from another pull request. I like git ... 2015-02-02 22:24:21 +01:00
Michael Vogel
8490bedefe Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-02 22:15:39 +01:00
Michael Vogel
62b32e7c93 Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup 2015-02-02 22:08:40 +01:00
b41d14afe3 Merge pull request #1343 from annando/1502-diaspora-guid-links
Diaspora internal GUID links are now converted correctly
2015-02-02 22:03:09 +01:00
2efc789aee Merge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora
Improvement for the "new friend" notification with Diaspora and "remote self"
2015-02-02 21:51:35 +01:00
Michael Vogel
46dd453e5b Diaspora internal GUID links are now converted correctly. 2015-02-02 20:26:05 +01:00
Michael Vogel
80ee58f8aa Just an added to-do comment 2015-02-02 20:24:19 +01:00
Michael Vogel
9d155a62f9 New function to fetch and store an item based on the guid. 2015-02-01 21:54:44 +01:00
Michael Vogel
75c60b2595 The alias can - or can not - be an SSL link. 2015-02-01 16:32:58 +01:00
Michael Vogel
d1dd50e9b0 Diaspora: The "new friend" notification now respects the corresponding setting/"new friend" notification isn't send via "remote self" anymore. 2015-02-01 16:04:16 +01:00
Michael Vogel
b95d34f9db Aliases are now handled correctly. The public item copy gets a "real" contact id as well. 2015-02-01 13:32:05 +01:00
Michael Vogel
e02b982f77 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-01 13:28:32 +01:00
Michael Vogel
e3da549ab5 Reshared diaspora items that aren't on this server are now stored with uid=0 2015-02-01 10:26:35 +01:00
Michael Vogel
6eb4254d06 The query after an API post was improved to make it faster. 2015-01-31 23:13:21 +01:00