Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-27 20:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
10736 commits 3 branches 64 tags 241 MiB
Commit graph

3326 commits

Author SHA1 Message Date
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
friendica
e60c729b51 Merge pull request #495 from fermionic/email-optimization 
send less messages to server; remove delete option
 2012-09-30 01:58:07 -07:00
friendica
35905ebf1c Merge pull request #496 from fermionic/deleted-group-stays-in-default-permissions 
remove groups from default permissions when removed; bug in group_add_member
 2012-09-30 01:57:52 -07:00
Zach Prezkuta
34081010ff allow contact if in allowed group, even if not in non-empty allowed contacts 2012-09-29 17:54:37 -06:00
Zach Prezkuta
4af4e9aa9f remove groups from default permissions when removed; bug in group_add_member 2012-09-29 17:53:06 -06:00
Zach Prezkuta
f4f3c8375f send less messages to server; remove delete option 2012-09-29 17:50:34 -06:00
Zach Prezkuta
59ace4f4d7 look for DFRN contacts as well 2012-09-29 17:48:56 -06:00
friendica
8416cff2a5 slight adjustment to Photo scaling - also discovered imagick resize may need some additional work 2012-09-29 05:46:01 -07:00
friendica
0693afd6b7 only constrain horizontal image dimension for scaling very tall photos 2012-09-29 05:20:29 -07:00
Michael Vogel
ea6ced8359 Merge remote branch 'upstream/master' 2012-09-29 08:35:17 +02:00
friendica
cef5169567 subscribe-to/follow threads 2012-09-27 19:53:55 -07:00
friendica
25773b41cb add "tagged" hook (bots and such) 2012-09-26 18:24:19 -07:00
friendica
e433f20cd8 sort out the 'delete selected' mess 2012-09-25 19:10:46 -07:00
friendica
245d9f0aca one template to rule them all 2012-09-25 01:31:48 -07:00
friendica
8184de9c78 remove THISPLUGIN definition - not used and doesn't work 2012-09-24 01:30:18 -07:00
friendica
054f8edb59 zeros - theming for new categories/folder display 2012-09-23 19:22:48 -07:00
friendica
c3b4f9f0d3 support for bringing back cats/folders 2012-09-23 17:16:37 -07:00
Fabrixxm
dd25c7db7e more $item data 
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php
 2012-09-20 09:46:49 +02:00
Fabrixxm
40f2ec189e Merge remote branch 'friendica/master' into blog-like 2012-09-20 02:48:54 -04:00
Michael Vogel
4c389eb73b Merge remote branch 'upstream/master' 2012-09-20 08:32:33 +02:00
Zach Prezkuta
da7c5b19b1 allow hidden comments phrase to be accessed separately as number and text 2012-09-19 21:31:26 -06:00
Zach Prezkuta
1aa111387a -- Fix Diaspora profile update avatar bugs 
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
 2012-09-19 20:35:39 -06:00
Fabrixxm
b400ddd22d conversation: new 'categories' and 'folder' elements to $item 
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array
 2012-09-19 11:38:32 -04:00
friendica
66081201bc allow "subscribe to thread" activities to exist without displaying them. 2012-09-18 20:12:55 -07:00
friendica
2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
friendica
669d2b890e rev update - add cancel markup to editor 2012-09-15 15:23:15 -07:00
friendica
32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. 2012-09-13 19:11:07 -07:00
friendica
d19a3b8324 provide separate hashtag and mentions for themes in addition to composite tags 2012-09-13 16:59:25 -07:00
friendica
f4e3f335ef don't allow followers to get a post through unless it's a tag deliver 2012-09-12 18:53:20 -07:00
friendica
3d6c49d5b3 Merge https://github.com/friendica/friendica into pull 2012-09-12 17:20:52 -07:00
friendica
db09724aec use local photo for tag notifications if available 2012-09-12 17:19:26 -07:00
Domovoy
67563d5c82 Fallback to gd if Imagick can't load the data 2012-09-12 11:55:09 +02:00
Michael Vogel
5cfb068c25 Merge remote branch 'upstream/master' 2012-09-10 23:28:07 +02:00
Domovoy
16eec24a21 Tabs trouble? What happened? I sure aven't changed anything to my editor... 2012-09-10 10:36:30 +02:00
Domovoy
1b82df60db Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd 2012-09-10 09:50:30 +02:00
Domovoy
bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-09-10 09:19:08 +02:00
friendica
5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. 2012-09-06 20:17:50 -07:00
Thomas Willingham
d0994fc882 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-07 00:44:01 +01:00
Thomas Willingham
5f970aea72 Typo in notifier. 2012-09-07 00:43:05 +01:00
fermionic
9bf8efc45f Merge pull request #459 from fermionic/individual-choice-of-mobile-theme 
Individual choice of mobile theme
 2012-09-06 16:35:04 -07:00
Zach Prezkuta
a089a89478 small twitter improvements 2012-09-06 17:31:05 -06:00
Zach Prezkuta
77529ccdf1 allow individual choice of mobile themes 2012-09-06 17:24:34 -06:00
friendica
1478229abc allow comments on other folks wall-to-wall postings 2012-09-05 18:24:06 -07:00
friendica
3968dc932f update writable for dfrn contacts when using local delivery 2012-09-05 16:26:11 -07:00
friendica
9e5fa5b9a9 ignore exif orientation if we can't parse the particular flavour of exif 2012-09-05 04:02:30 -07:00
friendica
411b6a71b4 Merge https://github.com/friendica/friendica into pull 2012-09-04 22:53:32 -07:00
friendica
4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Zach Prezkuta
79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
Michael Vogel
59d378913d Merge remote branch 'upstream/master' 2012-09-04 07:22:59 +02:00
friendica
cdf648c0b4 attachments from non-friendica contacts shouldn't go through redir - it won't work 2012-09-03 21:31:35 -07:00
Michael Vogel
f6818ab243 Merge remote branch 'upstream/master' 2012-09-02 17:50:25 +02:00
Michael Vogel
3c24a7ed3e items: added some logging infos 2012-09-02 17:49:06 +02:00
friendica
39c7b34276 rev update 2012-09-02 01:47:04 -07:00
friendica
2ace7d6646 Merge pull request #451 from fabrixxm/master 
fixes and tweaks
 2012-08-31 01:26:03 -07:00
Domovoy
ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Fabrixxm
f433158bed config: fix get_config and get_pconfig search for serialized array 
works also if the serialized string contains newlines
 2012-08-29 04:19:15 -04:00
Zach Prezkuta
f7a1999c15 manually fix escaped underscores in links 2012-08-28 20:12:41 -06:00
fermionic
597e96e156 Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags 
regular expressions were grabbing too much
 2012-08-28 19:03:04 -07:00
fermionic
8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings 
automatically make posts private for new users
 2012-08-28 19:02:51 -07:00
Fabrixxm
9ecb984285 Merge remote branch 'friendica/master' into bid-prov 2012-08-28 10:38:40 -04:00
Zach Prezkuta
72712175b5 regular expressions were grabbing too much 2012-08-26 14:56:34 -06:00
Zach Prezkuta
193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta
f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
Zach Prezkuta
bd59f3d152 probably shouldn't require exact match for non-string 2012-08-24 21:46:42 -06:00
Zach Prezkuta
7c5f5f3113 automatically make posts private for new users 2012-08-24 21:28:28 -06:00
Domovoy
9390eda5e6 Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum) 2012-08-24 05:11:39 +02:00
Domovoy
5cd1dde59b Logic error 2012-08-24 05:04:35 +02:00
Domovoy
72f3d628e8 Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-24 04:58:11 +02:00
Domovoy
c9cfc52293 method, not property 2012-08-24 04:57:32 +02:00
Domovoy
71d9c95faf Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-24 04:47:29 +02:00
Domovoy
e3ee997cd3 Fix copy/paste stupidity 2012-08-24 04:45:10 +02:00
Domovoy
8a25c7876c Better wall to wall detection (fallback on checking if we have a @ tag) 2012-08-24 04:36:03 +02:00
Domovoy
f1bc2afbfe Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-23 10:25:22 +02:00
friendica
386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica
ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
friendica
bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
Domovoy
1406480258 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-19 14:14:33 +02:00
friendica
6bc48b58d8 algorithm for crypt tag 2012-08-19 00:35:39 -07:00
Domovoy
51802b0ae8 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-18 17:23:46 +02:00
Domovoy
17f9fcaec9 Checks done on topmost parent in local_delivery, closes #10 2012-08-18 17:17:33 +02:00
friendica
d96b9cda43 wall-to-wall posts not identified correctly after thread mod 2012-08-17 22:06:13 -07:00
Domovoy
429870015f Comments on friends are back (stupid typo) 2012-08-17 16:20:28 +02:00
Domovoy
16260e9fbb Merge branch 'threaded_items' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-17 15:49:23 +02:00
Domovoy
1581e02f8f Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-17 09:46:43 +02:00
Michael Vogel
d40f25ae08 bbcode: Function for cleaning CSS commands (not yet in function) 
items.php: The detection if a rss/atom-title is identically to the body is improved.
 2012-08-17 07:59:21 +02:00
friendica
68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
friendica
e802c81ec1 fix single quotes 2012-08-15 05:09:44 -07:00
friendica
b8df47e97c bbcode quote display 2012-08-15 04:52:18 -07:00
friendica
bb188cbdf2 extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues. 2012-08-15 02:59:17 -07:00
friendica
4654ebd43b correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare 2012-08-15 00:02:15 -07:00
friendica
aaadabf7d2 partial fix for D* public key format change 2012-08-14 02:20:48 -07:00
Zach Prezkuta
7d8aee05ef update items seen in DB when using API 2012-08-12 20:29:37 -06:00
friendica
bfec28f1fe threading messed up a bit of cross-site federation code 2012-08-12 18:42:43 -07:00
Domovoy
82d779a33b Conversation and Item now handles (dis)like as they should 2012-08-12 17:46:02 +02:00
Domovoy
04f14d96c6 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-12 17:34:23 +02:00
Domovoy
71f11a9a32 Item: new method get_comment_box 2012-08-12 16:02:47 +02:00
friendica
e81f15b28d crypt bbcode tag 2012-08-12 04:29:26 -07:00
Zach Prezkuta
5e09fc31f5 Threading updates 
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
 2012-08-11 14:36:58 -06:00
Domovoy
d817117f6e Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-11 16:42:47 +02:00
friendica
d4b6188356 getting comment counts correct in a threaded world 2012-08-11 01:26:10 -07:00
friendica
95bf9324b4 fix child count 2012-08-10 23:42:45 -07:00
friendica
20be1778db bring likes back - comment ordering is still a bit funky 2012-08-10 16:36:44 -07:00
Domovoy
75d355a2aa Rendering is now done by Item objects 2012-08-10 19:57:39 +02:00
Domovoy
6ef86e1fff New objects: Conversation and Item 2012-08-10 17:46:39 +02:00
Zach Prezkuta
009ebc732a move tag transformation to bb2diaspora; start taking out unnecessary signature stuff 2012-08-10 08:13:17 -06:00
Fabrixxm
fc07f50fd8 conversation: add 'thread_level' to $item array 2012-08-10 05:42:36 -04:00
Fabrixxm
dbbf5b86a2 template processor: trim strings in {{ if str!=str }}, add 'debug' tag: 
{{ debug $var [$var1 [$var2 [...]]] }}{{ enddebug }}

is replaced by

    <pre>var_export($var1)\nvar_export($var2)\n....</pre>
 2012-08-10 04:55:51 -04:00
friendica
4894619d7b bring back "delete selected items" - but need to pass pagedropping to each item 2012-08-09 23:01:37 -07:00
Domovoy
4cc6bf660c The number of comments shown when collapsed is the total of all the descendant items. 2012-08-07 09:53:53 +02:00
Domovoy
f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica
10b0ce5861 Merge https://github.com/friendica/friendica into pull 2012-08-06 19:52:49 -07:00
friendica
558fbcc69e rev update + don't tag anything in [] brackets 2012-08-06 19:50:57 -07:00
Zach Prezkuta
d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
friendica
5d7f9d3b4b rev update 2012-08-05 21:43:20 -07:00
Domovoy
5b374c4050 Diaspora doesn't support threaded comments (forgot some) 2012-08-05 19:30:21 +02:00
Domovoy
707dd216ce Diaspora doesn't support threaded comments 2012-08-05 19:27:54 +02:00
Domovoy
dac88fce56 Remove database update, use fallback solution instead. 2012-08-05 15:08:31 +02:00
Domovoy
e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-05 13:43:53 +02:00
Domovoy
5d1eb37b9b Remote items should be threaded now 2012-08-05 13:30:51 +02:00
friendica
9732f1fccf expire issue 2012-08-04 23:29:52 -07:00
friendica
e27395b3d7 Merge pull request #423 from fermionic/frost-updates 
Various updates
 2012-08-04 17:02:57 -07:00
Zach Prezkuta
ba66e17d1d ImageMagick rotates CW while imagerotate() rotates CCW 2012-08-04 17:30:25 -06:00
Domovoy
786e9064f2 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-04 23:33:06 +02:00
Zach Prezkuta
63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) 
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
 2012-08-04 14:02:39 -06:00
friendica
0c67649c08 put back notags 2012-08-03 18:36:45 -07:00
friendica
621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
Domovoy
8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy
ea7db7b7a8 Threaded items in every page concerned. Some code cleanup. 2012-08-03 21:55:17 +02:00
Domovoy
66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	update.php
 2012-08-03 18:57:37 +02:00
Michael Vogel
2aa67d67f5 Changed markdown to enable diaspora postings with images that contain links 2012-08-02 01:46:28 +02:00
Michael Vogel
04c31d194f Merge remote branch 'upstream/master' 
Conflicts:
	update.php
 2012-08-02 00:21:14 +02:00
Michael Vogel
bed99674d2 bbcode: two new bbcode elements (style, class) for CSS 2012-08-02 00:13:37 +02:00
friendica
372ad112c9 tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. 2012-08-01 01:36:39 -07:00
Domovoy
07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
Zach Prezkuta
067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy
7b2ca538c8 Fallback to the old behavior for unhandled conversations mode. 2012-07-29 21:11:19 +02:00
Domovoy
56f0ee4915 Threaded items on profile page 2012-07-29 20:41:11 +02:00
Domovoy
3b330510ea Fixed misbehaviour in collapsing 2012-07-29 20:09:51 +02:00
Domovoy
2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy
25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy
8ea3087342 Collapsing is back for threaded comments. 
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
 2012-07-29 17:13:21 +02:00
Domovoy
10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Domovoy
d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Fabrixxm
672f9fd87f include/plugin: define THISPLUGIN as "addon/$pluginname/$pluginname.php" 
to make life a litte bit easy to lazy plugin devs like me
 2012-07-27 09:02:28 -04:00
Rainulf Pineda
1573c10631 Fixed syntax error in usage of anonymous function. 2012-07-25 21:38:28 -04:00
Michael Vogel
fc27edb6d7 network: Caching of images 2012-07-26 00:23:25 +02:00
Michael Vogel
6456c2484e scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY] 2012-07-25 23:40:23 +02:00
Domovoy
50d1bdd902 Removed useless function 2012-07-24 17:32:13 +02:00
Domovoy
c8f484e4a5 Rplace spaces with undercores in tags 2012-07-24 17:22:56 +02:00
friendica
aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes 
changes to support a mobile theme
 2012-07-23 20:18:23 -07:00
friendica
982625db9c update contact photos and names in local delivery - not just polled feeds 2012-07-23 20:00:00 -07:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
Domovoy
35f1081bfe Removed the debug statement 2012-07-23 20:16:06 +02:00
Domovoy
d6c600ce11 Hooks now have a 'priority' value, default to 0. 
The hooks are retrieved from the database by descending priority.

As a result they are run in the same order.
 2012-07-23 15:35:31 +02:00
Domovoy
ba76af3488 Forgot a ; 2012-07-22 17:50:58 +02:00
Domovoy
36f600aaf2 Moved compression setup in constructor for Imagick 2012-07-22 17:27:09 +02:00
Domovoy
a3df0d9817 get_FormatsMap doesn't need to be static 2012-07-22 17:09:18 +02:00
Domovoy
62cd4dcb77 Set the type to what it will be saved to in the constructor 2012-07-22 17:07:13 +02:00
Domovoy
7a1f15c8da Always coalesce, if it is not a multi-frame image it won't hurt anyway 2012-07-22 16:27:22 +02:00
Domovoy
c0d3d50fb5 Don't forget to clean frames before saving 2012-07-22 16:22:06 +02:00
Domovoy
ab484ebc76 getExt should not use Imagick format, mapping ext and mime type is more accurate. 2012-07-22 16:19:35 +02:00
Domovoy
83075c2f27 Set the Imagick image format in the constructor, so we can uset [get|set](image)XXX methods as intended 2012-07-22 16:12:47 +02:00
Domovoy
689e3028bf Use getImageFormat to know the image format in the constructor. 
Since we don't load the image with Imagick constructor, we need to use the [get|set]imageXXX methods.
We should be able to handle the image as if it was loaded from Imagick constructor, so that we don't get lost between the image and its frames.

Also added a debug log so that we get some info on unhandled mime types.
 2012-07-22 15:24:41 +02:00
Domovoy
0acb983be4 guess_image_type now uses Imagick::getImageMimeType() 2012-07-22 15:17:40 +02:00
Domovoy
5d0bd98d2a Photo::getType() now uses the accurate Imagick::getImageMimeType() 2012-07-22 14:50:19 +02:00
Domovoy
f723f756fd Photo::scaleImageSquare was giving an inexistent variable to scaleImage. 2012-07-22 14:22:47 +02:00
Domovoy
6c2cd91184 gd is back in the game as a fallback: not everybody can have Imagick. 2012-07-22 13:43:46 +02:00
Domovoy
fb2f4b6b35 Photo now uses Imagick instead of gd. 2012-07-21 17:17:19 +02:00
friendica
43d986cab2 one for the ladies who get poked by undesirables. 2012-07-20 00:47:30 -07:00
friendica
700569c7d6 this is the one I'll probably use the most 2012-07-19 22:40:45 -07:00
friendica
9c72b45f36 and the main photo menu 2012-07-19 21:27:22 -07:00
friendica
64bd634582 add poke to contact photo menu 2012-07-19 21:03:31 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Michael Vogel
c8f99a8a66 Merge remote branch 'upstream/master' 2012-07-18 21:03:57 +02:00
friendica
749ae9b297 filter the protocol specifier in bbcode links. 2012-07-17 18:33:04 -07:00
friendica
f440d76200 recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396 2012-07-15 21:00:11 -07:00
friendica
02d88e7cbe name mixup in wall-to-wall hovertips 2012-07-15 20:56:09 -07:00
friendica
210fe188b2 missing param 2012-07-15 17:07:53 -07:00
Michael Vogel
7aa10d1935 Merge remote branch 'upstream/master' 2012-07-15 17:26:00 +02:00
Michael Vogel
335c15ede5 Hopefully the final fix for image links in bb2diaspora 2012-07-15 13:40:01 +02:00
Michael Vogel
8aeb3ec2fb Corrected the fix for images with links 2012-07-15 13:12:24 +02:00
Michael Vogel
4e9086f9b0 Changes in the bbcode to markdown converter to make it more compatible with Diaspora 2012-07-15 12:47:24 +02:00
Michael Johnston
717fd8539b add alt_pager function, add ability to use new pager logic on network, profile, community, and search. 2012-07-14 14:21:58 -04:00
Michael Vogel
8d7d46ae7a Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work 2012-07-14 19:54:27 +02:00
Michael Vogel
72f430ae58 parse_url: Problem when resizing images 2012-07-14 13:59:42 +02:00
friendica
8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
Michael Vogel
bfca7f47ef Merge remote branch 'upstream/master' 
Conflicts:
	include/bb2diaspora.php
 2012-07-13 23:39:51 +02:00
Michael Vogel
5f400c4a97 API: Now returns a real 404 when a function isn't implemented 
parse_url: Image handling improved
 2012-07-13 23:23:31 +02:00
friendica
f30b694ae4 Merge pull request #389 from fermionic/diaspora-likes-on-comments 
make likes on comments work with Diaspora, fix some small bugs
 2012-07-12 22:52:00 -07:00
friendica
7b4accec81 Merge pull request #390 from fermionic/diaspora-fixed-mangled-text 
focus preg_replace to prevent it from catching too much
 2012-07-12 22:51:20 -07:00
Zach Prezkuta
f92338d79b make likes on comments work with Diaspora, some small bugs 2012-07-12 23:14:39 -06:00
Zach Prezkuta
92db5e5ec2 focus preg_replace to prevent it from catching too much 2012-07-12 23:14:29 -06:00
friendica
7f7e2c5de0 add plink to profile notifications 2012-07-12 16:12:37 -07:00
Michael Vogel
02a1fc9cd0 parse_url: Further improvements of the new method to fetch page data 2012-07-12 23:41:04 +02:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
friendica
085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
friendica
86cb638637 notification issue on wall-to-wall posts 2012-07-11 02:58:57 -07:00
Zach Prezkuta
fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
Zach Prezkuta
d89b4cea64 missed a couple of variable names when I redid comment and like code 2012-07-09 20:36:25 -06:00
Zach Prezkuta
00eb000e36 don't check for was_recently_delayed in diaspora_transmit during a queue run 2012-07-09 09:39:09 -06:00
friendica
ab710bce3b Merge https://github.com/friendica/friendica into pull 2012-07-08 22:34:21 -07:00
friendica
caabb43326 diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match. 2012-07-08 22:32:04 -07:00
friendica
fcf971fea9 Merge pull request #383 from fermionic/auto-orient-all-uploaded-images 
auto-orient uploaded wall photos and profile photos also
 2012-07-08 15:32:20 -07:00
Michael Vogel
47c48aa438 DBA: Possibility to log the database speed 2012-07-08 21:27:20 +02:00
Zach Prezkuta
fb4295f07f better check for image EXIF support 2012-07-08 11:17:50 -06:00
Michael Vogel
db2f0f7919 Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet 
Bugfix: BBCode: Fixed charset problems.
 2012-07-08 18:27:11 +02:00
Zach Prezkuta
9fbe921051 auto-orient uploaded wall photos and profile photos also 2012-07-08 09:18:05 -06:00
Zach Prezkuta
c8378260bc check for posted dates based on month only 2012-07-08 08:46:46 -06:00
Zach Prezkuta
6d10374c17 cleanup 2012-07-07 18:50:46 -06:00
Zach Prezkuta
da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
Zach Prezkuta
57635e7684 add function to exclude embedded images when checking message length 2012-07-07 16:24:20 -06:00
Michael Vogel
e9d7f85297 network: Small changes 2012-07-07 20:40:15 +02:00
friendica
0c5af9f303 Merge pull request #379 from fermionic/events-display-wrong-in-diaspora 
remove check for event description in bb2diaspora
 2012-07-07 04:19:15 -07:00
Zach Prezkuta
4fb996d9f7 remove check for event description, since it's not required to create an event 2012-07-06 17:11:25 -06:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
a6514e81bb remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
Zach Prezkuta
47c7fd89ba my php thinks this is a typo 2012-07-05 20:39:22 -06:00
Zach Prezkuta
5395cf5bd9 clear title and body of items on local delete 2012-07-05 20:07:01 -06:00
friendica
854abcf612 Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions 
slightly better way of handling last loop
 2012-07-05 18:10:32 -07:00
Zach Prezkuta
528d250ded slightly better way of handling last loop 2012-07-05 19:08:30 -06:00
friendica
09959b1b1c Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions 
add some timeouts to prevent deadlock
 2012-07-05 18:05:32 -07:00
Zach Prezkuta
5dcce1ed93 add some timeouts to prevent deadlock 2012-07-05 19:01:13 -06:00
friendica
fe984963ed Merge pull request #373 from fermionic/more-list-fixes 
fix small bug in lists and revert Diaspora list processing to non-Markdo...
 2012-07-05 16:03:29 -07:00
Michael Vogel
dafc84390d Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...) 2012-07-05 23:36:00 +02:00
Zach Prezkuta
e0607e0238 cleanup some syntax errors in lock.php 2012-07-05 14:27:29 -06:00
Zach Prezkuta
75ed37fb3d "lock" is a reserved MySQL keyword 2012-07-05 14:27:29 -06:00
Zach Prezkuta
46068935d0 minor cleanup in lock.php 2012-07-05 14:26:42 -06:00
Zach Prezkuta
20c4ecbcd9 cleanup obsolete comments 2012-07-05 14:26:42 -06:00
Zach Prezkuta
168ae40dd2 add rudimentary locking capability to Friendica functions 2012-07-05 14:26:42 -06:00
Zach Prezkuta
041aeaf4a1 fix small bug in lists and revert Diaspora list processing to non-Markdownify version 2012-07-05 12:54:52 -06:00
friendica
360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on 2012-07-04 23:24:59 -07:00
friendica
e29dd081ca render the recycle symbol correctly on Diaspora reshares 2012-07-04 22:44:04 -07:00
friendica
f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica
0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora 2012-07-04 19:12:09 -07:00
friendica
5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica
c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
friendica
ced0a208d8 fix double lines 2012-07-02 16:34:01 -07:00
friendica
315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
friendica
dd71f9446b config to disable email validation 2012-07-01 18:56:00 -07:00
friendica
6cc844b2f9 restore 'shareable' to feeds after recent feed privacy re-factoring 2012-06-30 05:16:30 -07:00
Michael Vogel
bcca817b9a Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr. 2012-06-30 09:25:22 +02:00
Michael Vogel
65268d25e6 Merge remote branch 'upstream/master' 
Conflicts:
	include/items.php
 2012-06-29 21:43:49 +02:00
Michael Vogel
52569e536e Tests considering removing of the title 2012-06-29 21:40:54 +02:00
Fabrixxm
0fb08e3642 nav: pass $baseurl to template 2012-06-29 05:29:29 -04:00
friendica
43036bee98 wrong column name (- vs _) 2012-06-28 21:32:49 -07:00
friendica
1830ecc9ba remote_self feeds are not private 2012-06-28 18:52:49 -07:00
friendica
a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica
43d3721fa9 css smiley class 2012-06-28 16:42:40 -07:00
friendica
d7f35c81db Merge https://github.com/friendica/friendica into pull 2012-06-28 16:05:28 -07:00
friendica
de93c61e0d remove titles in ostatus even when edited date differs from created date 2012-06-28 16:04:00 -07:00
Zach Prezkuta
cd9ce0ecb3 fix logic for nested lists--should be OR, not AND 2012-06-27 21:21:26 -06:00
Sebastian Egbers
587b081a38 moved api direct message formating to own function. 
added same formating to direct reply message, when posting a new message.
 2012-06-26 08:54:01 +02:00
Sebastian Egbers
0f0fb2e2f3 Merge branch 'master' of https://github.com/friendica/friendica 2012-06-26 08:33:41 +02:00
friendica
a4b407eb54 stray s 2012-06-25 22:01:32 -07:00
friendica
d32d0e2154 typos 2012-06-25 21:39:07 -07:00
friendica
78ede4744f add event titles to discovered birthday events 2012-06-25 21:37:38 -07:00
friendica
0f0ffce1b6 change required doco 2012-06-25 21:27:34 -07:00
friendica
359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica
fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
friendica
53f0aee82d Merge https://github.com/friendica/friendica into pull 2012-06-25 18:16:55 -07:00
friendica
f1991a5952 propagate remote deletes 2012-06-25 18:15:56 -07:00
Zach Prezkuta
5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta
c0c50ece0f revert extra Diaspora disabling changes to try to eliminate Mustard double-posting 2012-06-25 19:03:03 -06:00
Zach Prezkuta
8bb7ab88fb Clean up the Diaspora connectivity: 
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
 2012-06-25 19:03:03 -06:00
friendica
f0b41709eb improve remote delete forwarding 2012-06-25 17:45:33 -07:00
friendica
fad2679c7e Merge https://github.com/friendica/friendica into pull 
Conflicts:
	include/bbcode.php
 2012-06-25 16:05:42 -07:00
friendica
b044cd922d typos in bbcode, add service class restrictions to jot uploads 2012-06-25 16:03:46 -07:00
Simon L'nu
939ebe16f8 fix typo and syntax error 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-25 18:49:36 -04:00
friendica
cb450d3365 Merge pull request #360 from fermionic/more-nested-lists 
allow nested [ol] and [ul] lists too
 2012-06-25 14:20:16 -07:00
Zach Prezkuta
fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -06:00
Zach Prezkuta
4293de7554 allow nested [ol] and [ul] lists too 2012-06-25 08:26:00 -06:00
Sebastian Egbers
8c251aebc7 fixed direct message reply in api call. 2012-06-25 16:25:34 +02:00
Sebastian Egbers
af1d4bb632 modified api message reply to set title to conversion title, when replying. 2012-06-25 15:53:56 +02:00
Sebastian Egbers
020deedd7c Merge branch 'master' of https://github.com/friendica/friendica 2012-06-25 13:59:39 +02:00
friendica
7ea5917bf7 more service class functionality 2012-06-25 03:25:06 -07:00
friendica
35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica
c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
friendica
7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
fermionic
49ecf58163 Merge pull request #357 from fermionic/fix-relayable-signature-handle 
ok now I'm just making silly mistakes--take out premature function locki...
 2012-06-23 21:29:52 -07:00
Zach Prezkuta
59ebe6f111 ok now I'm just making silly mistakes--take out premature function locking code 2012-06-23 22:28:28 -06:00
friendica
92a997365f Merge https://github.com/friendica/friendica into pull 2012-06-23 21:11:41 -07:00
friendica
1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
fermionic
642880f89a Merge pull request #356 from fermionic/fix-relayable-signature-handle 
use author handle instead of sender handle
 2012-06-23 21:08:43 -07:00
Zach Prezkuta
0877c5b687 use author handle instead of sender handle 2012-06-23 22:04:20 -06:00
Zach Prezkuta
5d2eed3517 allow bare URLS to make it through to Diaspora 2012-06-23 22:02:08 -06:00
Zach Prezkuta
1f96839674 small optimization 2012-06-23 20:01:29 -06:00
Zach Prezkuta
4ef33ac6eb fix BB-to-Diaspora list formatting 2012-06-23 19:57:59 -06:00
Max Weller
cbf1cab0da Merge remote-tracking branch 'sebastian/master' 2012-06-23 22:59:03 +02:00
Max Weller
e3c36dfd1d add reliable way to get server version 2012-06-23 22:52:50 +02:00
Max Weller
11b6beae06 make it selectable 2012-06-23 22:39:11 +02:00
Max Weller
111ace5abd I want HTML code! 2012-06-23 22:35:43 +02:00
Max Weller
9d462c6b6a new param getUserObjects to avoid retransmitting the whole user info objects 2012-06-23 19:38:15 +02:00