Commit graph

3186 commits

Author SHA1 Message Date
Michael Vogel d6d51e0259 Don't deliver answers to OStatus messages to Diaspora 2015-07-05 16:27:03 +02:00
Michael Vogel c356da2cad Diaspora: Improved parsing of linefeeds 2015-07-05 02:33:28 +02:00
Michael Vogel 43f98bc854 When posting to Diaspora, now the contact names are containing the link to the user profile. 2015-07-04 23:49:52 +02:00
Tobias Diekershoff 3349bba665 Merge pull request #1722 from annando/1506-password-on-install
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel 055ee962c9 Ability to enter a password when the first user is created 2015-06-30 23:37:31 +02:00
fabrixxm 5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
fabrixxm 97161413e7 Merge pull request #1714 from annando/1506-mail-link-profile
Show preselected mail receivers
2015-06-30 08:37:40 +02:00
fabrixxm 7a0f2b61ab Merge pull request #1713 from annando/1506-ostatus-completion-timeframe
There is now two different checks for the completion of conversations
2015-06-30 08:36:33 +02:00
fabrixxm 76737fbf7b Merge pull request #1712 from annando/1506-ostatus-guid
OStatus: Use the GUID format for the link to the item
2015-06-30 08:35:33 +02:00
fabrixxm f121184158 Merge pull request #1716 from annando/1506-no-googlemap
Removed Google Maps
2015-06-30 08:27:59 +02:00
Michael Vogel 06d446595e OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it. 2015-06-30 08:08:02 +02:00
Michael Vogel 836432bb9a Removed Google Maps 2015-06-30 07:42:59 +02:00
Michael Vogel ab074e200b Mail link in profile page 2015-06-29 22:54:26 +02:00
Michael Vogel bffe35ab71 There is now two different checks for the completion of conversations 2015-06-29 21:53:59 +02:00
Michael Vogel fcb3cbffe4 OStatus: Use the GUID format for the link to the item 2015-06-29 21:49:42 +02:00
fabrixxm 28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
fabrixxm 1a1c2d74f6 Merge pull request #1698 from rabuzarus/identity
move some identity related functions to identity.php
2015-06-29 13:52:07 +02:00
fabrixxm 17514e0d68 Merge pull request #1703 from rabuzarus/readable_bytes
show maximagesize warning in a human readable format
2015-06-29 13:50:55 +02:00
fabrixxm 6c5b4b96a5 Merge pull request #1710 from rabuzarus/deactivate_log
deactivate logger in acl_lookup
2015-06-29 13:48:42 +02:00
rabuzarus eedf829d5c deactivate logger in acl_lookup 2015-06-29 13:46:47 +02:00
rabuzarus 68e565889d moved formatBytes() to /include/text.php 2015-06-29 11:22:29 +02:00
rabuzarus a982320ba9 show maximagesize warning in a human readable format 2015-06-29 02:39:08 +02:00
Michael Vogel b795bf2935 Merge pull request #1683 from fabrixxm/issue-1655
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus 8cca849c2e Merge acl-var into develop
Conflicts:
	mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus 729b7f0e72 restore jotplugins 2015-06-27 15:11:18 +02:00
rabuzarus 373bb0822b get the themes settings of foreign profiles 2015-06-27 14:10:43 +02:00
Tobias Diekershoff d0bf3c06a4 Merge pull request #1694 from annando/1506-ostatus-mention
OStatus: Notifications now work - even if not mentioned in the post
2015-06-27 11:12:31 +02:00
rabuzarus 787604026f move some identity based functions to identity.php 2015-06-26 18:57:20 +02:00
rabuzarus 5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
Michael Vogel e0f6bd6c28 Merge pull request #1695 from strk/accepted
Spelling error: "acepted" -> "accepted"
2015-06-26 13:51:22 +02:00
Sandro Santilli 904b76df85 Spelling error: "acepted" -> "accepted" 2015-06-26 12:03:32 +02:00
Michael Vogel 58b624f877 OStatus: Mentions should work now 2015-06-26 10:41:11 +02:00
Michael Vogel 6eebfb2e13 Merge pull request #1692 from fabrixxm/desktopnotifications
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus 37501a883e make notes work 2015-06-25 22:57:26 +02:00
rabuzarus 65286f79ed respect hidewall 2015-06-25 20:29:09 +02:00
rabuzarus 94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
rabuzarus 12528f033a include jotnets in populate_acl 2015-06-25 12:33:05 +02:00
Fabrixxm 6fc864c947 rework mod/ping and desktop notification logic
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
fabrixxm 33f0d00ee1 Merge pull request #1691 from annando/1506-ostatus-evenbetter
OStatus: Bugfix in threading, answers to OStatus messages in Friendica posts
2015-06-25 08:38:47 +02:00
Michael Vogel 704110456a Removed test code 2015-06-25 07:30:14 +02:00
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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 7c48ed60eb hide some HTML coded chars from markdownification 2015-06-20 14:27:42 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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