clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,738 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

2969 Commits

Author SHA1 Message Date
tobiasd e218c2470a Merge pull request #1235 from annando/1412-some-more-tracker-removed 
1412 some more tracker removed
 2014-12-07 10:42:42 +01:00
tobiasd d0ddf00efe Merge pull request #1237 from annando/1412-added-hashtags-for-diaspora 
When exporting shared posts to diaspora now removed hashtags will be added again
 2014-12-07 10:42:00 +01:00
Michael Vogel 0bfe57bb48 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items 2014-12-01 23:32:23 +01:00
Michael Vogel 0c60eb18f7 Some more typical tracking parameter is removed 2014-12-01 22:52:51 +01:00
Michael Vogel d2d3804e09 If a link contains BBCode stuff, make a short link out of this to avoid parsing problems 2014-12-01 22:51:41 +01:00
Michael Vogel e475cf131d When a post contains a picture then a picture in the added information is displayed only as a small preview picture. 2014-12-01 22:49:35 +01:00
Michael Vogel 7b26aa2b84 When exporting shared posts to diaspora now removed hashtags will be added again. 2014-12-01 22:45:13 +01:00
Michael Vogel a3f7578085 Merge branch 'develop' of github.com:annando/friendica into 1409-shadow-items 2014-11-19 00:19:30 +01:00
Michael Vogel f8f7cc9292 API: Possibilty of throttling when posting limit is reached 2014-11-18 23:55:45 +01:00
Michael Vogel 5379e07c4e Setting default values for all database fields. 2014-11-09 13:29:27 +01:00
Michael Vogel 9172ea2246 Some more values that need to be set to avoid SQL warnings. 2014-11-09 01:13:07 +01:00
Michael Vogel 3eed5bbd3e Further improvement for newlines after attachments 2014-11-02 18:39:23 +01:00
Michael Vogel 14ea4b972e BBCode: Newlines under attachments are now removed 2014-11-02 17:35:49 +01:00
Michael Vogel 5e303f9905 Removed some more special characters from hashtags 2014-10-30 11:33:33 +01:00
Michael Vogel 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" 2014-10-30 00:24:23 +01:00
Michael Vogel 17f87ef9b2 Remote-self: It does only make sense to check for duplicates from friendica 2014-10-29 08:24:05 +01:00
Michael Vogel 59517f6e58 Remote self is now working for diaspora contacts as well. 2014-10-29 01:42:43 +01:00
Michael Vogel 338ad1d85f Additional check for repeated posts 2014-10-29 01:31:29 +01:00
Michael Vogel 3e57954807 remote-self: Moved the code in a single function and cleaned it up. 2014-10-29 01:05:09 +01:00
Michael Vogel 01cb340752 Let remote-self posts appear as own posts - for test reasons 2014-10-28 22:10:58 +01:00
Michael Vogel e46f597b00 Remote-self functionality added at another place - time for a separated function. (tbd) 2014-10-28 08:30:04 +01:00
Michael Vogel f4860d3fd0 Remote-self: relocated the code (may now work?) 2014-10-27 21:44:30 +01:00
Michael Vogel 332531599e Create a new guid and a separated item if remote self is used on a network that isn't a feed 2014-10-27 21:13:21 +01:00
Michael Vogel b1cdaefcb2 Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self 2014-10-27 11:45:39 +01:00
tobiasd f1697d3e5d Merge pull request #1209 from FX7/master 
Added exact time to items after 24 hours
 2014-10-25 19:21:21 +02:00
effex7 eb5bf2a733 Added exact time to items after 24 hours 2014-10-25 16:44:24 +02:00
fabrixxm 4c66a3486a Merge pull request #1207 from annando/1410-remote-self-with-keywords 
remote self: There is now an option if the keyswords should be used as tags or not
 2014-10-24 10:55:22 +02:00
Michael Vogel c77a63fb27 remote self: There is now an option if the keyswords should be used as tags or not. 2014-10-24 01:37:33 +02:00
Michael Vogel bd4410f11b Merge pull request #1200 from fabrixxm/issues/1193 
Fix #1193
 2014-10-23 18:18:31 +02:00
Fabrixxm ba6f391635 replace embedded images before statustext is shortened 2014-10-23 17:04:07 +02:00
Fabrixxm b1e83f331e workaround for issue #1134 2014-10-23 16:27:30 +02:00
Fabrixxm 8bf19aabb0 api: allow filter of direct messages sender by user_id or screen_name 2014-10-23 08:59:48 +02:00
Fabrixxm 634a03dd45 Fix #1193 2014-10-22 09:46:51 +02:00
Michael Vogel f6522658f6 Using "remote self" to synchronize Frandiaca accounts 2014-10-22 08:30:16 +02:00
Michael Vogel 0c1fdb7da1 New hook "page_info_data" 2014-10-20 08:10:21 +02:00
Michael Vogel 3600289262 New hook "getsiteinfo", separating fetching site info from generating bbcode 2014-10-20 08:03:47 +02:00
Fabrixxm 9053417179 fix small bug in direct messages api 2014-10-16 11:55:59 +02:00
Fabrixxm a490140218 add jsonp support to api 2014-10-16 10:51:36 +02:00
fabrixxm 3092d34a7a Merge pull request #1177 from annando/1410-feed-with-tags 
Importing feed with hashtags from keywords
 2014-10-06 09:54:36 +02:00
Michael Vogel 759f199b6f Created hashtags from keywords now are links. URL are cleaned from tracking data. 2014-10-03 13:02:15 +02:00
Michael Vogel 904f8ac422 Creating hashtags from keywords of a feed, when additional data should be fetched. 2014-10-03 12:18:33 +02:00
Michael Vogel eb592030eb Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter-cleanup 2014-09-29 09:42:47 +02:00
fabrixxm 3a0b18fa36 Merge pull request #1168 from annando/1409-application-source-name 
API: Detecting the source name of the application
 2014-09-29 09:24:41 +02:00
Michael Vogel 335855a40b API: Fetching the application name of the client. 2014-09-28 17:23:01 +02:00
Michael Vogel 2b26181509 Issue 1158: muting of threads now works with the API as well. 2014-09-28 00:42:27 +02:00
Michael Vogel 778ed772d2 Diaspora: Repeated items from twitter to Diaspora now only include a link, since Diaspora is showing the whole tweet. 2014-09-27 23:39:06 +02:00
Michael Vogel 21c09c0732 API: Set the application name to "api" (if not defined), "remote_self" has an application name as well. 2014-09-27 23:37:05 +02:00
Michael Vogel 459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00
fabrixxm 8f2f7f8380 Override 'enotify_no_content' system option if type is SYSTEM_EMAIL 2014-09-10 18:30:30 +02:00
fabrixxm 7687342849 fix email for 
- registration request
- registration approval
- account created by admin

add a reditect after registration approval or deny
 2014-09-09 22:07:47 +02:00
tobiasd e767e2d750 Merge pull request #1131 from fabrixxm/master 
Bug fixes!
 2014-09-07 17:52:52 +02:00
fabrixxm 3ac5e4508b fix email to new registerd users. 
fix notification in case of error sending email.
 2014-09-07 17:46:31 +02:00
fabrixxm 6db73c0b6d fix update routine to support update from 3.2 
disable PDO support
 2014-09-07 17:28:38 +02:00
Tobias Diekershoff 2eb74a9b42 fixing a typo 2014-09-07 16:59:01 +02:00
Beanow 2fe79c564b Fixed whitespace issue causing trueish results in templates. 
For example: profiles would show labels with no content.
 2014-09-07 15:48:44 +02:00
fabrixxm 21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
fabrixxm a8c90155f8 db update mail via notification() 
remove last template
 2014-09-07 14:23:03 +02:00
fabrixxm 5861bdd6e9 registration request as system notification 
kill the template
send email to all admins
 2014-09-07 13:55:02 +02:00
fabrixxm 5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm 36a67158d2 Merge pull request #1119 from annando/1409-issue-881 
The useragent string doesn't contains of the words "Mozilla" anymore
 2014-09-07 11:41:51 +02:00
fabrixxm 9a0c37eb47 new password mail via notification() 
new include/text.php::deindent() function
remove unused templates
 2014-09-07 11:20:06 +02:00
Michael Vogel 7af5c3c560 The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url 2014-09-07 10:47:37 +02:00
fabrixxm d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
Michael Vogel a333036f00 API: The command "users/search" is now supported. 2014-09-07 07:32:09 +02:00
fabrixxm 0e628f840f send ostatus follow/share notifications via notification() 
remove unused templates
 2014-09-06 18:15:18 +02:00
fabrixxm 16a07e6d83 cleanup multipart email sending code 
remove 'EmailNotification' class and rename 'enotify' class as 'Emailer'
 2014-09-06 15:52:53 +02:00
Michael Vogel 5e3b8b3432 Creating a shadow entry for every public post and show it on the community page. 2014-09-06 12:38:06 +02:00
fabrixxm 325f2b1697 fix avatars urls on profile import 2014-09-06 11:29:24 +02:00
tobiasd 7eef05e4f5 Merge pull request #1098 from Beanow/release/profile-editor-improvements 
Profile editor improvements
 2014-09-05 22:20:31 +02:00
Beanow 992684c362 Merge branch 'feature/edit-profile-improvements' into develop 2014-09-04 23:58:22 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel 24b3befc4d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	update.php
 2014-09-04 02:29:12 +02:00
Michael Vogel 56f0af2067 The "ignore" feature can be disabled and enabled, the value will now be retrieved. 2014-09-04 01:27:28 +02:00
Michael Vogel 7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +02:00
fabrixxm f17e6f534f Merge pull request #1093 from annando/master 
Added an alternate link to the profile in the atom feeds (feature request #925)
 2014-09-03 09:59:51 +02:00
Michael Vogel 73904bfa03 Added an alternate link to the profile in the atom feeds (feature request #925) 2014-09-03 09:52:31 +02:00
tobiasd ae2094487b Merge pull request #1092 from annando/master 
Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct text.
 2014-09-03 07:44:17 +02:00
Michael Vogel 500dbecfe7 Fix for issue #1060 (Missing Entries in Archive Dropdown) 2014-09-03 01:43:04 +02:00
friendica 910293729c Merge https://github.com/friendica/friendica into pull 2014-09-02 01:09:23 -07:00
friendica 3e0a84afa9 so this is why my db updates were reverted ;-) 2014-09-02 01:08:50 -07:00
Michael Vogel 7144d22cc1 If a picture was too small it got cropped 2014-09-02 02:36:04 +02:00
Michael Vogel 961440e48f Cutting the text has to be made UTF-8 aware as well. 2014-09-02 02:14:16 +02:00
Michael Vogel b66a031b34 The plaintext conversion had issues with counting the text size of posts with german umlauts 2014-09-02 01:31:31 +02:00
Michael Vogel 150310ea3a dbstructure: Delete indexes before the database structure is changed 2014-09-01 23:41:21 +02:00
Michael Vogel 23c4c39a1f remote-self: "origin" and "last-child" need to be set as well. 2014-09-01 15:28:31 +02:00
Michael Vogel 3e9e682723 remote-self: Moved some functionality from other place into the "item_store" function 2014-09-01 14:40:29 +02:00
Michael Vogel e35c55dd3b Remote-self: It is now possible to chose between two different modes of mirroring. 2014-09-01 14:00:21 +02:00
Michael Vogel 522b9edffe remote-self: Seting the author name to the owner name 2014-09-01 09:59:58 +02:00
Michael Vogel c81df2c005 Remote-self is now working immediately 2014-08-31 23:52:25 +02:00
Michael Vogel 5468b9b2a5 oembed: Prevent empty links 2014-08-28 01:14:46 +02:00
Michael Vogel b4e8ec2806 bbcode: mask "[" and "]" for attachments. 2014-08-28 01:11:43 +02:00
Michael Vogel 4bdd905b3e Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile. 2014-08-28 01:06:41 +02:00
Michael Vogel 4ad2bbddc7 If a post is a pure reshare, then show the profile of the original author on the display page. 2014-08-26 17:10:46 +02:00
Michael Vogel 4976b1c153 BBCode: Add a linefeed between a picture and the following text. This is important for exports (e.g. to pumpio) 2014-08-25 23:40:18 +02:00
Michael Vogel 6aeaf0815f If a message is transmitted to a network that requires shortening (Twitter, Statusnet, ADN), then the shortened link will be the link to the friendica post if it was a shared post. 2014-08-25 23:38:13 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel c5cc99c716 BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently 2014-08-25 14:08:26 +02:00
Michael Vogel 845805bf34 Provide a parent in the notification, so that threading of the notification mails is working. 2014-08-21 01:00:12 +02:00
Michael Vogel 716e0b073f Notification by mail: Improvement for the threading of notifications, new headers to support filtering. 2014-08-21 00:53:01 +02:00
Michael Vogel 2769089120 bbcode: Don't use a preview picture in the "attachment" element if it is a video attachment. 2014-08-21 00:51:18 +02:00
Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2014-08-13 00:18:05 +02:00
Michael Vogel d4b2d3bf8a Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings. 2014-08-13 00:13:13 +02:00
tobiasd d28c1febc7 Merge pull request #1069 from annando/master 
Solved (possible) encoding problem, encoding of URLs with GUID
 2014-08-12 09:01:12 +02:00
friendica ca3fc788b2 photo export functions for the api 2014-08-11 02:29:14 -07:00
Michael Vogel 731d944ab5 bb2diaspora: added one more page break. In the future it could be replaced by a regular expression. 2014-08-09 09:20:37 +02:00
Michael Vogel b99737986d The GUID in the link to the items has to be encoded, since it could contain special characters 2014-08-09 09:17:28 +02:00
Michael Vogel 2e75e37c93 There seems to be problems with encoding - this should fix it. 2014-08-07 21:55:17 +02:00
tobiasd cf0ebd952f Merge pull request #1065 from annando/master 
Refreshing of the network page only when the page is at the beginning
 2014-08-07 08:42:25 +02:00
Michael Vogel 07bc8ca166 fetch_url: Logging the data only when at the "data" loglevel 2014-08-07 08:22:32 +02:00
Michael Vogel 2ba258e1ca In PHP versions lower than 5.4 the notification mails could have been sent with the wrog charset. 2014-08-07 08:00:53 +02:00
Michael Vogel 1104ad4f26 Only some blanks removed, no changes in functionality 2014-08-07 07:59:43 +02:00
Michael Vogel e974e586cc Unified user agent string when fetching data. 2014-08-07 07:58:20 +02:00
fabrixxm 27024e3b1d preferred item image size for theme, get smallest photo near scale requested 
themes can declare preferred image size for images in items, with

   $a->theme_info = array(
    "item_image_size" => 1
   );

0: original, 1:640px, 2:320px

mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
 2014-07-30 15:37:34 +02:00
Michael Vogel 9f09d90c6d Better detection for links in the body that can be removed because of added information. 2014-07-27 21:59:44 +02:00
Michael Vogel 72eee45b92 The title of bookmark links is now taken instead of the data that was fetched via oembed 2014-07-27 16:10:09 +02:00
Michael Vogel 25237c0929 Make the friendica android client work again (it had problems with the GUID in the notifications) 2014-07-26 15:01:01 +02:00
Michael Vogel 10090a6070 Removing of warnings to make dav work 2014-07-24 23:24:10 +02:00
Michael Vogel a588ae4022 Merge remote-tracking branch 'upstream/master' 2014-07-24 22:54:35 +02:00
Michael Vogel e2f9ae3970 Removing of some warnings 2014-07-24 22:53:09 +02:00
Michael Vogel 46c7cb5b72 bbcode: New mode for conversion of shared content that will be used for g+ and facebook export. 2014-07-24 22:51:28 +02:00
tobiasd 1940905454 Merge pull request #1055 from annando/master 
Working with GUID and Object-Type - bugfix for API
 2014-07-24 08:40:29 +02:00
tobiasd 27895b3744 Merge pull request #1048 from tobiasd/20140711 
initialize intErrorCode / mobile themes
 2014-07-24 08:40:02 +02:00
Michael Vogel b1afaa50de Bugfix: When fetching a feed's name, take the title or description, but not the author name. 2014-07-22 07:59:11 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id) 
Bugfix for adding tags to photos
 2014-07-22 00:36:20 +02:00
Michael Vogel f920fa229b API: Bugfix for an API result where "in reply to" was equal to the id of the post. 2014-07-22 00:33:48 +02:00
Michael Vogel 5114e018d0 Setting "verb" for postings from Diaspora, Feeds and Mails 2014-07-15 08:50:49 +02:00
Michael Vogel a553dda2ef New function to upload photos to the wall. (Will be used in connectors) 2014-07-15 08:49:41 +02:00
Michael Vogel 4e6e09a44f The function "get_attached_data" hasn't always detected photos 2014-07-15 08:48:40 +02:00
Michael Vogel 6541247bd3 Use the GUID to refer to items (preparation for future changes) 2014-07-15 08:47:36 +02:00
Tobias Diekershoff 659c01ccc3 initialize intErrorCode if no Error occured 2014-07-11 07:37:27 +02:00
Michael Vogel 6f5bc8d9a7 Setting the user agent to "Mozilla/5.0 (compatible; Friendica)" 2014-07-10 23:13:07 +02:00
Michael Vogel cd7f05801a bbcode: Changed the format of repeated messages once more. 2014-07-10 23:12:07 +02:00
tobiasd 829a92a10e Merge pull request #1042 from annando/master 
Workaround for likes from Diaspora, disabling of the automatic reload of the network page
 2014-07-10 07:45:27 +02:00
Michael Vogel 431a4d40eb using the recycle sign instead of "RD" for statusnet. 2014-07-10 00:16:03 +02:00
Michael Vogel 31dbf23c47 bbcode: Shared posts to app.net will now have an @ before the username. 2014-07-10 00:12:12 +02:00
Michael Vogel d9f6f5181f Using @ before username when repeating messages to twitter and statusnet 2014-07-10 00:00:09 +02:00
Michael Vogel c32735cde6 bbcode: Use shorter method for shared content to networks where size matters. 2014-07-09 23:33:38 +02:00
Michael Vogel c7f1f2e4f2 Diaspora: Possibility to disable the checking of the signature of likes. This is a workaround for the known problem of not receiving likes from Diaspora. 2014-07-09 21:44:12 +02:00
Michael Vogel fe71272e1e Plaintext: The function now returns images from video links as well. 2014-07-09 21:28:42 +02:00
Michael Vogel 660bd39efa Let an item be accssible via the GUI (additionally to uid and item id) 2014-07-09 20:48:34 +02:00
Michael Vogel f68bbffb64 Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews) 2014-07-09 20:44:12 +02:00
Beanow e9dc6e4faa Some changes to the labels and an edit profile button. 2014-07-03 18:39:22 +02:00
Beanow 0225652a53 Minor bugfixes in nav.php: 
* Added videos to usermenu
* Fixed alt for personal notes
 2014-06-27 16:46:11 +02:00
Michael Vogel 79f7f609b3 dbstructure: the indexes for longer table fields are now shortened 2014-06-23 01:27:00 +02:00
Michael Vogel 14bacc1e8c markdown export for libertree now handles horizontal tulers correct. 2014-06-23 01:25:58 +02:00
Michael Vogel 5ed5773f57 The temporary paths (temp, lock, itemcache) are now detected automatically when used. 2014-06-23 01:24:39 +02:00
Michael Vogel 7eea5fc212 Merge remote-tracking branch 'upstream/master' 2014-06-19 23:01:33 +02:00
Tobias Diekershoff 8bfd506051 make translation of addons work again 2014-06-18 21:18:50 +02:00
Michael Vogel e0219cf6af API: Support of privacy_image_cache for calls without entities added 2014-06-16 22:36:59 +02:00
Michael Vogel a1dbfdee65 API: Support of privacy_image_cache - if enabled 2014-06-16 21:49:45 +02:00
Michael Vogel a05ed41fb2 Only some code cleanup 2014-06-15 23:33:25 +02:00
Michael Vogel 52474847cb New function to fetch image information. (Will be used in the addons at a later time) 2014-06-15 23:32:14 +02:00
Michael Vogel ac78989fc9 shortening message: Solved issue with non latin characters 2014-06-15 20:46:56 +02:00
Michael Vogel dd685a4afc The network widget is now ordered by network name 2014-06-15 18:51:46 +02:00
Michael Vogel e6328104ea dbstructure: New tables wasn't created due to some bugs 2014-06-15 10:47:20 +02:00
Michael Vogel 82c4e3fe50 The page info function can now be called with a picture link, support for big and preview images for attachments in global.css 2014-06-15 01:59:19 +02:00
Michael Vogel 4c9a6ed2fb BBCode: Support for preview parameter in attachment, rearranged code for share 2014-06-15 01:57:31 +02:00
Michael Vogel 724a5192da Merge remote-tracking branch 'upstream/master' 2014-06-15 01:49:03 +02:00
Michael Vogel 83935d6797 API: Corrected wrong variable name 2014-06-15 01:48:35 +02:00
fabrixxm adefb06ff7 Merge pull request #1008 from annando/master 
Expire, "attachment" element and database structure
 2014-06-14 20:05:10 +02:00
Michael Vogel ce29f55536 Vier: Some small color changes 2014-06-10 20:22:53 +02:00
Michael Vogel c5f993eb42 Added support for detecting app.net profiles 2014-06-10 20:20:51 +02:00
Simó Albert i Beltran 85ece01485 Fix API string values 2014-06-08 18:36:06 +02:00
Michael Vogel a41cc6f45f Added app.net 2014-06-05 17:44:35 +02:00
Michael Vogel 0c77cee667 New database update system that uses the database structure defined in dbstructure.php 2014-06-04 00:44:58 +02:00
Michael Vogel d3878d717c bbcode: new element "attachment" for attached links. 2014-06-02 23:45:32 +02:00
Michael Vogel d8d745891a New hook that is called when items expire 2014-06-02 23:41:33 +02:00
Michael Vogel 6a28ae8b52 Just some better handling of tracker variables (url encoding) 2014-05-30 01:02:32 +02:00
Michael Vogel 13fea42d8c Merge remote-tracking branch 'upstream/master' 2014-05-29 23:04:57 +02:00
Michael Vogel c759ee55e1 Better handling of app.net feeds. 2014-05-29 20:26:33 +02:00
fabrixxm 77a54c66be Merge pull request #998 from annando/master 
"Vier": New font version, fallback for oembed, more tracking variables removed
 2014-05-29 14:04:04 +02:00
Michael Vogel 53d925095f Added some functionality if oembed isn't working. (Should be extended in the future) 2014-05-29 11:45:32 +02:00
Michael Vogel 135a403cec Added some tracking variables from facebook in the function to clean up URLs. 2014-05-29 11:43:37 +02:00
Michael Vogel d001e19035 Detecting "type-video" at the conversion. (Mostly used by reimporting posts from pump.io that come from friendica) 2014-05-29 11:42:41 +02:00
tobiasd 97e74f1570 Merge pull request #987 from annando/master 
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
 2014-05-25 07:59:22 +02:00
Michael Vogel 5ae9c5e538 Added some logging 2014-05-24 11:01:33 +02:00
Michael Vogel 4924f527d2 plaintext: Moving some code from "plaintext" function to "get_attached_data" to have it accessible for non-plaintext exports 2014-05-24 11:00:05 +02:00
Michael Vogel e32f9c4fff Dead processes will be deleted when they are running for more than 9 minutes. 2014-05-22 00:16:36 +02:00
Michael Vogel 58cea13707 Cron/Queue: Setting a limit to avoid endless PHP jobs. 2014-05-21 07:28:33 +02:00
tobiasd 1388b7ac27 Merge pull request #984 from annando/master 
Better look for embedded videos, removing tracking parameters, new shortening function
 2014-05-19 08:05:16 +02:00
Michael Vogel d964e7e08f New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey. 2014-05-18 23:39:34 +02:00
Michael Vogel 6b461a74cb Cleaning up tracking parameters in urls. 2014-05-18 20:32:06 +02:00
tobiasd d3db9365cb Merge pull request #983 from annando/master 
"red"-bookmarks and better plaintext export
 2014-05-18 20:01:29 +02:00
Michael Vogel 31886ecd4f Content got lost sometimes due to a needless security function (HTML content is handled in the bbcode function) 2014-05-18 18:59:10 +02:00
Michael Vogel 7cc2723e2d Improvement for shortening of the new plaintext option. 2014-05-18 18:57:31 +02:00
Michael Vogel 35fbe3be14 Diaspora: Better handling of "red"-links 2014-05-18 18:56:07 +02:00
fabrixxm b072b8f284 Update bbcode.php 
Fix translatable string.
 2014-05-16 10:55:29 +02:00
fabrixxm f55a22cb19 fix query as @annado comment 2014-05-12 19:02:03 +02:00
Fabrixxm d7b514c2c0 add check for expiration time in item_store() 2014-05-12 15:33:20 +02:00
fabrixxm 1a5da0ae60 Merge pull request #954 from fabrixxm/issue_936 
Show unknown contacts in thread comment mention autocomplete
 2014-05-12 11:56:05 +02:00
Fabrixxm bb4296e686 exclude know contacts from unknown contact list 2014-05-12 05:46:02 -04:00
Michael Vogel a6742d3db6 Repeated messages to Diaspora now contain a link to the original content at the bottom of the message. 2014-05-11 22:07:37 +02:00
Michael Vogel acf1c3956c Only show connectors when not "hide wall" is enabled. 2014-05-10 00:24:15 +02:00
Michael Vogel dfa52185ca Reenabled PDO engine. 2014-05-09 20:43:06 +02:00
Michael Vogel 407ea6977a Plaintext: Regular expressions were too greedy. 2014-05-06 00:33:56 +02:00
Michael Vogel 30f1f40a1e No functional changes, only removed spaces 2014-05-03 23:40:34 +02:00
Michael Vogel 04ba988f75 Plaintext: If a picture link went directly to a picture, this wasn't recognized. Additionally there was a situation when a post could be empty. 2014-05-03 23:34:53 +02:00
Michael Vogel 4b0cc51ae4 The PDO functionality is deactivated until the last differences in functionality are removed. 2014-05-03 12:14:43 +02:00
Michael Vogel 426e0045ee The function "short_url" is used in several addons, so it deserves a central place. 2014-05-03 12:07:34 +02:00
Michael Vogel c41b1c2d55 Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons. 2014-05-03 12:04:54 +02:00
Michael Vogel 2db1029830 APC support is removed due to problems with PHP 5.5. 2014-05-03 12:02:25 +02:00
Michael Vogel 7b7e372fb0 Suppress showing unsupported addons in the administration. 2014-04-29 14:22:37 +02:00
Michael Vogel 941c049933 The file "dbstructure.php" was corrupted. This is the right one. 2014-04-29 13:19:44 +02:00
Michael Vogel c5825a0c20 Merge remote-tracking branch 'upstream/master' 2014-04-29 12:36:49 +02:00
Michael Vogel 66996a2fa3 The file dba.php was missing in the last commit :) Additionally there are some chamges to the update script. 2014-04-29 12:35:24 +02:00
Michael Vogel 405dd794fe New database system that uses PDO if present/Test script for doing database upgrades. 2014-04-28 23:55:47 +02:00
fabrixxm 487d563366 add people in thread in autocomplete (issue #936) 
issues:
tested only in quattro theme
contacts in thread will appear twice in autocomplete popup
 2014-04-27 15:18:44 +02:00
fabrixxm 0b83432bf3 better logger format, some comments 2014-04-27 15:18:43 +02:00
tobiasd c1d14bcc98 Merge pull request #944 from annando/master 
Some more frontend stuff/Native Diaspora reshare
 2014-04-26 09:13:17 +02:00
Michael Vogel 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
Michael Vogel e75562cd6d Diaspora: support for sending native reshares. If a message from Diaspora is repeated, then it will be repeated as native reshare. 2014-04-26 01:35:02 +02:00
fabrixxm 807fc60d3e Merge pull request #941 from annando/master 
Moved and renamed menu entries to improve the usability, global css, icons for social networks
 2014-04-24 10:48:07 +02:00
Michael Vogel 30efb0c1e6 menu entry for "Delegations" moved to the settings. 2014-04-24 10:16:02 +02:00
fabrixxm b09f2f0a5d Merge pull request #940 from annando/master 
Bugfixes: 1. When posting shared feeds to Diaspora, the link vanished/2. The profile name detection had problems with feeds
 2014-04-23 08:42:48 +02:00
Michael Vogel acb5748221 Bugfixes: 1. When posting shared feeds to Diaspora, the link vanished/2. The profile name detection had problems with feeds 2014-04-23 00:34:34 +02:00
fabrixxm 22c45b9bf1 Merge pull request #938 from annando/master 
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
 2014-04-22 16:15:42 +02:00
Michael Vogel 22772876a9 API: Beautifying the code, only showing posts (not likes), don't show own posts in mentions. 2014-04-22 15:56:28 +02:00
Michael Vogel b64ddcce96 Accepting "!"-links as tags. (They are used at statusnet for groups) 2014-04-22 15:54:56 +02:00
Michael Vogel 2c3a5d72fd Diaspora: Now the application name is transmitted as well with a post. 2014-04-22 00:58:17 +02:00
Michael Vogel 10d36c324a bbcode: The header for shared messages for text based system needn't to have a profile link. 2014-04-22 00:56:46 +02:00
Michael Vogel b01520babf bb2diaspora: Horizontal ruler must have a leading new line for libertree 2014-04-22 00:55:47 +02:00
tobiasd f38306e20b Merge pull request #935 from annando/master 
Don't show embedded page information for statusnet groups.
 2014-04-12 13:24:39 +02:00
Michael Vogel b1338548b0 Don't show embedded page information for statusnet groups. 2014-04-12 13:14:39 +02:00
fabrixxm 84189ac775 Merge pull request #932 from annando/master 
Preparation for bidirectional statusnet sync, functions moved from addons into the core and some converting stuff
 2014-04-07 09:53:47 +02:00
Michael Vogel 96a41a16fd oembed: Now it is possible to use the service from embedly with an API key. 2014-04-04 10:56:33 +02:00
Michael Vogel a64948b7f7 New function "original_url" (moved from an addon) that follows all redirects to the original url. 2014-04-04 10:55:30 +02:00
Michael Vogel 7b471e097a When converting from html to bbcode, now mail links are converted into the [mail] bbcode 2014-04-04 10:54:43 +02:00
Michael Vogel 5d4719f009 The function to fetch data about a site (via the "parse url" function) is moved from diaspora to another place, since it is multi purpose 2014-04-04 10:52:53 +02:00
Michael Vogel 8bb81ff83d The system's load is now checked, when the cronhooks are started. 2014-04-04 10:48:02 +02:00
Michael Vogel 834e0ff778 Diaspora: The HTML paragraph element was treated wrong when importing items from Diaspora 2014-04-04 10:45:40 +02:00
Michael Vogel 7614ae40ef When converting to plain text, links behind @-addresses are now removed 2014-04-04 10:44:42 +02:00
Michael Vogel 63a581bf9b Removed deprecated twitter code, since twitter had changed its API long time ago. 2014-04-04 10:42:12 +02:00
Michael Vogel 77986d76fa Preparations for statusnet connector import 2014-04-04 10:40:46 +02:00
fabrixxm 29092ace44 Merge pull request #927 from annando/master 
Massive SQL stuff
 2014-04-04 07:28:06 +00:00
Michael Vogel 54bb33d232 Diaspora: Images from shared messages now appear in the posting. 2014-03-23 18:50:28 +01:00
Michael Vogel a03014a47c Adding functions for the file- and category handling 2014-03-20 18:51:13 +01:00
Michael Vogel a410d9caae When a user isn't logged in, then the item link got to an invalid address. 2014-03-20 18:46:35 +01:00
Michael Vogel 2a21fecd79 Only some code beautification. No functional changes. 2014-03-20 18:46:01 +01:00
Michael Vogel eaa05a9203 Support of the term table for categories 2014-03-20 18:45:16 +01:00
Michael Vogel 1b5bf6b0ff API: Add the title to the html output. 2014-03-20 18:44:24 +01:00
Michael Vogel 9877e43bda Search with tags now works fast. 2014-03-18 22:51:50 +01:00
Michael Vogel 8392217b72 Fixing SQL problem and speeding up search. 2014-03-16 22:42:47 +01:00
Michael Vogel 69b7ad2450 Functions for the new threas table, script for updating this table 2014-03-16 18:19:19 +01:00
Michael Vogel b4fb951bf9 bbcode: rearrange shared links - can only be made standard, when all themes support the "type-link" elements 2014-03-16 18:16:05 +01:00
Michael Vogel b23dd95c5e OStatus auto completion: option to completely disable the auto completion. 2014-03-16 18:09:42 +01:00
Michael Vogel dab71c7b3b Diaspora: Add further information for links (like Diaspora is doing it on their side) 2014-03-16 17:46:05 +01:00
Michael Vogel 32065dfad6 Queue: using lockpath, so that the queue only can run once a time. 2014-03-16 17:37:20 +01:00
Michael Vogel 9496537e5f Now term table is used for categories and putting items to folder 2014-03-16 17:16:01 +01:00
Michael Vogel bbf9378a49 Even more SQL improvements. 2014-03-16 17:12:56 +01:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Michael Vogel 9f4ef7c105 Avoiding some PHP warnings 2014-03-09 09:26:54 +01:00
Michael Vogel 7cec1bbfdf Removed another "limit 1" 2014-03-09 09:25:57 +01:00
Michael Vogel 9afe5c8670 Support for xcache 2014-03-09 09:24:41 +01:00
Michael Vogel 6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
tobiasd d29c981aa2 Merge pull request #919 from annando/master 
plink, disabling features, triming the content of parsed urls
 2014-03-02 08:31:03 +01:00
Michael Vogel 9c87e00dd3 Preparation for a new variable that points to the post on the own friendica server 2014-03-02 00:47:22 +01:00
Michael Vogel f78bdf663a Diaspora: set plink to the original url from the origin server 2014-03-02 00:45:42 +01:00
tobiasd 0eec22f656 Merge pull request #914 from annando/master 
Vier, API and Twitter cards
 2014-02-24 07:21:15 +01:00
Michael Vogel 57db109474 Adding cache mechanism for bbcode. Improving cache to use apc. 2014-02-23 15:51:57 +01:00
Michael Vogel bc69e57636 API: Better support of picture links 2014-02-22 15:42:34 +01:00
tobiasd 3bbe7a75ec Merge pull request #911 from annando/master 
target="_blank" and api improvements
 2014-02-16 14:15:44 +01:00
Michael Vogel 35048819ff API: Retweets with Twidere now work again. 2014-02-13 23:07:51 +01:00
Michael Vogel 822b3865df API: Better detection of repeated messages. Better handling of tags. (In a next step they will be included in the entities) 2014-02-13 08:30:40 +01:00
Michael Vogel 84bbb69c23 API: Support of "include_entities" 2014-02-12 01:41:45 +01:00
Michael Vogel 8c1d31decc Showing "view full size" is now configurable 2014-02-11 23:44:45 +01:00
Michael Vogel 66f4e09baa api: Improvements for entities 2014-02-11 23:43:34 +01:00
Michael Vogel 01971428aa target="_blank" instead of target="external-link" 2014-02-11 23:42:06 +01:00
tobiasd 8d47965b3a Merge pull request #907 from annando/master 
oembed: There seems to be some bug with ombed (maybe passing a non working url)
 2014-02-03 22:32:00 -08:00
Michael Vogel c2abf0aeea oembed: There seems to be some bug with ombed (maybe passing a non working url) This small fix should avoid the error at this place and may directs to the source of the problem. 2014-02-03 23:06:12 +01:00
tobiasd ebc04e8506 Merge pull request #906 from annando/master 
API now supports entities/Design changes to "vier"
 2014-02-02 01:48:47 -08:00
Michael Vogel 738d7a221e API: Support for entitites. (embedded pictures in twidere) 2014-02-02 09:54:33 +01:00
tobiasd d473cd9bc9 Merge pull request #902 from annando/master 
schema.org and oembed
 2014-01-28 09:28:43 -08:00
Michael Vogel a0de28c491 oembed: Option to disallow displaying of "rich" content and some beautification for titles that are only links 2014-01-26 09:59:20 +01:00
fabrixxm e312b734ca Merge pull request #899 from fabrixxm/issue_898 
use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify
 2014-01-21 23:42:04 -08:00
Fabrixxm 682793ccd3 use 'ENT_QUOTES' in xmlify/unxmlify 2014-01-20 02:59:20 -05:00
tobiasd aa22598b80 Merge pull request #900 from annando/master 
Beautifiying export of shared posts to other networks
 2014-01-18 22:23:59 -08:00
Michael Vogel de4d0765cb Beautifiying export of shared posts to other networks 2014-01-18 21:32:14 +01:00
fabrixxm 310cc0cedb Merge pull request #896 from annando/master 
API and Diaspora posting connector
 2014-01-18 00:57:46 -08:00
tobiasd c52973f956 red# links to redmatrix.me 2014-01-17 09:25:52 +01:00
Fabrixxm 1e87f4eb8c use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify 2014-01-16 09:08:51 -05:00
Michael Vogel 62d79a1a5c API: New function "conversation/show" - this is an unoffical Twitter command 2014-01-15 20:35:34 +01:00
Michael Vogel c8fcc4cbf8 API: Some more stuff to make the API more complete (compared to the original Twitter API) 2014-01-13 20:03:05 +01:00
Michael Vogel 17236b1801 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	include/acl_selectors.php
 2014-01-13 19:59:34 +01:00
Michael Vogel 52b260982c Avoiding a warning in the error.log 2014-01-13 07:49:10 +01:00
Michael Vogel de9a02b9ae Some small bugfixes (mostly warnings) and little improvements to the log 2014-01-13 01:34:54 +01:00
fabrixxm 63b8b5761d Merge pull request #888 from annando/master 
Some more API improvements
 2014-01-08 05:57:43 -08:00
Michael Vogel 1bf9d99be2 API: Repeat and destroy now are returning the correct values. The user object now returns the contact id. Repeating of shared items now work. 2014-01-08 01:14:58 +01:00
fabrixxm 2578211e47 Merge pull request #886 from fabrixxm/illegaloffset 
acl_automention: fix warning in include/config.php
 2014-01-06 02:01:01 -08:00
fabrixxm 910f56b698 acl_automention: fix warning in include/config.php 2014-01-06 10:58:39 +01:00
Michael Vogel 3b32505d14 API: Bugfix that wrong contact data was sent 2014-01-05 16:57:05 +01:00
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/crepair.php
 2014-01-05 16:22:42 +01:00
Michael Vogel b4c3f02538 API: Several improvements to make the api more compatible 2014-01-05 16:12:03 +01:00
Michael Vogel 28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
fabrixxm b0e8dbc4da Merge pull request #864 from fabrixxm/acl_automention 
Acl automention
 2014-01-03 06:09:12 -08:00
fabrixxm ad5a47aecf add fetaure switch for acl-automention 2014-01-03 14:40:43 +01:00
tobiasd 18ce32633b Merge pull request #876 from annando/master 
API: Show shared messages as repeated messages, improvements with nick names
 2014-01-03 01:00:21 -08:00
Michael Vogel fa431e84c2 API: Show shared messages as repeated messages, improvements with nick names 2014-01-02 22:29:44 +01:00
fabrixxm 68030a79cd api: fix call-time pass-by-reference error 2014-01-02 19:12:26 +01:00
tobiasd 0c0419bc95 Merge pull request #873 from annando/master 
API: Bugfix: Wrong contact ids with direct messages
 2014-01-01 01:30:11 -08:00
Michael Vogel c463fab8b8 API: Sending direct messages now works again. Some more things to make Friendica work better with AndStatus 2013-12-29 17:54:37 +01:00