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

3722 Commits

Author SHA1 Message Date
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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Michael Vogel a7e190b0cb Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode. 2015-01-31 22:57:05 +01:00
Silke Meyer 61a227dbaa Changed the "From" field for system emails from product to sitename. 2015-01-31 18:44:30 +01:00
Silke Meyer bb2413ddaf deleted my comment of the original line 2015-01-31 18:41:05 +01:00
Silke Meyer a485653d6b Added setting to customize system notifications' sender email address 2015-01-31 08:46:05 +01:00
Michael Vogel b309187e3d Just two more places where pictures have to be send through the proxy function. 2015-01-28 10:09:16 +01:00
Tobias Diekershoff 5ad8b6abf6 Merge pull request #1322 from tugelbend/develop 
bug fix: syntax error #1321
 2015-01-28 08:04:04 +01:00
Michael Vogel c058be9908 Issue 1323: Contact pictures from the acl selector weren't proxied. 2015-01-28 01:22:42 +01:00
hauke 3dcc1da88b bug fix: syntax error #1321 2015-01-27 18:21:32 +01:00
Michael Vogel 848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
Michael Vogel e8bfa32b37 Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile 2015-01-26 01:07:15 +01:00
Michael Vogel bc2c046446 poco: Only update the global contacts when there is a network value/Export your own contact as well 2015-01-25 16:40:20 +01:00
Michael Vogel 2f400627c7 Support for keywords and gender in (global) contacts. 2015-01-25 13:19:37 +01:00
Michael Vogel dff2384e82 Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts 2015-01-25 08:44:42 +01:00
Tobias Diekershoff c35e92b201 Merge pull request #1314 from annando/1501-better-diaspora-reshare 
Diaspora: Reshares are now working more reliable
 2015-01-25 08:25:02 +01:00
Tobias Diekershoff 1c424a5425 Merge pull request #1315 from annando/1501-issue-1283 
issue 1283 - Share-it button support for friendica
 2015-01-25 08:24:21 +01:00
Michael Vogel 597ef20b71 "about" and "location" is now included in global contacts as well. 2015-01-25 02:29:46 +01:00
Michael Vogel cb9196f6d6 Issue 1197: New hook for "oembed_fetch_url" 2015-01-25 00:58:51 +01:00
Michael Vogel 344210bd6d Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco. 2015-01-25 00:19:59 +01:00
Michael Vogel 58d814b793 issue 1283 - Share-it button support for friendica 2015-01-25 00:10:58 +01:00
Michael Vogel 5c4d55c5e8 Diaspora: Reshares are now working more reliable 2015-01-25 00:01:58 +01:00
Michael Vogel ee50b04382 Bugfix: Removed test code. 2015-01-21 12:42:34 +01:00
Michael Vogel 1f23d691f3 Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus 2015-01-21 01:30:09 +01:00
Michael Vogel 184dcf75a7 Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list. 2015-01-20 22:54:25 +01:00
fabrixxm 254968a99c fix random mime boundary generation 
second and third random numbers in mime boundary was alwasy 10000000000
 2015-01-20 19:21:49 +01:00
fabrixxm b2527039b7 add text-only email option 
add a checkbok to notification settings. if checked, html body is not added to email.
 2015-01-20 19:19:58 +01:00
fabrixxm b45a4b398b api: call hook 'authenticate' from api_login() 2015-01-15 18:15:06 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
fabrixxm 418ac91c31 Merge pull request #1274 from annando/issue-1218 
Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined
 2015-01-09 11:44:38 +01:00
Michael Vogel ab3cad89ae Only suggest contacts with networks. 2015-01-08 11:01:55 +01:00
Michael Vogel 8f1cfac20a The global contacts now contain the network name so that the suggestions can select between this. 2015-01-08 07:59:20 +01:00
Michael Vogel 46db8575a0 The table "unique_contacts" now has an "about" and "location" field as well. 2015-01-08 01:32:19 +01:00
Michael Vogel 044eaa778f Markdown is now supported in the location field as well. 2015-01-08 00:13:43 +01:00
Michael Vogel b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Michael Vogel a2a393a3c6 Better check for Diaspora accounts so you can connect them from the /suggest page. 2015-01-06 12:31:44 +01:00
Michael Vogel 5684ba4442 Now the glink table is written as well in the poco_check function. 2015-01-06 08:16:15 +01:00
Michael Vogel 1a5a00bef8 While storing an item, now every contact is stored in the gcontact table. 2015-01-06 07:23:11 +01:00
Michael Vogel 011f5b9cae Bugfix: Postings disappeared due to a small variable ... 2015-01-05 14:28:17 +01:00
Michael Vogel d49c3e99ac Suggest only active accounts. Remove duplicates from gcontact table. 2015-01-05 08:03:29 +01:00
Michael Vogel 47560fc6c7 Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco 2015-01-04 21:07:45 +01:00
Michael Vogel 003e87b112 Merge remote-tracking branch 'upstream/develop' into issue-1218 2015-01-04 20:21:49 +01:00
Michael Vogel 7084adfd1c Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco 
Conflicts:
	boot.php
	update.php
 2015-01-04 19:32:08 +01:00
Michael Vogel 11c82816b3 Poco now returns the last update date as well. This date will be stored in the gcontact table. 2015-01-04 19:19:47 +01:00
Michael Vogel aa6275356a The function to fetch the original url (without shortener) failed if a linked file was too large. 2015-01-04 15:31:47 +01:00
Michael Vogel cce561708a Replaced $argv and $argc with the $_SERVER array 2015-01-04 13:24:16 +01:00
Michael Vogel a86c143e24 The "scrape" bugfix lead to partly damaged encodings. This is fixed now. 2015-01-04 11:56:41 +01:00
fabrixxm 3195bacd9e Merge pull request #1275 from annando/1501-hashtags-in-attachments 
Titles in attached link description now don't create misformatted text anymore
 2015-01-03 21:32:55 +01:00
Michael Vogel 7156294055 Items that were stored via "remote-self" hadn't contained a valid avatar picture. 2015-01-02 12:45:09 +01:00
Michael Vogel bf147ca9d9 Hashtags in attached link description now don't create misformatted text anymore. 2015-01-02 01:43:31 +01:00
Michael Vogel 38a45d325f See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined. 2015-01-02 00:01:17 +01:00
Michael Vogel 1520a3feab Using a better placeholder. Could solve this issue: https://github.com/friendica/friendica/issues/920 2015-01-01 21:19:07 +01:00
Tobias Diekershoff 22ae03c1a3 Merge pull request #1271 from fabrixxm/api/favorites 
api: favorite create/destroy update also thread table
 2015-01-01 19:06:59 +01:00
Michael Vogel a94673ccb4 API: Support for attachments 2015-01-01 18:31:50 +01:00
fabrixxm 35bb7816af api: favorite create/destroy update also thread table 2014-12-31 18:08:11 +01:00
Michael Vogel 26d5746d99 Support for attachments in the API (for better AndStatus support) 2014-12-31 17:01:55 +01:00
Michael Vogel d80c375220 Merge remote-tracking branch 'upstream/develop' into 1412-api-attachments 2014-12-31 15:45:51 +01:00
Michael Vogel 33c0aba5b7 Add the file size to the photo data array 2014-12-31 15:44:32 +01:00
fabrixxm 5d91e5418b api: add support to star/unstar items 2014-12-31 12:34:32 +01:00
fabrixxm d66fda2eab Fix syntax error in include/Emailer.php 2014-12-29 16:40:04 +01:00
fabrixxm 917ce5b411 Adds optional parameter 'uid' to Emailer::send() 
that is the user id of the recipient of the mail.
Make enotify pass it to Emailer::send()
 2014-12-29 16:04:51 +01:00
Fabio Comuni a659b34117 Adds 'emailer_send_prepare' and 'emailer_send' hooks 
Adds relative documentation in doc/Plugins
 2014-12-29 15:44:30 +01:00
Michael Vogel c15b7d8d04 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items 2014-12-23 07:41:47 +01:00
Michael Vogel dc47ef65f9 Issue 1234: Add the account name to the notification mails. 2014-12-23 00:55:36 +01:00
Michael Vogel 41014735f1 Feeds are never public so the posts can never be duplicated. 2014-12-22 07:32:04 +01:00
Michael Vogel 2ab38de59c Additional check if the duplicated entry isn't from a hidden or blocked contact. 2014-12-21 23:47:19 +01:00
Michael Vogel 043c406091 Update function for creating the shadow entries. 2014-12-21 21:19:37 +01:00
Michael Vogel d054ac8d9c redone the changes I accidentally overwrote ... Me and GIT will never be in love ... 2014-12-21 11:02:31 +01:00
Michael Vogel 2c5281cbf1 reverted a change that wasn't intended to be published yet/Delete thread was missing at Diaspora items. 2014-12-21 02:10:49 +01:00
Michael Vogel 4fb059095f Performance stuff: Caching for getsiteinfo function, check before running onepoll.php 2014-12-21 02:03:06 +01:00
Michael Vogel 2ac42036fb Fix for error in delete function, improved query for community. 2014-12-21 01:59:38 +01:00
Michael Vogel 1a0a80c310 Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items 2014-12-20 09:37:33 +01:00
Michael Vogel 15f43d8ca3 Generate preview pictures from enclosed data from feeds. 2014-12-17 21:57:38 +01:00
Michael Vogel bc5c470cac Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active 2014-12-14 12:47:16 +01:00
Michael Vogel 3d26e1d233 When converting bbcode for Libertree then an empty line has to be before a honrizontal ruler. 2014-12-13 23:07:15 +01:00
Michael Vogel 04106ff6f5 Moving the clean up code to a central place. 2014-12-08 22:37:49 +01:00
Michael Vogel 620ee6be0b Cleanup the HTML before parsing it. 2014-12-08 14:26:44 +01:00
Michael Vogel c398974918 Logging to analyse the stale gprobe processes 2014-12-08 11:02:03 +01:00
tobiasd f2d0baae84 Merge pull request #1236 from annando/1412-make-preview-picture-smaller 
When a post contains a picture then a picture in the added information is displayed only as a small preview picture
 2014-12-07 10:43:32 +01:00
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
Michael Vogel b0a1f4e1b9 API: Bugfix: Wrong contact ids with direct messages 2013-12-27 14:11:13 +01:00
fabrixxm 7b5018fb76 Merge pull request #872 from annando/master 
API: Supporting twidere, better supporting of the network field in the item table
 2013-12-27 00:15:44 -08:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Michael Vogel a96d6f835c API: Supporting twidere 2013-12-27 01:48:43 +01:00
fabrixxm 230ce659bd Merge pull request #866 from annando/master 
API: reworked
 2013-12-26 02:12:27 -08:00
Michael Vogel a0360ec976 API: Add the network name to the application name 2013-12-23 14:06:53 +01:00
Michael Vogel 165a201ca7 API: Added better error handling, make some more api calls similar to statusnet 2013-12-20 23:07:11 +01:00
Michael Vogel 9cfa60fe15 API: reply-to-Values should be all correct now. "since_id" now works with mails. 2013-12-19 06:58:11 +01:00
Fabrixxm 9a94c35120 acl selector add and remove mentions when a forum is selected. 2013-12-18 10:18:26 -05:00
Fabrixxm 9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
Michael Vogel 5130b19f5e API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus) 2013-12-15 23:00:47 +01:00
Michael Vogel 5d3ebcc2cf Bugfix of the bugfix :) 2013-12-10 21:16:13 +01:00
Michael Vogel eca9431909 Bugfix: Problem with page switching with the old pager solved 2013-12-10 15:45:26 +01:00
Michael Vogel 7e5c8ab91c Keeping an offset for page switching: This helps so that you don't see old messages 2013-12-10 00:13:19 +01:00
Michael Vogel d20d2f74ae Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms 2013-12-08 20:10:28 +01:00
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Michael Vogel 3b4a20f987 SQL improvements. New parameter for a maximum amount of comments per thread 2013-12-08 14:49:24 +01:00
Michael Vogel 1d19e056e7 Sorting plugins after priority and name (better for the configuration page) 2013-12-02 20:28:30 +01:00
Michael Vogel e875a104ce dangerous values in usernames for shared messages from diaspora are now encoded. 2013-12-02 20:26:57 +01:00
Michael Vogel 3331e71e8e disable the output of the "posted" value in shares when item cache is enabled. 2013-12-02 20:25:43 +01:00
Michael Vogel 4f38969148 Optional parameter for parseurl to only fetch data from meta information 2013-12-02 20:24:41 +01:00
Michael Vogel e0cf2c5167 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
	mod/settings.php
 2013-12-02 00:33:46 +01:00
Michael Vogel 6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma. 2013-12-02 00:11:31 +01:00
Mats Sjöberg 1234282b8b Use the push value in the push_subscribers table as a push tries counter as well. 2013-11-21 21:44:18 +02:00
Mats Sjöberg 2859ce1483 Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work. 2013-11-21 21:44:18 +02:00
Mats Sjöberg 19de78e511 Fixed subscription problem with new GNU Social. 2013-11-21 19:41:06 +01:00
Fabrixxm 0414e0a316 More "relocate": 
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
 2013-11-13 06:07:49 -05:00
fabrixxm 3964d86020 Merge pull request #817 from annando/master 
SQL: Query for showing group posts is improved, order by comment date now is working again
 2013-11-11 01:51:58 -08:00
Michael Vogel 7ba1416e64 SQL: Query for showing group posts is improved, order by comment date now work again 2013-11-08 08:11:39 +01:00
tobiasd 7d1a6cc1d6 Merge pull request #803 from annando/master 
SQL performance and reduction of database warnings
 2013-11-07 01:03:31 -08:00
maase2 787db1f7d6 Update Contact.php 
Add the delete option for a contact.
 2013-11-05 22:06:23 +01:00
Michael Vogel 0b31aa963d Bugfix: There were speed problems with inifinite scroll on firefox 2013-11-03 13:47:59 +01:00
Michael Vogel eaefcf9de7 All subqueries in tag searches are now reformed. Further SQL improvements 2013-11-03 02:07:44 +01:00
Michael Vogel 759015e5fd Removed many "limit 1" at update and delete queries since they were superflous und generated massiv logfile entries 2013-11-02 16:13:11 +01:00
Michael Vogel 53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
Michael Vogel 5eeccd519a BBCode: When converting to HTML for the connectors, then videos are now converted in a regular link (there were problems with some vanishing video links) 2013-11-02 10:46:25 +01:00
Michael Vogel 661664550d Repeated items that are transmitted to text based networks now contain the address and name of the original poater. 2013-10-20 12:26:27 +02:00
Michael Vogel f1154cfdd5 Bugfix: Links were ignored sometimes. (Due to a missing default value) 2013-10-19 07:11:50 +02:00
Michael Vogel e70b110984 Switching from "new share" to "old share" 2013-10-15 00:49:49 +02:00
Michael Vogel 680524f446 Detecting twitter profiles. This is added for the twitter import 2013-10-15 00:44:46 +02:00
Michael Vogel 59b64ece25 Preparations for the upcoming bidirectional twitter sync. 2013-10-12 08:29:39 +02:00
Michael Vogel 2d1b261fad Speed improvements of queries 2013-10-05 12:30:10 +02:00
Michael Vogel d126924ae0 Vimeo videos are now embedded via SSL. 2013-10-02 22:17:56 +02:00
Michael Vogel 34d0eb709b Merge remote-tracking branch 'upstream/master' 2013-09-15 19:39:22 +02:00
Michael Vogel d5ae5ecedd - Improved speed due to forced indexes when showing items. 
- Possibility to setup a hostname
 2013-09-15 10:40:58 +02:00
fabrixxm 4487515d0c Merge pull request #764 from fabrixxm/bug729 
Fix bug #729
 2013-09-08 23:39:36 -07:00
Tobias Diekershoff 7ab366b9c3 Check for user name in deleted user list and unset account expiration before importing the account (Bug #760) 2013-09-09 08:33:47 +02:00
Fabrixxm 3ebc5d1c80 update error message to login one 2013-09-06 12:30:10 -04:00
Fabrixxm be3111dc6f add error control for openid on registration. fix #729 2013-09-06 12:22:53 -04:00
fabrixxm 51d934ee70 Merge pull request #758 from annando/master 
Better use of APC,  	Preparations for the pumpio synchronisation, fix youtube for firefox
 2013-09-06 07:55:03 -07:00
Michael Vogel 55b79e0891 Always embed the SSL version of youtube to avoid problems with Firefox. 2013-09-04 07:39:03 +02:00
Michael Vogel 9a1a666f24 Some changes to let pumpio react similar to facebook. 2013-09-04 00:01:00 +02:00
Michael Vogel 34e7206ba4 Preparations for the pumpio synchronisation. 2013-08-28 08:56:48 +02:00
Michael Vogel 209343d883 If "remove_multiplicated_lines" is set then some more linefeeds in lists are removed. 2013-08-24 14:54:07 +02:00
fabrixxm da9f20f389 Merge pull request #749 from mexon/fetch_url_cookies 
Allow calls to fetch_url to specify a cookiejar file
 2013-08-23 10:01:43 -07:00
Tobias Diekershoff 20d35439a4 passing more then one argument to the crypt tag is parsed now as well 2013-08-20 11:47:11 +02:00
Michael Vogel 694ca8fc57 Code cleanup 2013-08-12 11:14:02 +02:00
Michael Vogel e75f88d7fe Further redoings 2013-08-12 11:12:00 +02:00
Michael Vogel ed33d28e61 redoing the change concerning the hostname. 2013-08-12 11:09:11 +02:00
Michael Vogel e746c4955b Added an option to configure the hostname manually. And there was a problem when APC wasn't present. 2013-08-11 21:19:26 +02:00
Michael Vogel d92a348cf0 - Using APC to store config values (when present) 
- Enabling interlacing for pictures
 2013-08-09 18:28:50 +02:00
Michael Vogel 6576aae938 If APC is enabled then store config data there 2013-08-06 00:20:16 +02:00
Michael Vogel 741b932cc9 Merge remote-tracking branch 'upstream/master' 2013-08-05 20:32:02 +02:00
Matthew Exon 11163c6fb3 Allow calls to fetch_url to specify a cookiejar file, for sites that refuse to deliver content without setting a cookie 2013-08-05 10:59:22 +08:00
Fabrixxm 3f36d375e2 hex tag filter: look at entire string 2013-08-04 03:12:17 -04:00
Fabrixxm 50233ba290 remove debug code 2013-08-03 15:18:41 -04:00
Fabrixxm 11d1c1ae8e add tag to term table. fix "#xNNNN" tag filter. 2013-08-03 15:12:50 -04:00
fabrixxm f1090b6d8c Merge pull request #747 from zered/solve_741 
Solving the "Disallow public access to addons listed in the apps menu" h...
 2013-08-02 09:57:17 -07:00
fabrixxm 462f19ccf2 Merge pull request #745 from mexon/redirect_fix 
Appending URLs in case of redirect is incorrect
 2013-08-02 08:43:01 -07:00
Fabrixxm cccdb2e5e7 api: `api_status_show()` returns correct post id 2013-07-29 10:48:30 -04:00
Matthew Exon 6a38705567 Replicate redirect URL building logic for post requests 2013-07-29 22:34:09 +08:00
Matthew Exon eb9bd03ef8 If the header returns an absolute path as a redirect, don't simply append the path to the old URL, remove the old absolute path first. 
For example, original URL:

http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html

Redirect from header:

/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

Incorrect result:

http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

Correct result after this patch:

http://www.theregister.co.uk/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
 2013-07-29 10:15:39 +08:00
Michael Vogel 7770317f1e Preparations for a more visible reshare when exporting to twitter, statusnet or facebook. 
The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt.
 2013-07-28 20:38:48 +02:00
Zered a6fae9a0db Solving the "Disallow public access to addons listed in the apps menu" has no effect bug 
Adding plugin_is_app function in include/plugin.php for checking if a plugin is an app or not (checking the existence of an 'app_menu' hook)

Populating the app menu conditionaly ( is the user logged or not, are apps private ) and dissalowing apps running if apps are private and the user not logged
 2013-07-24 03:53:10 +02:00
Michael Vogel 4dcd00cf4b Lockfile for onepoll, removing old smarty3 cache files. 2013-07-19 23:38:23 +02:00
Fabrixxm 00df3ef5a7 Fixes #712 2013-07-11 03:34:49 -04:00
fabrixxm c9604b776c stupid typo 2013-07-08 14:21:49 +02:00
Fabrixxm cd35beb947 should fix #728 2013-07-08 04:52:14 -04:00
fabrixxm 8b9ae53242 Merge pull request #713 from annando/master 
ejabberd and friendica
 2013-07-05 12:40:30 -07:00
Michael Vogel edf8bde581 Complete oStatus conversations: Changed from file_get_contents to fetch_url 2013-06-27 22:27:59 +02:00
Fabrixxm 4748b6c4c3 remove unneeded logger function 2013-06-27 09:58:39 -04:00
Fabrixxm 0a1697d13a add pubsubhubbub support to feed contacts 2013-06-27 09:51:13 -04:00
friendica 9ae4c1fb32 ignore hex escapes as numeric tags 2013-06-26 04:58:54 -07:00
friendica bfc9cfb82f put tags in items 2013-06-26 04:02:04 -07:00
Michael Vogel 16737298b4 Merge remote-tracking branch 'upstream/master' 2013-06-22 18:31:28 +02:00
Michael Vogel e4ce383f2f It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install. 2013-06-22 17:34:52 +02:00
friendica 407473f2ce Merge https://github.com/friendica/friendica into pull 2013-06-21 05:02:43 -07:00
friendica 1c10cf1ad7 -- #039; is not a tag 2013-06-21 05:00:30 -07:00
fabrixxm 5cdeef22ea pager: fix stupid typo 2013-06-19 14:28:39 +02:00
fabrixxm e3bb058e9f Merge pull request #697 from annando/master 
API can now fetch posts from a single thread
 2013-06-17 05:09:54 -07:00
Michael Vogel e246c53b45 API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming. 2013-06-16 13:42:43 +02:00
Michael Vogel e7aa2b99a1 OStatus: identi.ca seemed to have changed the format of activity streams for their migration. This fixes it 
API: It is now possible to fetch only posts from one thread.
 2013-06-16 13:28:04 +02:00
Fabrixxm faa510befc move html from paginate functions to template 2013-06-13 08:12:15 -04:00
friendica efce5ae1b9 Merge https://github.com/friendica/friendica into pull 2013-06-12 21:42:20 -07:00
friendica 2464915817 don't try to parse empty xml with simplepie, throws conversion warning 2013-06-12 21:41:07 -07:00
Fabrixxm bea89c17fe uimport: set contacts 'avatar-date' to zero. should fix issue #692 2013-06-12 03:51:53 -04:00
Michael Vogel 323186864e Merge remote-tracking branch 'upstream/master' 2013-06-08 12:30:36 +02:00
Michael Vogel a2cef94d8b ostatus completion of threads now works with longer threads well. 2013-06-08 12:28:19 +02:00
friendica 8fe82d35d4 Merge https://github.com/friendica/friendica into pull 2013-05-28 04:53:27 -07:00
friendica b60e42d2fa provide bbcode translation for imported red zmg tag (img tag with zot-id) 2013-05-28 04:52:22 -07:00
Tobias Diekershoff 2b09b8ae17 make red# available as a smilie 2013-05-27 08:34:12 +02:00
friendica 3381afab3d Merge https://github.com/friendica/friendica into pull 2013-05-20 17:37:23 -07:00
friendica a1c4d0ca93 fix include paths when started via cmdline 2013-05-20 17:36:29 -07:00
Michael Vogel 0723933c1c removing of hashtag addresses is now hidden behind a configuration 2013-05-19 11:08:08 +02:00
Michael Vogel 03c489150c Merge remote-tracking branch 'upstream/master' 2013-05-17 08:08:34 +02:00
Michael Vogel d4240a265b When converting to HTML, hashtag addresses are now removed (only when the message is exported) 2013-05-15 22:20:06 +02:00
Zach Prezkuta 35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support 
basic video playback support using VideoJS
 2013-05-11 08:33:36 -07:00
friendica ef4ebd8546 remove stub code 2013-05-09 01:17:11 -07:00
friendica 3339f55310 Merge https://github.com/friendica/friendica into pull 2013-05-09 01:15:40 -07:00
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
fabrixxm 2da4f8268e fix smarty3 folder not writable message 2013-05-08 11:34:30 +03:00
Fabrixxm 4bf41b8e5d check if view/smarty3 folder is writable by webserver 2013-05-08 03:26:20 -04:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
friendica 886c3d1472 bad checkin 2013-05-02 22:19:16 -07:00
friendica cc8a4fbf16 Merge pull request #672 from cpfeiffer/email-notification-sitename-fix 
fix reading sitename config
 2013-04-29 22:41:32 -07:00
Carsten Pfeiffer 5ee19401c4 pgettext needs dba.php for q() 2013-04-29 22:51:08 +02:00
friendica 1d358fe6de system support for complete blocking 2013-04-28 21:02:53 -07:00
friendica 61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
Carsten Pfeiffer 7f6a7af2b3 fix reading sitename config 2013-04-27 21:40:40 +02:00
friendica 1ed6a2bd3d rev update 2013-04-25 02:36:52 -07:00
Fabrixxm d36292c532 template: set smarty3 as default template engine in theme info array. 
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
 2013-04-23 03:35:31 -04:00
Fabrixxm 6fddd1cbbf template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir 2013-04-23 03:35:31 -04:00
Fabrixxm ddf1caf0fd template engine rework 
- use smarty3 as default engine
- new pluggable template engine system
 2013-04-23 03:27:52 -04:00
Fabrixxm dd02b7bd00 drop items to group pages if no mentions in it. should fix bug 557 2013-04-19 09:55:07 -04:00
Tobias Diekershoff 960d1d99b2 invalid arguments for a foreach loop found 2013-04-17 17:32:31 +02:00
Fabrixxm 659d0cc1b8 uimport remove db scheme version check 2013-04-08 09:03:31 -04:00
Fabrixxm 1442fecd14 uimport: fix file formatting 2013-04-02 09:44:19 -04:00
Fabrixxm 13e315e004 uimport: check table columns before import 2013-04-02 09:16:24 -04:00
Matthew Exon 5b158dbcfb Make the content type available after calling fetch_url 2013-04-01 12:36:43 +08:00
tobiasd cda327a368 Merge pull request #658 from annando/master 
Mail importing problems, a small "vier" change
 2013-03-30 01:46:13 -07:00
Michael Vogel f7fbac2e2b Merge remote-tracking branch 'upstream/master' 2013-03-29 11:22:10 +01:00
friendica 74954e6c68 Merge pull request #656 from fabrixxm/master 
phpdocs for include/text.php
 2013-03-27 19:44:24 -07:00
Matthew Exon c3621407d1 Remove debug line added by mistake 2013-03-28 10:29:27 +08:00
Matthew Exon 10b68ef837 Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself 2013-03-28 09:49:10 +08:00
Fabrixxm 1a8bdf8ae8 more phpdocs 2013-03-27 10:28:56 +01:00
Fabrixxm a161b86d1f add phpdoc 2013-03-27 05:11:40 -04:00
tobiasd e7c705c9a1 Merge pull request #654 from mexon/filter_var 
Use filter_var instead of parse_url to validate URLs, since the latter r...
 2013-03-26 11:31:11 -07:00
fermionic 04a255e393 Merge pull request #652 from mexon/edited_timestamp 
items.php edited timestamp logic
 2013-03-24 07:30:07 -07:00
Matthew Exon c7cfc6b170 Use filter_var instead of parse_url to validate URLs, since the latter returns true even for invalid URLs, in particular the empty string 2013-03-21 16:27:12 +08:00
Matthew Exon 6edc52f78f Convert received "edited" timestamp to UTC before comparing to what's in the database, and don't overwrite with older items. 2013-03-20 09:00:12 +08:00
friendica 00aab4039d Merge https://github.com/friendica/friendica into pull 2013-03-19 03:31:37 -07:00
friendica 17cb682ed0 rm addon.old 2013-03-19 03:30:50 -07:00
fermionic 1a49c841d8 Merge pull request #649 from mexon/redirect_fix 
Restore redirect functionality removed by change 452ff19d
 2013-03-18 18:06:41 -07:00
friendica 133ef9155d don't allow deleted accounts to appear on "manage" page 2013-03-18 17:31:21 -07:00
Michael Vogel 111495423c Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated. 2013-03-14 23:15:15 +01:00
Matthew Exon c53bdfb163 Restore redirect functionality removed by change 452ff19d 2013-03-14 14:09:42 +08:00
fermionic 3399b1ccf6 Merge pull request #648 from mexon/mailstream-prerequisites 
Mailstream prerequisites
 2013-03-10 15:34:54 -07:00
fermionic 91a6a1cb25 Merge pull request #646 from annando/master 
OStatus conversations, "vier" and diaspora android client
 2013-03-10 15:24:27 -07:00
Matthew Exon 720a44bb0b The post_remote_end hook was being called with an escaped version of the item, not very useful. This change moves the hook to the end of item_store and gets all data fresh from the database. 2013-03-09 15:57:50 +08:00
Matthew Exon 4df162d929 Explicitly list protocols that are allowed, rather than using their initials. Also, add cid, which I need for my mailstream plugin to work. 2013-03-09 15:57:40 +08:00
Michael Vogel e200040c5b Merge remote-tracking branch 'upstream/master' 2013-03-07 20:20:12 +01:00
Michael Vogel 5d3613c8bc Vier: The change from blue to black in links is now faded as well. 2013-03-07 19:34:54 +01:00
Fabrixxm a92ef6f0fe remove authentication from api help/test. fix issue 552. 
identi.ca don't ask for auth on help/test.
 2013-03-07 08:16:53 -05:00
Michael Vogel c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id. 
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
 2013-03-06 23:23:04 +01:00
Michael Vogel 421d484839 Merge remote-tracking branch 'upstream/master' 2013-03-04 00:05:17 +01:00
Michael Vogel 8e1d253568 OStatus conversation: now the creation date of the item is store with the conversation 
vier: The link color and the color of the top bar is changed.
 2013-03-03 23:44:50 +01:00
friendica 1c55b0b359 Merge pull request #639 from annando/master 
Community/Open Graph
 2013-03-03 12:07:52 -08:00
Michael Vogel 00888a73bb OStatus conversation: Prevent posting loops 2013-03-03 17:58:35 +01:00
Zach Prezkuta 0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
friendica 59c03edbc9 fix util/config 2013-03-02 15:44:00 -08:00
friendica 0433263866 Merge https://github.com/friendica/friendica into pull 2013-02-26 17:33:47 -08:00
friendica 5205a374ee block injection vector 2013-02-26 17:33:18 -08:00
fermionic cf677a3003 Merge pull request #628 from fermionic/20130223-limit-body-size-on-email-imports 
run limit_body_size on imported emails, which don't go through consume_feed
 2013-02-24 07:13:21 -08:00
tobiasd 521ccc38c6 Merge pull request #625 from tobiasd/master 
make sure conv_as->items is an array or don't proceed
 2013-02-23 23:27:21 -08:00
Zach Prezkuta fcab22b80f run limit_body_size on imported emails, which don't go through consume_feed 2013-02-23 10:06:59 -07:00
Zach Prezkuta 4db50a3ecb admin option to disable post content in email notifications for the site 2013-02-23 09:31:34 -07:00
Tobias Diekershoff c2b49f2588 make sure conv_as->items is an array or don't proceed 2013-02-23 12:42:55 +01:00
friendica 280b72b9e6 Merge https://github.com/friendica/friendica into pull 2013-02-21 16:43:01 -08:00
friendica 615b060352 rev update 2013-02-21 16:42:34 -08:00
Michael Vogel c90272e2ae supressing warning when importing items. Speeding up community. Changed query for the search. 2013-02-20 21:47:36 +01:00
Michael Vogel 7e154d5e4c plugin: orphaned hooks weren't deleted. 
update: fixing update job for tags.
 2013-02-17 18:05:30 +01:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Michael Vogel 3e58060b30 API: beautify the output of repeated items 
Vier: Birthday reminder looks better
 2013-02-15 20:14:45 +01:00
Zach Prezkuta 399e8cd8e4 don't change to string in prune_deadguys() 2013-02-09 17:52:29 -07:00
friendica 6242f9a147 add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. 2013-02-07 23:43:55 -08:00
fermionic a0e18a0ff8 Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify 
move mb_strlen call out of for loop definition
 2013-02-06 21:38:15 -08:00
Zach Prezkuta c886927a52 use mb_ereg_replace for xmlify and unxmlify 2013-02-06 22:30:27 -07:00
Zach Prezkuta 18f71c1050 parsing multi-byte strings with xmlify 2013-02-06 00:37:15 -07:00
Zach Prezkuta 774a78dbde better unicode support in xmlify 2013-02-05 23:02:13 -07:00
friendica 2e6446371a Merge pull request #602 from fermionic/20130204-permissions-bug-on-profile-page 
fix bug that wouldn't show posts to a user who was in an allowed group
 2013-02-05 17:36:06 -08:00
friendica 70f02053e1 Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks 
allow themes to use plugin hooks
 2013-02-05 17:21:42 -08:00
Zach Prezkuta 6152cbd5ac add support for more file attachment types 2013-02-04 22:15:16 -07:00
Zach Prezkuta 439974a5d5 allow themes to use plugin hooks 2013-02-04 20:53:53 -07:00
Zach Prezkuta 09a2786882 fix bug that wouldn't show posts to a user who was in an allowed group when individual contacts were also specified in the permissions 2013-02-04 20:27:30 -07:00
Zach Prezkuta b6bc7daadf move mb_strlen call out of for loop definition 2013-02-04 20:17:56 -07:00
Michael Vogel c9307eb96a OStatus conversation are now checked every 30 minutes for new answers. 2013-02-04 00:57:23 +01:00
zottel c0af9b2938 Reset network when showing a contact's posts 
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
 2013-02-01 09:12:37 +01:00
Zach Prezkuta 22c962f1fa remove deprecated call by reference 2013-01-29 18:44:42 -07:00
Michael Vogel 2350aa54eb OStatus-Conversation auto completion works now. 
Some performance issues added as well.
 2013-01-30 01:31:27 +01:00
Zach Prezkuta 2635c59c83 don't block private posts to logged in users on the local hub 2013-01-27 22:42:36 -07:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme 
Decaf mobile: an (almost) Javascript-free theme
 2013-01-27 19:11:36 -08:00
friendica 38238972b5 really nitty permission tweaking 2013-01-27 18:10:26 -08:00
Michael Vogel 9967c9892d only change parents when parents are changed. 2013-01-28 01:22:00 +01:00
Michael Vogel e668fece10 ostatus auto completion now seems to work. 2013-01-28 01:16:51 +01:00
Michael Vogel bc972e16ce New function to complete threads from ostatus postings 2013-01-27 23:25:04 +01:00
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel fdee002f73 Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
Michael - piratica.eu 2c93067682 Performance: Adding several variables for performance measuring. 2013-01-26 16:46:43 +01:00
friendica f542653230 suppress duplicate comment notifications 2013-01-23 17:46:46 -08:00
friendica d074656f26 Merge https://github.com/friendica/friendica into pull 2013-01-23 17:08:21 -08:00
friendica b3b0a9de24 die forcefully but gracefully on missing api templates 2013-01-23 17:07:55 -08:00
Tobias Diekershoff 1f36ebdb2b add display_item hook back around l. 686 to the conversation 2013-01-22 08:11:13 +01:00
Michael - piratica.eu cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica 
Conflicts:
	include/poller.php
 2013-01-20 14:17:09 +01:00
Michael - piratica.eu 7ab335c9d6 Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Zach Prezkuta bf26af5ac6 insidious set_config bug 2013-01-18 23:38:49 -07:00
Michael Vogel 82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +01:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
Zach Prezkuta 2a8e5032e0 run check_config() in a separate process 2013-01-14 16:58:32 -07:00
Michael Vogel 452ff19d73 Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this. 2013-01-13 18:51:48 +01:00
Michael Vogel 5501dd0759 Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds. 2013-01-13 17:13:01 +01:00
Michael Vogel 158bfda0ac Changing the tag system to the "term" table. 2013-01-13 14:50:55 +01:00
Michael Vogel 8cef0fa80d Mentions are now displayed much faster. Attention: The related database update can last more than one minute. 
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
 2013-01-13 09:37:15 +01:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
friendica ceaedb41e4 Merge pull request #582 from fermionic/20130112-various-fixes 
Various fixes
 2013-01-12 12:24:51 -08:00
Zach Prezkuta 7f19018cd4 fix leak 2013-01-12 06:56:45 -07:00
Zach Prezkuta 1507ec37a4 give post a chance to arrive before rejecting photos from Diaspora 2013-01-12 06:52:15 -07:00
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta 5f1ef732e0 remove now-unnecessary line in text.php 2013-01-10 21:48:33 -07:00
Zach Prezkuta bce29054b9 allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
Michael Vogel 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
Michael Vogel 82820d8e95 Now the third most likely languages are shown. 
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
 2013-01-09 20:54:18 +01:00
friendica 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica 07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
friendica a5755b59a8 preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570 2013-01-04 15:21:05 -08:00
friendica 88cc414355 Merge pull request #570 from annando/master 
Vier, caches and "share" via API
 2013-01-04 15:13:09 -08:00
Thomas Willingham a8ea3d6e48 We haven't Got Zot 2013-01-03 20:18:43 +00:00
friendica e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original 2013-01-03 03:47:08 -08:00
Michael Vogel e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel ad287914c7 Support of "share" through the API. 2012-12-30 21:30:39 +01:00
friendica 215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -08:00
friendica 4b2de6fdf2 if snautofollow - make all SN contacts writable 2012-12-29 02:51:15 -08:00
friendica f962ecdd64 Merge https://github.com/friendica/friendica into pull 2012-12-29 02:36:19 -08:00
friendica 05996457f9 receiving post from archived Diaspora contacts 2012-12-29 02:35:41 -08:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Michael Vogel 6f6b1f95c8 vier: With IE there are no borders around images anymore 
bbcode: Multiple new lines are now reduced
 2012-12-28 11:31:30 +01:00
Fabrixxm b620b6e608 api: add 'allow_api' to user authenticated via oauth 2012-12-27 10:20:51 -05:00
fermionic d3c54438df Merge pull request #563 from fermionic/20121225-smarty-includes-like-friendicas 
revert unnecessary variable name changes
 2012-12-26 09:44:27 -08:00
Zach Prezkuta 263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
fermionic 7e9730089f Merge pull request #561 from fermionic/20121225-smarty-includes-like-friendicas 
20121225 smarty includes like friendicas
 2012-12-25 11:08:06 -08:00
Zach Prezkuta e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta 11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Michael Vogel 5bc6896671 The caches are now cleared only once an hour. 2012-12-25 12:52:30 +01:00
Zach Prezkuta f0f8d0f687 delete cookie on browser close after logout 2012-12-24 12:52:49 -07:00
fermionic a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine 
only use Smarty if the view/smarty3/ directory is writable
 2012-12-23 05:19:02 -08:00
Zach Prezkuta 53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
friendica a29842e301 Merge https://github.com/annando/friendica into annando 
Conflicts:
	view/admin_site.tpl
 2012-12-22 23:02:21 -08:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel b0759e9a9f Some more system settings are now reachable via front-end 
Bugfixing in the mail import when a reply header isn't set correctly
 2012-12-22 16:16:01 +01:00
Michael Vogel 99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel 7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel f4bc5c57f3 New option to enable and disable the "share" element 
Changes to "vier" to use more "font awesome" icons
 2012-12-21 00:08:58 +01:00
Michael Vogel a8aa992102 Vier: Design issues with preview fixed 2012-12-20 04:19:02 +01:00
Michael Vogel 0a29927e6d Mail: real threading now works with outgoing mails. 2012-12-19 16:31:06 +01:00
Michael Vogel a86baa372a Mailimport is now realized like a wall-to-wall-post 2012-12-19 15:58:38 +01:00
Michael Vogel c22f65bafa repeated items from ostatus and diaspora are now using the share-element. 
Some design changes to repeated items in "vier".
 2012-12-19 12:18:52 +01:00
Michael Vogel 9ab34f8857 mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header. 2012-12-18 00:47:55 +01:00
Michael Vogel fc816feb6d mailimport: Bug that prevented mails to be imported 2012-12-17 21:39:52 +01:00
Michael Vogel 4164257cb2 vier: The alt-pager and the birthday- and eventreminder is optically improved 2012-12-17 21:12:11 +01:00
Michael Vogel a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
Michael Vogel 9c0de28622 bbcode: New element "share" for shared content 
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
 2012-12-17 03:01:40 +01:00
friendica 0f1592547e Merge https://github.com/friendica/friendica into pull 2012-12-16 17:59:15 -08:00
friendica 3f63a69d7a divide by zero on incorrectly specified oembed thumbnail size 2012-12-16 17:58:12 -08:00
Michael Vogel d253d59668 vier: Added Delegations and optical changes. 2012-12-15 14:39:37 +01:00
Michael Vogel 46c5a97a20 New caching system for photos 2012-12-14 22:47:30 +01:00
Fabrixxm 71751ecb8c template_processor: add filter support to variables 2012-12-14 10:10:33 -05:00
friendica 6b36863dd8 prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists - 
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
 2012-12-13 21:02:14 -08:00
friendica 376bf517a4 bug #516 - set writable on first poll 2012-12-06 13:59:20 -08:00
friendica 8b5288d0f7 Merge pull request #540 from Leberwurscht/master 
Cross site request forgery hole
 2012-12-03 13:40:29 -08:00
tobiasd 23c873fc51 Merge pull request #542 from annando/master 
Some minor changes to "vier"
 2012-12-02 23:49:06 -08:00
Michael Vogel 5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Leberwurscht 945afec656 fix CSRF hole in API 2012-12-01 01:26:54 +01:00
friendica b130c892b2 features categories were un-translatable 2012-11-28 19:25:09 -08:00
friendica 32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
friendica 5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica 226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta a536a4e657 local stuff leaked 2012-11-22 09:21:21 -07:00
Zach Prezkuta 04f5506318 forgot some slightly important files 2012-11-22 09:20:03 -07:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel e36c30d285 Vier: Margin problems with code fixed. 2012-11-22 15:06:15 +01:00
friendica 9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
friendica 868bdc9b6a php warning 2012-11-22 03:19:05 -08:00
friendica 0840c8365a always check for valid dfrn_id before auto_redir 2012-11-21 15:56:00 -08:00
friendica 4d289574ca ensure that auto_redir does not loop 2012-11-21 15:41:14 -08:00
friendica f1c579e74a Merge https://github.com/friendica/friendica into pull 2012-11-18 23:50:37 -08:00
friendica 70d0ed9402 log directory updates 2012-11-18 22:53:01 -08:00
Michael Vogel 5dbf89be88 Making the new reshare method optional 2012-11-17 16:27:49 +01:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
Michael Vogel e67062d9cf Merge remote-tracking branch 'upstream/master' 2012-11-15 21:52:35 +01:00
friendica ab0dc3131a fix wallmessage 2012-11-14 13:59:31 -08:00
friendica 3dc4c52022 Merge pull request #533 from fabrixxm/moveme 
Fix issue 508
 2012-11-13 14:06:20 -08:00
Fabrixxm 374683503a uimport: check check to ensure the username isn't already taken before import (issue 508) 2012-11-13 04:52:32 -05:00
friendica 009744af50 allow posted ACLs to be comma-delimited string besides the default array 2012-11-11 13:56:21 -08:00
friendica 6e0dd29c1b include some notes on grabbing the tumblr avatar 2012-11-11 00:44:30 -08:00
friendica de5a21bec4 improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago. 2012-11-11 00:28:21 -08:00
Michael Vogel b875191237 Diaspora: Avatars of repeated items weren't found 
Vier: Complete redesign of the navigation header
 2012-11-10 23:19:32 +01:00
Michael Vogel 71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Zach Prezkuta ac164cfca8 refresh login time every 12 hours for 'Remember me' 2012-11-08 17:00:37 -07:00
Michael Vogel 5d2d306d9f Make reshared Diaspora postings look lile wall-to-wall postings (preparation for real forwards in friendica) 2012-11-08 21:45:53 +01:00
Michael Vogel 4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
Zach Prezkuta e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
friendica 776552226b Merge https://github.com/friendica/friendica into pull 2012-11-06 01:10:36 -08:00
friendica fd4d35b16c set writable for ostatus followers 2012-11-06 01:10:12 -08:00
zzottel eb3408b574 Merge pull request #526 from zzottel/master 
Forgot to commit the changes(regarding fermionic's comments) in notifier.php
 2012-11-05 23:18:48 -08:00
zottel b7e121ccf7 Forgot to commit the changes (regarding fermionic's comments) in notifier.php 2012-11-06 08:16:08 +01:00
Fabrixxm cef5afc53d moveme: remove debug comment 2012-11-05 04:15:09 -05:00
Fabrixxm 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Fabrixxm 385ee5a862 pass $argv & $argc as reference to *_run() functions. 2012-11-05 09:28:54 +01:00
Fabrixxm aa20042bec moveme: fix contact photos 2012-11-05 09:18:55 +01:00
root fe3f1af92f Merge remote-tracking branch 'upstream/master' 2012-11-04 23:31:05 +01:00
Michael 6afa5d1c48 In the API you now can update not only the body but also the title. In html2plain the function for valid urls was improved. 2012-11-04 23:18:52 +01:00
zottel dd1e735efb Worked in fermionic's comments (not count($r)). 2012-11-04 11:07:11 +01:00
Michael 2b6498b2a2 Merge remote-tracking branch 'upstream/master' 2012-11-03 22:27:34 +01:00
zottel 2871fd4793 Depublish public posts when archiving a contact 2012-11-02 23:54:03 +01:00
zottel 7de5c7ebe1 Changes to make contacts delete all content from the user when a user is deleted. 
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.

Please check carefully. I tested locally on my server, but not with other
servers.
 2012-11-02 21:43:47 +01:00
Zach Prezkuta c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta 6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Zach Prezkuta d98974572b fix theme control of allowing threading 2012-11-01 10:33:01 -06:00
Zach Prezkuta 43de9cf904 don't try to auto redir if I'm a blocked or pending contact 2012-11-01 10:32:33 -06:00
Fabrixxm 1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
friendica a41e78a06d Merge pull request #516 from fermionic/20121029-auto-redir-fix 
make sure that the contact is local for auto redir
 2012-10-29 21:00:28 -07:00
friendica d3682f5d6a Merge pull request #517 from fermionic/20121029-wall-live-commenting 
add live div to wall page
 2012-10-29 20:58:32 -07:00
Zach Prezkuta 200d2030d5 don't combine msg and meta arrays unless they're the same size 2012-10-29 12:47:51 -06:00
Zach Prezkuta 4fd339b216 add live div to wall page 2012-10-29 12:43:52 -06:00
Zach Prezkuta 4990f64927 make sure that the contact is local for auto redir 2012-10-29 12:03:48 -06:00
Fabrixxm dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) 2012-10-29 17:50:55 +01:00
Fabrixxm c51e057fe6 Merge remote branch 'friendica/master' into moveme 2012-10-29 05:57:58 -04:00
friendica 02251f23df undefined fn: init_groups_visitor in mod_profile, rev update 2012-10-21 14:41:10 -07:00
Michael Vogel 28b085569a Merge remote branch 'upstream/master' 2012-10-19 07:12:15 +02:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
friendica f6f3042d00 imagick exception 2012-10-17 15:22:29 -07:00
Fabrixxm 65d235017c move account. first step. 
export basic account data as json
import basic account data in db (dbs must be at same schema version)
 2012-10-17 11:13:01 -04:00
friendica 80513e4332 Trying this fix for endless redirection 2012-10-15 18:51:22 -07:00
friendica fd6a21f522 oops - missingfile from last checking, the important one 2012-10-15 16:33:00 -07:00
fermionic ca21f1bbc8 Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts 
for profile and photos, detect contacts from local hub and auto-redir
 2012-10-11 17:24:11 -07:00
fermionic 2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location 
allow themes to decide where live updates appear
 2012-10-10 17:34:28 -07:00
Zach Prezkuta b9818185db for profile and photos, detect contacts from local hub and auto-redir 2012-10-09 09:50:24 -06:00
Zach Prezkuta 0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Zach Prezkuta c3cf459b27 use getWidth and getHeight, which are agnostic to Imagick being enabled 2012-10-09 09:35:32 -06:00
friendica 112fafcc81 consistent handling of scaled images when using imagick 2012-09-30 03:25:20 -07:00
friendica e0dbd2e8e4 Merge pull request #494 from fermionic/diaspora-contact-lookup-fails 
look for DFRN contacts as well
 2012-09-30 01:58:37 -07:00