Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 21:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
27614 commits 3 branches 64 tags 246 MiB
Commit graph

7002 commits

Author SHA1 Message Date
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
Max Weller
2c992c5969 bugfix 2012-06-23 19:35:01 +02:00
Max Weller
f45c881815 changes on api_direct_messages_box to allow to retrieve conversations and all messages 2012-06-23 19:29:58 +02:00
Max Weller
d8a376666c modified direct_messages 2012-06-23 19:21:48 +02:00
Zach Prezkuta
90f8454190 allow linking to Diaspora's scaled-down images 2012-06-23 11:02:15 -06:00
friendica
7a346bc756 this is going to take some more debug before it can be roller out 2012-06-23 07:43:56 -07:00
friendica
63141c73d8 debugging 2012-06-23 07:26:45 -07:00
friendica
a132eda2cf cokmment likes not propagating 2012-06-23 06:41:37 -07:00
friendica
1ba0d73a9a make feeds work with comment likes/dislikes 2012-06-23 06:13:11 -07:00
friendica
f55e8e831c typo 2012-06-23 06:04:56 -07:00
friendica
49360b0a64 Merge https://github.com/friendica/friendica into pull 2012-06-23 05:47:31 -07:00
friendica
22ca358a8c like comments 2012-06-23 05:46:15 -07:00
friendica
7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Michael Vogel
a81af2e042 Merge remote branch 'upstream/master' 
Conflicts:
	include/bb2diaspora.php
 2012-06-23 12:50:00 +02:00
Michael Vogel
7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
Zach Prezkuta
9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta
7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06:00
Vasudev Kamath
6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Sebastian Egbers
cd25c3b5dd added replyto and subject to direct messages. 2012-06-22 14:54:31 +02:00
Sebastian Egbers
c14270ac64 modified conversion to use x function for parameter checking. 2012-06-22 13:35:36 +02:00
Max Weller
6fe8a13b64 Added ORDER BY clause for conversation view 2012-06-21 12:55:03 +02:00
Max Weller
0f5a6bfcdb Added statuses/show parameter ?conversation=true 2012-06-21 10:53:48 +02:00
friendica
53c9ea7606 show last.fm source in username 2012-06-20 23:04:55 -07:00
friendica
91a3a2d551 follow last.fm scrobbles 2012-06-20 22:59:01 -07:00
Zach Prezkuta
73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
friendica
bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica
0d0f129d04 Merge https://github.com/friendica/friendica into pull 2012-06-20 05:06:20 -07:00
friendica
f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
friendica
961c633773 Merge pull request #344 from ridcully/master 
exclude_replies for twitter api
 2012-06-20 01:01:55 -07:00
friendica
b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica
1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -07:00
Zvi ben Yaakov (a.k.a rdc)
ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
6df74b8cd9 Now using App::get_cached_avatar_image for navigation bar 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
ac50c9e84d Beginning to use App::get_cached_avatar_image for loading profile images in conversations 2012-06-19 16:05:38 -07:00
Sebastian Egbers
eab3938471 added exclude_replies option to api call statuses/user_timeline. 2012-06-19 16:27:23 +02:00
Sebastian Egbers
43532b7414 added exclude_replies option to api call statuses/home_timeline. 2012-06-19 16:15:19 +02:00
friendica
dbceef04e8 exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there 2012-06-18 20:21:54 -07:00
Zach Prezkuta
7cd516e34f fix some whitespace issues 2012-06-18 21:06:54 -06:00
Zach Prezkuta
42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
friendica
341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
Thomas Willingham
371bdfb19d Typo breaking tag notifications 2012-06-18 22:00:18 +01:00
Michael
6eaca19f41 Merge branch 'master' of github.com:annando/friendica 
Conflicts:
	include/oembed.php
 2012-06-18 08:51:12 +02:00
Michael
d53414a333 OEmbed: Don't output the width of images 2012-06-18 08:49:35 +02:00
Michael Vogel
cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
Zvi ben Yaakov (a.k.a rdc)
8af9fe8df7 Added missing backticks to navigation bar query 2012-06-17 23:39:28 +03:00
Zvi ben Yaakov (a.k.a rdc)
b0021a4637 Enabled Profile photo revisions to be displayed in navigation bar 2012-06-17 23:22:37 +03:00
Michael Vogel
3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
friendica
7c2d27e275 rev update 2012-06-16 17:29:42 -07:00
Hauke Zuehl
cc7d849ce3 Merge remote branch 'upstream/master' 2012-06-16 19:49:04 +02:00
fermionic
950dacbbdd Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does 
Diaspora dont check more signatures than diaspora does
 2012-06-16 09:49:19 -07:00
Zach Prezkuta
3132ed2979 more cleanup 2012-06-16 10:45:26 -06:00
Zach Prezkuta
577cfdd314 some cleanup of obsolete code 2012-06-16 10:41:25 -06:00
Zach Prezkuta
0ff86e28bb fix small typo for logging command in api.php 2012-06-16 10:25:46 -06:00
Zach Prezkuta
0946c4a375 still need the original author information for comments and likes 2012-06-16 10:25:33 -06:00
Zach Prezkuta
09eb52810b update signature checking for relayables 2012-06-16 10:25:32 -06:00
Hauke Zuehl
f9a40ccbde Merge remote branch 'upstream/master' 2012-06-16 18:04:59 +02:00
Hauke Zuehl
1231dd72f0 Check if $rr exists 2012-06-16 15:07:23 +02:00
friendica
4faf0e609f rev update 2012-06-16 03:35:45 -07:00
friendica
ff45e11284 redundant log entry 2012-06-14 17:55:30 -07:00
friendica
2efee75557 also mark for death if there isn't any xml to be found 2012-06-14 17:38:39 -07:00
friendica
267681844d poll even if contact hasn't responded recently, so we can update the termination status 2012-06-14 17:27:07 -07:00
friendica
be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
friendica
79e2ae3791 syntax on sql 2012-06-13 22:34:48 -07:00
friendica
edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00
friendica
b0a0c1ef4d couple of little fixes to enotify positional params 2012-06-13 20:03:18 -07:00
friendica
7d8b087f4a fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them. 2012-06-13 19:59:20 -07:00
friendica
24bf4632af Merge https://github.com/friendica/friendica into pull 2012-06-13 16:25:57 -07:00
friendica
85876be48a Merge https://github.com/fabrixxm/friendica into pull 
Conflicts:
	util/messages.po
 2012-06-13 16:25:09 -07:00
friendica
36491462ba Merge pull request #333 from Erkan-Yilmaz/master 
missing bracket
 2012-06-13 16:21:15 -07:00
friendica
d908c9dd71 disable archive widget for PHP < 5.3 2012-06-13 16:17:45 -07:00
Erkan Yilmaz
e8e1de3603 add missing bracket 2012-06-13 20:41:53 +02:00
fabrixxm
feab17bfea enotify: fix stupid typo 2012-06-13 12:08:34 -04:00
fabrixxm
46cb8174fa enotify: rework strings to more easy to translate 2012-06-13 11:55:21 -04:00
friendica
a424fecdae this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March 2012-06-12 22:52:34 -07:00
friendica
bbdb8751e5 that was it 2012-06-12 21:39:39 -07:00
friendica
82ad881c85 think this will fix it 2012-06-12 21:38:10 -07:00
friendica
d955813f22 tracking another edge case 2012-06-12 21:34:28 -07:00
friendica
08af43f396 edge case 2012-06-12 21:30:17 -07:00
friendica
920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
friendica
832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica
08b3126dae Merge https://github.com/friendica/friendica into pull 2012-06-12 02:48:00 -07:00
friendica
1dd52c20cf move parens to proper place 2012-06-12 02:47:05 -07:00
Michael Vogel
a1c407e017 Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php" 2012-06-12 12:39:28 +03:00
friendica
b6ff71acaa survive bad/un-parseable input to datetime_convert 2012-06-12 02:06:29 -07:00
friendica
645c2f9092 Merge pull request #331 from mexon/upstream 
Add a hook for post-processing remote items
 2012-06-12 00:52:36 -07:00
Matthew Exon
33a4e45f6b Add a hook for post-processing remote items after they've been stored in the database and have an ID 2012-06-12 07:58:12 +02:00
friendica
b7e2f802d8 revert an optimisation that was wrong 2012-06-11 21:50:10 -07:00
friendica
24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica
75104416e0 reduce reverted edits due to edit arriving before original 2012-06-11 18:14:49 -07:00
friendica
09f74be14c variable confusion in poller, don't allow negative page offsets 2012-06-11 17:24:16 -07:00
friendica
3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
Vasudev Kamath
11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
friendica
afa8815411 bug #447 - make followed feeds private 2012-06-11 05:28:08 -07:00
friendica
da7773a259 ostatus hub subscription issues 2012-06-07 19:53:39 -07:00
friendica
ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00
Fabio Comuni
2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
Fabio Comuni
7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
fabrixxm
1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
friendica
6477c24919 more logging on subscribe_to_hub 2012-06-06 23:10:32 -07:00
friendica
5389efffa9 add email probe logging, limit typo check to main addon files and skip additional support files 2012-06-05 19:28:04 -07:00
Vasudev Kamath
12474e3c2e Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 12:04:17 +05:30
Michael Vogel
0353410cd4 Merge remote branch 'upstream/master' 2012-06-04 08:09:15 +02:00
Michael Vogel
5de91c2a7c API: Only repeat items if there is a content 2012-06-04 08:08:45 +02:00
Zach Prezkuta
9920fb39e5 Debugged implementation of Diaspora relayable_retractions 
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

	Friendica top-level post:
	Diaspora comment deleted, disappears in Friendica
	Friendica comment deleted, disappears in Diaspora
	Diaspora like retracted, disappears in Friendica
	Friendica like retracted, disappears in Diaspora

	Diaspora top-level post:
	Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
 2012-06-03 14:53:30 -06:00
Zach Prezkuta
06263f72a8 cleanup and logging 2012-06-03 14:53:30 -06:00
Zach Prezkuta
cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta
77962aa79d Fix bugs in the retraction code 
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
 2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions 
Also: some whitespace cleanup, fix Diaspora parent DB query
 2012-06-03 14:53:29 -06:00
Zach Prezkuta
1fe1ac022f Support relayable_retractions that are relayed to us by the top-level post owner 2012-06-03 14:53:29 -06:00
friendica
daa4f5213f zrl's when visiting public photos at the source site 2012-06-03 01:53:11 -07:00
friendica
97576e3e33 doco 2012-06-02 23:22:02 -07:00
friendica
82cf664920 turn "follow" into a function 2012-06-02 23:12:20 -07:00
friendica
d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica
3d39e6e594 bug #439 - remove web port number from notification email "from" address 2012-06-02 18:23:54 -07:00
friendica
4978ee12d1 webfinger profile linker 2012-06-02 18:05:23 -07:00
friendica
608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica
29bdf432f0 fewer "bob smith to bob smith via wall-to-wall". 2012-06-02 00:40:38 -07:00
friendica
c0b74b18fe Merge pull request #321 from beardy-unixer/master 
BB code [quote=somebody] fix.
 2012-06-01 21:48:23 -07:00
friendica
0165d5dd2c registration issue after re-factor 2012-06-01 15:42:13 -07:00
Thomas Willingham
7a5c85f628 [quote=somebody] was appearing as an extended spoiler tag. 2012-06-01 23:31:07 +01:00
friendica
93bc29a711 turn registration code into a standalone function for re-use 2012-05-31 19:06:17 -07:00
Zach Prezkuta
d5116689af query using both id and parent 2012-05-31 19:45:58 -06:00
friendica
f0cf0ebb48 prevent email from leaking in feeds 2012-05-30 19:11:01 -07:00
friendica
15c023a218 y didn't i think of this b4? 2012-05-30 17:22:51 -07:00
friendica
e5a988f0b5 fix private photos that also have a size specification 2012-05-30 01:52:58 -07:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica
c58b0b9cbb prvgroup should see intros 2012-05-29 18:24:44 -07:00
friendica
514c994e6a possible sql injection in search 2012-05-29 17:14:35 -07:00
friendica
21d79e787e Merge https://github.com/friendica/friendica into pull 
Conflicts:
	mod/search.php
 2012-05-29 16:50:42 -07:00
friendica
419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
Simon
43c185ce04 Merge pull request #316 from annando/master 
Speed improvements
 2012-05-29 13:13:10 -07:00
Tobias Hößl
dfef0ec84d Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning 2012-05-29 19:03:30 +00:00
Michael Vogel
8202355df9 Disabled logging of SQL statements 2012-05-29 16:16:37 +02:00
Michael Vogel
68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica
2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica
0241bd1fbf Provide backend option to only expire other peoples' conversations. 2012-05-28 23:24:10 -07:00
friendica
f033c9a4ae rev update 2012-05-28 16:51:52 -07:00
friendica
ff0291c876 add plugin hooks to gender, sexpref, and marital selectors 2012-05-27 22:35:01 -07:00
friendica
b752acd089 birthday in november,december bug 2012-05-27 21:36:20 -07:00
friendica
2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
friendica
08941d4285 handle multiple underscores in D* links 2012-05-26 23:46:42 -07:00
friendica
73c61b6f96 allow force ssl on notifications 2012-05-26 16:11:51 -07:00
Michael Vogel
7f19d39b14 Doing negative caching for config values, special logfile for database optmisations 2012-05-26 15:41:23 +02:00
Michael Vogel
a612b10b2a Deactivating the test output in db engine 2012-05-26 03:23:18 +02:00
Michael Vogel
4951210508 Speed optimisation by enabling the posibility of the MySQL fulltext engine 2012-05-26 03:21:07 +02:00
Michael Vogel
a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
Simon L'nu
789063da39 add a placeholder attribute on search-text; dispy fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-23 15:58:22 -04:00
friendica
61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica
3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica
b43b680802 clear submanage, etc from session on logout 2012-05-22 18:05:58 -07:00
friendica
3ce06caeed cause of bogus wall-to-wall posts found 2012-05-22 03:55:11 -07:00
Tobias Diekershoff
30f3a16874 Merge branch 'master' of https://github.com/friendica/friendica 2012-05-22 11:57:19 +02:00
Tobias Diekershoff
5dad99888d fix setting array values to config items 2012-05-22 11:56:49 +02:00
friendica
a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica
54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
friendica
afaf9ec74f rev update 2012-05-20 18:30:02 -07:00
Michael Vogel
8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
Michael Vogel
9a940786c1 Merge remote branch 'upstream/master' 2012-05-19 14:04:24 +02:00
friendica
513ef2410d backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ 2012-05-19 02:42:11 -07:00
friendica
34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica
7cfa7a7671 tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work 2012-05-17 19:59:46 -07:00
friendica
d5d853f37f setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
friendica
4f0e26759c bring in the *much better* xml parser from the original zot branch 2012-05-16 21:29:57 -07:00
Michael Vogel
f2c0c40f6e Merge remote branch 'upstream/master' 2012-05-16 08:24:46 +02:00
Matthew Exon
e574514e21 Allow plugins to modify the contact photo menu 2012-05-15 08:59:45 +08:00
friendica
3811fe288f rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07:00
Vasudev Kamath
10db2f00f9 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 12:10:09 +05:30
friendica
4e0b0d4e43 fix search/new against possible email leakage 2012-05-11 05:19:29 -07:00
friendica
20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica
496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
Michael Vogel
f2e648d62f Merge remote branch 'upstream/master' 2012-05-09 14:56:48 +02:00
friendica
53157bb954 send browser back to correct page (with query args) after posting 2012-05-09 04:18:01 -07:00
friendica
70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00
friendica
a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
friendica
10812e0c19 make it optional to optimize the item table after expire 2012-05-08 15:33:01 -07:00
friendica
f0b7a8ae35 finished dry run - now for real test 2012-05-07 18:36:28 -07:00
friendica
8a4e3cc370 don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration 2012-05-07 16:51:09 -07:00
friendica
189a31e628 If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue 
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.
 2012-05-07 15:54:49 -07:00
friendica
e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
friendica
8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
Vasudev Kamath
b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
friendica
8ae83201cf consolidate item deletion so we can fix orphaned categories and file_as tags. 2012-05-05 07:05:32 -07:00
friendica
d0dd22af57 workaround to clean up orphaned filetags 2012-05-04 17:43:47 -07:00
friendica
7c6e8b30b2 only show remove category to item owner 2012-05-04 16:45:10 -07:00
friendica
10754ced3e category removal 2012-05-04 06:42:56 -07:00
friendica
9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00
friendica
421acee65b implement max load average before queuing/deferring delivery and poller processes 2012-05-03 21:50:48 -07:00
friendica
15542a8690 yet another bug in remote_friends_in_common 2012-05-03 20:47:04 -07:00
friendica
f3e18df55d string update 2012-05-03 16:55:03 -07:00
Fabio Comuni
52915c6e68 validate_url() and validate_email() validate also IP address. 2012-05-03 15:28:23 +02:00
friendica
3ecde2d72f use mysql replace on cache items 2012-05-02 16:27:19 -07:00
friendica
8e1437ca8b fixing common friends 2012-05-02 16:15:59 -07:00
friendica
21e18db757 missing param 2012-05-02 02:18:54 -07:00
friendica
35dc4202a2 how did that happen? 2012-05-02 00:58:28 -07:00
friendica
a42a475e10 shuffle results of remote_common_friends widget 2012-05-02 00:44:37 -07:00
friendica
1b1f56f556 only validate once 2012-05-01 23:16:58 -07:00
friendica
dd27328390 perform basic validation 2012-05-01 23:15:39 -07:00
friendica
becdb1f508 final touches - show friends in common with total strangers from different sites 2012-05-01 21:22:27 -07:00
friendica
e247ed3de2 cross fingers 2012-05-01 20:36:35 -07:00
friendica
594803afca reduce the scope a bit 2012-05-01 20:33:19 -07:00
friendica
72dbc2faee fn not found 2012-05-01 20:11:35 -07:00
friendica
15c1850156 another one 2012-05-01 19:20:41 -07:00
friendica
1fc796b276 typo 2012-05-01 19:19:24 -07:00
friendica
8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
friendica
f24ffa8ef0 improve handling of relative feed url's 2012-05-01 17:10:26 -07:00
friendica
38ccd2e655 convert html entities to utf-8 before email header encoding 2012-05-01 15:49:22 -07:00
friendica
0ca4fa78c8 link socgraph to zrls 2012-05-01 01:34:47 -07:00
friendica
584ac68ae4 adding zrl support to social graphs 2012-05-01 01:16:47 -07:00
friendica
d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
Zach Prezkuta
a844093365 change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it 2012-04-30 20:51:22 -06:00
friendica
da555286d6 missed a db field 2012-04-29 22:36:26 -07:00
friendica
928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica
ae2aa74444 not all profile selector choices have unique or direct translations 2012-04-29 20:05:29 -07:00
friendica
1ebde08415 log db error strings in all cases 2012-04-29 19:41:17 -07:00
friendica
e3fecb2557 improved db error logging 2012-04-29 17:34:54 -07:00
friendica
64060f82dc toggle to archive unfriends, though render them useless 2012-04-28 21:56:17 -07:00
friendica
4ff2e9a103 a few more continues that should be returns 2012-04-28 16:54:33 -07:00
friendica
44700b914d poller refactor: continue not valid in this context 2012-04-28 04:20:38 -07:00
friendica
f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica
26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
Vasudev Kamath
214ec91a3f Merge branch 'master' of git://github.com/friendica/friendica 2012-04-27 22:43:26 +05:30
friendica
3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
friendica
2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica
3637534119 move unfriend to standalone function for use in account removal 2012-04-23 19:42:57 -07:00
friendica
e9e4fb664a allow bbcode representation of html symbols such as &copy; by wrapping in bb brackets 2012-04-23 05:42:46 -07:00
friendica
2170df897b bug #388 - notify_comment received after post deleted 2012-04-22 19:19:02 -07:00
Michael Johnston
76aa9b3037 api: add support for StatusNet-style media param to API 2012-04-22 13:37:25 -04:00
Michael Vogel
a3f08c44be API: RSS-Feeds are now shortened to 1000 characters. (With added link) 2012-04-22 18:00:24 +02:00
Vasudev Kamath
8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
Tobias Hößl
e3af818263 Typo 2012-04-17 19:31:06 +00:00
Tobias Hößl
720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica
fd2f7dd6ae turn on comment edit 2012-04-16 03:51:48 -07:00
friendica
0b838e4cc7 propagate edited comments 2012-04-16 02:09:00 -07:00
friendica
c8598e7da6 edited comments weren't being relayed 2012-04-16 01:35:27 -07:00
friendica
93df525f5c Merge pull request #238 from annando/master 
API: Support of the statusnet application
 2012-04-15 16:00:07 -07:00
friendica
f994f9abc6 open contact edit in same window 2012-04-15 06:34:01 -07:00
friendica
31b1d353b2 Merge pull request #234 from copyninja/master 
Executable permisson removal on files which are not elf/script
 2012-04-14 14:50:54 -07:00
Simon L'nu
6278b2a923 string fix: typo. slow down scroll to top in dispys 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-14 16:24:35 -04:00
Vasudev Kamath
41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Michael Vogel
e825a73f1d DBA: Reverting back to original source 2012-04-14 13:35:11 +02:00
friendica
9dd0ef2aeb bug #372 - category feeds 2012-04-14 04:19:41 -07:00
Michael Vogel
eb27c32065 DBA: Nothing really done .. 2012-04-14 13:17:58 +02:00
Michael Vogel
4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
friendica
7c63ca8364 one more 2012-04-13 17:39:12 -07:00
friendica
0d0aa7495b additional marital status selectors 2012-04-13 17:34:02 -07:00
Fabio Comuni
f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni
4496d075e5 move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +02:00
Fabio Comuni
67a2d5be77 validate_url allow naked subdomain if is "localhost" 2012-04-13 09:42:53 +02:00
friendica
df1904b204 stray debug statements, forgot to filter pending contacts 2012-04-12 23:14:41 -07:00
friendica
3c4e6d3461 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
Michael Vogel
572678fef9 Merge commit 'upstream/master' 
Conflicts:

	include/dba.php
 2012-04-13 00:10:41 +02:00
Michael Vogel
138caa4380 DBA: Deactivation of the mysqli-class for testing purposes. 2012-04-13 00:05:52 +02:00
friendica
73487989c0 query to find un-grouped contacts 2012-04-12 07:48:28 -07:00
friendica
60871555f5 reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem 2012-04-12 06:50:11 -07:00
friendica
5a78400f37 table cleanup 2012-04-12 05:15:45 -07:00
Michael Vogel
ee714daf4d Merge commit 'upstream/master' 2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4 API: Improved the timeline. Several (disabled) tests with caching of photos. 2012-04-11 19:31:01 +02:00
friendica
b02a671494 visit "random profile" feature 2012-04-10 20:50:31 -07:00
friendica
640f258f18 cleanup photo menus 2012-04-10 19:33:32 -07:00
friendica
19b636e7e8 more backend work on mail2 followers 2012-04-10 19:15:52 -07:00
friendica
9b1bb53234 fix_mce_lf on profiles 2012-04-10 16:31:49 -07:00
friendica
14d68a0dc0 set default on get_avatar 2012-04-10 15:33:43 -07:00
friendica
3c66816938 Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull 2012-04-10 15:28:48 -07:00
Klaus Weidenbach
1f9fe8b5ee Remove Gravatar from core and add new hook avatar_lookup. 
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
 2012-04-09 21:22:09 +02:00
Klaus Weidenbach
93ffba58cc Rename gravatar_img() more generic to avatar_img(). 
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
 2012-04-09 21:22:09 +02:00
Alexander Kampmann
1370ba5d16 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718 fixed some typos 2012-04-09 14:27:52 +02:00
Alexander Kampmann
7ac4b83c39 made exceptions from the db optional 
set address for updae mails correctly
 2012-04-09 14:04:49 +02:00
Michael Vogel
fe257a2032 html2plain: changed behaviour for the "hr" element. 2012-04-09 12:54:02 +02:00
friendica
c1e2596807 more sane defaults datetime_convert 2012-04-08 18:09:21 -07:00
friendica
129130b0f7 fix empty string timezone 2012-04-08 18:01:49 -07:00
Alexander Kampmann
0d60dbef31 added exceptions to dba class 
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines. 
added admin email on failed updates

added german translation for admin email
 2012-04-09 00:45:10 +02:00
Michael Vogel
269f21ddc1 API: Added Public Timeline 2012-04-08 20:19:14 +02:00
Michael Vogel
763729f11a API: Now mentions could work as well - only my client doesn't really work 2012-04-08 17:51:05 +02:00
Michael Vogel
944f897d30 API: Basic support of the identica client added. 2012-04-08 17:23:38 +02:00
Michael Vogel
cb4c7cdb3e API: API is now enhanced. mentions, repeat and destroy now works. 2012-04-08 00:02:25 +02:00
Michael Vogel
cb05801a90 Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
friendica
1440786c31 ignore utf8 offset error for unit tests 2012-04-07 02:31:41 -07:00
friendica
3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
friendica
ecabe1d505 ignore removed plugins 2012-04-06 05:21:42 -07:00
friendica
13dfb40128 fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -07:00
friendica
665b2c8107 revert config changes, we're getting duplicate keys 2012-04-06 03:10:46 -07:00
friendica
4bee1859be Merge branch 'pull' 2012-04-05 21:43:38 -07:00
friendica
221726392e pass autoname(0) test 2012-04-05 18:44:36 -07:00
Michael Vogel
34d268544e Merge commit 'upstream/master' 2012-04-06 00:00:46 +02:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
Alexander Kampmann
cbf4544887 added index to config and pconfig table 
changed config.php to use REPLACE instead of INSERT, 
this removes one db hit.
 2012-04-05 13:27:09 +02:00
friendica
37801dd6ed also block outbound 2012-04-04 20:48:35 -07:00
friendica
0c7710681c log disabled requests 2012-04-04 18:49:39 -07:00
friendica
71671e5b9a fix config storage of booleans 2012-04-04 17:51:59 -07:00
friendica
62c60fd53d bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 2012-04-04 14:13:34 -07:00
friendica
5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica
f4721955db more ssl policy fixes and prevent delivery to soapbox when using local delivery 2012-04-02 21:01:19 -07:00
Michael Vogel
3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
friendica
62e528ba43 remove zrl from query string 2012-04-02 00:45:45 -07:00
friendica
1f74bd1b78 catch a couple more Oo smilies 2012-04-01 22:57:50 -07:00
friendica
5d35f0d54a add title to D* posts 2012-04-01 19:16:13 -07:00
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica
00bbb9ad36 slight improvement in handling of plaintext feeds 2012-04-01 15:43:57 -07:00
Michael Vogel
5409825fe7 New script that checks if a script is running 2012-04-01 20:56:27 +02:00
Michael Vogel
4cf1e5aa21 poller: An optional lockfile is used to check if the poller is already running 2012-04-01 20:52:33 +02:00
friendica
9b4bef8ac4 that didn't quite work out 2012-04-01 06:46:12 -07:00
Michael Vogel
7d23149a61 Merge commit 'upstream/master' 2012-04-01 14:11:37 +02:00
friendica
f0b8d01615 try slightly better detection of html in feeds 2012-04-01 03:19:37 -07:00
friendica
ae5e5bf1e4 Merge branch 'pull' 2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
Simon
e97d90820d line 86: s/Friendika/Friendica/ 2012-04-01 04:52:45 -03:00
friendica
e6fd6bfd89 more error handling 2012-03-31 17:44:34 -07:00
friendica
53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica
0cf2e051bb escape % in file_tag_query as it is ultimately embedded in a sprintf 2012-03-31 14:48:35 -07:00
Michael Vogel
59b45f7fc1 Several improvements 2012-03-31 16:28:39 +02:00
friendica
8c928e67ba warning cleanup 2012-03-30 23:18:46 -07:00
Tobias Diekershoff
17c908973f catch OpenID login errors in cases when the OpenID server does not answers 2012-03-30 15:19:17 +02:00
friendica
bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica
87539dbec4 bug #352 - qcomment plugin disabled, qcomments still allowed 2012-03-30 02:22:57 -07:00
friendica
e2c295c01f another silly mistake 2012-03-29 21:44:30 -07:00
friendica
9332312ce9 silly mistake 2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4 zrl on mentions 2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica
5921dc6f16 typo in function name 2012-03-29 16:01:44 -07:00
friendica
4e4f7ac79f some reported warnings cleaned up 2012-03-28 20:50:09 -07:00
friendica
a946b7cea3 Merge branch 'pull' 2012-03-28 19:57:28 -07:00
friendica
7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
Michael Vogel
bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
Fabio Comuni
7aec2fd68d filer: info() on item filed 2012-03-28 10:45:16 +02:00
friendica
0aa99acd35 profile_tabs hook 2012-03-27 20:15:15 -07:00
friendica
20f9733250 don't expire filed items 2012-03-27 00:54:34 -07:00
friendica
4c585f759f theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
friendica
b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
friendica
b240b8489a language issues in enotify 2012-03-26 01:43:26 -07:00
friendica
021c647673 don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. 2012-03-25 21:43:17 -07:00
friendica
7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
friendica
873a55e918 enotify plugin hook 2012-03-25 05:06:11 -07:00
friendica
5bb7303408 NOTIFY_SYSTEM 2012-03-25 04:37:09 -07:00
friendica
6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
friendica
d06ddeb1cc bug #346 - add oembed maxwidth to oembed request 2012-03-24 21:26:50 -07:00
friendica
3ae43c2448 prevent duplicate friend suggestions 2012-03-24 15:53:53 -07:00
friendica
3aacc119a1 block filed items from deletion 2012-03-24 04:16:27 -07:00
friendica
528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica
ebdf0ee99e prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms 2012-03-22 01:46:52 -07:00
friendica
d81256d7b0 support lowercase :-p smilie 2012-03-21 21:45:45 -07:00
Michael Vogel
792edfe9c8 New parameter in html2plain for plain text exports. More compatibility in API 2012-03-21 10:08:40 +01:00
friendica
6c7b619b34 remove stray template variable from old code 2012-03-20 23:57:33 -07:00
friendica
810e69ef0a more friend suggestions 2012-03-20 19:06:26 -07:00
friendica
894278dbcc change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
friendica
5a5aadb743 add IP address to failed login log message 2012-03-19 21:58:21 -07:00
friendica
f7e380cdc6 Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 
Smiley removal
 2012-03-19 15:56:16 -07:00
Thomas
84f8e2eaa8 modified: include/text.php 
Stupid bug fixed
 2012-03-19 22:32:19 +00:00
friendica
a156ce196e Merge pull request #150 from fabrixxm/master 
Add "logging_out" hook
 2012-03-19 15:29:32 -07:00
friendica
9e133d6412 refactor openid logins/registrations 2012-03-19 15:03:09 -07:00
Thomas
e9b33a6f1f modified: include/text.php 
deleted:    images/diaspora.png
	deleted:    images/smiley-bangheaddesk.gif
	deleted:    images/smiley-beard.png
	deleted:    images/smiley-shaka.gif
	deleted:    images/smiley-whitebeard.png

Removed selected smiley per Mike's request.  Also removed deprecated smileys that were just commented out.
 2012-03-19 21:59:06 +00:00
friendica
139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
Fabio Comuni
ea4be0db89 Merge remote-tracking branch 'friendica/master' 2012-03-19 12:24:40 +01:00
friendica
2349852b4a support "no_smilies" 2012-03-19 03:18:39 -07:00
Simon
283bc51acf Merge pull request #149 from CatoTH/master 
Add a missing security token [Using photos as profile photos]
 2012-03-19 00:40:51 -07:00
Tobias Hößl
0341078a73 Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier 2012-03-19 07:37:09 +00:00
friendica
cca524495c community discovery cont., cleanup of DB debugging 2012-03-18 22:12:36 -07:00
Michael Vogel
3393d80ac1 API: added max_id 2012-03-18 19:00:24 +01:00
Michael Vogel
77e77027b4 API: Now threading seems to work 2012-03-18 18:21:51 +01:00
Michael Vogel
6f10142b2e API: Seesmic is now working. Optimizing text export. 2012-03-18 17:52:51 +01:00
Tobias Hößl
453b5b46a3 CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) 2012-03-18 15:44:33 +00:00
Tobias Hößl
72894b0e91 replace split() by explode(); split is deprecated 2012-03-18 10:36:49 +00:00
friendica
67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
Michael Vogel
f5db142d93 Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
friendica
94fac6d767 queue optimisation - back off delivery attempts to once per hour after the first 12 hours. 2012-03-17 03:43:02 -07:00
Michael Vogel
8a1f175df0 New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
friendica
e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
friendica
949c6d47b5 add "send pm" link to photo dropdown for Diaspora contacts 2012-03-16 15:19:38 -07:00
friendica
141ae076ad Merge branch 'pull' 2012-03-16 15:08:32 -07:00
friendica
58940175e1 wrong link in d* comment notifications 2012-03-16 15:07:45 -07:00
Simon
1246a40ec2 Merge pull request #141 from CatoTH/master 
Private messages - tabindex
 2012-03-16 10:54:20 -07:00
Tobias Hößl
75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
friendica
224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica
805087af67 whitespace 2012-03-16 05:41:29 -07:00
friendica
be1bd9ff4e notification for disapora comments 2012-03-16 05:19:29 -07:00
friendica
41d595d5bc Merge branch 'pull' 2012-03-15 16:39:21 -07:00
friendica
7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
Michael Vogel
b5120888cf html2bbcode: Disabled size conversion 2012-03-15 21:17:51 +01:00
Michael Vogel
9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01:00
friendica
110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica
f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica
4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica
be48fff157 file as widget and basic filing implementation for duepuntozero,slackr 
much more work needed - this is just for test/evaluation currently
 2012-03-13 18:13:03 -07:00
friendica
acc4bbeb6e Merge pull request #129 from CatoTH/master 
CSRF-Protection and minor changes
 2012-03-13 14:36:52 -07:00
friendica
5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 2012-03-13 04:04:26 -07:00
Tobias Hößl
59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
Tobias Hößl
9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
Fabio Comuni
c30342e2f7 add 'loggin_out' hook 2012-03-12 15:58:59 +01:00
friendica
3bc990f718 more save to file backend 2012-03-11 21:32:11 -07:00
friendica
93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
Michael Vogel
6e7a190e91 Mail: Subject are now with working "Re:" 2012-03-12 00:22:12 +01:00
Michael Vogel
2ed6b3531e Removing test exports 2012-03-11 23:29:59 +01:00
Michael Vogel
d653e27e2d Merge commit 'upstream/master' 
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
 2012-03-11 20:22:28 +01:00
Michael Vogel
9ca5de8c28 Item cache now is one day. 2012-03-11 19:45:28 +01:00
Michael Vogel
9f76d96d46 Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works. 2012-03-11 19:11:25 +01:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica
5915325367 bug #328 2012-03-10 18:52:50 -08:00
Michael Vogel
670b571c8a Caching improved. 2012-03-10 18:19:00 +01:00
Michael Vogel
74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. 2012-03-10 15:50:35 +01:00
Michael Vogel
e098147c24 New config options if ostatus polling should use the priority in the contacts 2012-03-10 11:29:40 +01:00
Michael Vogel
15916a2cb7 Mail: Removing signatures, gpg, unnecessary line breaks 2012-03-10 09:52:20 +01:00
Michael Vogel
11c29e0cba Merge commit 'upstream/master' 2012-03-09 11:41:23 +01:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 2012-03-09 00:31:17 -08:00
friendica
2050f886cc keep tony from talking to himself 2012-03-08 21:14:41 -08:00
friendica
395a9530dc still getting parent relays on remote systems 2012-03-07 18:23:55 -08:00
friendica
dd3b3c2454 revup 2012-03-07 15:54:37 -08:00
friendica
7ad2dd6565 fix photos after permissions_sql change 2012-03-06 17:52:00 -08:00
friendica
1224e256b1 Merge branch 'pull' 2012-03-06 17:22:13 -08:00
friendica
88cd5800cf [privacy] rework latest fix 2012-03-06 17:21:14 -08:00
Simon L'nu
415ca107fd Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix html reshares when editplain in use

* master:
 2012-03-06 18:38:44 -05:00
Simon
1fae778421 Merge pull request #94 from beardy-unixer/master 
Documentation changes
 2012-03-06 15:24:15 -08:00
Simon
decc9e5798 Merge pull request #99 from tomtom84/master 
fixes in theme diabook
 2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
friendica
8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
Thomas
67456bad06 Fixed...merged with mainline THEN added beards. 2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb added beard smileys 2012-03-06 20:44:53 +00:00
friendica
eec4cff84b remove "smilie" expansion for Diaspora logo 2012-03-06 04:28:45 -08:00
friendica
23718bfc25 prevent duplicate likes 2012-03-06 02:17:55 -08:00
friendica
c37ffd2999 can_write_wall documentation 2012-03-05 15:04:43 -08:00
friendica
fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
friendica
4134fd3dce unused replacement variable displays %1 in all html2bbcode 'code' blocks 2012-03-04 16:26:16 -08:00
Fabio Comuni
685686b3e8 template proc: fix variables regexp 2012-03-03 00:00:38 +01:00
Fabio Comuni
aef737f376 template proc: allow isolation of var name between [ and ] 
$var.name -> $[var.name]
 2012-03-02 15:53:48 +01:00
Fabio Comuni
0bf087c895 template proc: remove unused function and commented out code 2012-03-02 12:36:22 +01:00
Fabio Comuni
60e5dda1b5 template proc: first optimization 2012-03-02 12:24:35 +01:00
Michael
52ea842e87 html2bbcode: don't convert sizes and fonts. 2012-03-02 10:33:39 +01:00
friendica
f1bf6dcdfb expand multiple heart smilies e.g. <3333 2012-03-02 01:24:20 -08:00
fabrixxm
3a609adfb7 Merge pull request #55 from fabrixxm/master 
Some minor and one majior mod in templates
 2012-03-02 00:00:03 -08:00
friendica
8207272fbc Merge branch 'pull' 2012-03-01 18:54:50 -08:00
friendica
58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
Alexander Kampmann
dd9432903d Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b Enabled automated doc building. Changes: 
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
 2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5 template proc: avoid a notice and allow template name to include to be passed with a variable value 2012-03-01 11:32:49 +01:00
friendica
bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica
21803e0cd3 call time pass by reference deprecated 2012-02-28 14:54:17 -08:00
friendica
4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Tobias Hößl
5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php 2012-02-28 21:56:42 +00:00
Tobias Hößl
3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
Tobias Hößl
1204210c69 wasn't actually changed before 2012-02-28 13:01:58 +00:00
Tobias Hößl
e55d13c2b4 Avoid a notice 2012-02-28 12:56:16 +00:00
friendica
6c0fa7a166 Merge branch 'pull' 2012-02-27 17:18:53 -08:00
friendica
d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
Tobias Hößl
e33c2b8f89 Avoid a Notice 2012-02-27 22:08:00 +00:00
Tobias Hößl
35128ef2c9 Avoid a Notice 2012-02-27 22:01:17 +00:00
Fabio Comuni
42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
friendica
153e7beb19 add plugin hooks to enotify 2012-02-26 23:54:04 -08:00
friendica
a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
friendica
89560edde2 Merge pull request #50 from annando/master 
massive changes in mail and design updates in "vier"
 2012-02-26 15:07:34 -08:00
friendica
6ddd444afd Merge pull request #49 from CatoTH/master 
Bugfix for del_config
 2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
friendica
bdb14d5aad relative link redirects 2012-02-26 14:34:01 -08:00
Michael
437e18d7a7 Merge remote branch 'upstream/master' 2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538 Avoid some notices 2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf Bugfix 2012-02-26 20:43:35 +00:00
Tobias Hößl
cbc6ca642a 1 Bugfix (missing $ character) and avoid some notices 2012-02-26 20:41:41 +00:00
root
aa92901b11 Wrong variable name 2012-02-26 14:29:17 +00:00
friendica
5f7858a688 show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr
f3a225437b Comment notifications by e-mail now are threaded 2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f include/items.php pass 'parent' to notification 2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
Michael
1cf1870512 poller.php: Test for moving to archive, vier-style: notifications fixed 2012-02-25 19:40:05 +01:00
Michael
dccefb3c36 "vier": The contacts are now working again. Line break before closing bbcodes removed. 2012-02-25 11:00:35 +01:00
friendica
18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica
9441ff5142 string update for 2.38 2012-02-24 22:47:43 -08:00
friendica
a3cf563b68 update author name across items if changed. 2012-02-24 20:40:09 -08:00
friendica
f5c5da742d attribution issue - don't take author name from contact if available from item. 2012-02-24 20:03:13 -08:00
Michael
01301a6169 Bug fixed where mails where nearly empty. HTML mails can now be received. 2012-02-25 02:37:39 +01:00
Michael
a74b0746b1 multipart messages complete, message-id conversion done. 2012-02-25 01:10:45 +01:00
Michael
0ba45eb745 Sending mail as multipart/alternative (html and plain text) (very basic by now) 2012-02-24 08:50:42 +01:00
Michael
f6320f3319 Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact. 2012-02-24 07:11:26 +01:00
Michael
484a442f2b GIT problems ... 2012-02-23 20:59:34 +01:00
Michael
0409b5cdba Merge remote branch 'upstream/master' 
Conflicts:
	include/bbcode.php
 2012-02-23 20:53:22 +01:00
Michael
311e35731c bbcode.php: A list or quote at the beginning wasn't detected 2012-02-23 20:51:44 +01:00
Tobias Diekershoff
85d09f48d0 fix img tag with size attribute 2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica
fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
friendica
41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
Michael Vogel
9f92bbb04c Removed the export of markdown articles. That was for testing purposes only. 2012-02-23 07:53:45 +01:00
friendica
808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica
3c6b127d40 nested quote check fails to account for strpos returning position 0 2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1 restore poller normal operation 2012-02-22 20:31:33 -08:00
friendica
58a9c652de Merge pull request #45 from annando/master 
New HTML to BBCode converter, changes to BBCode, nginx support, ...
 2012-02-22 20:21:05 -08:00
friendica
f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
Michael
e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica
390eb15e7d never enough documentation 2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica
91c3349025 escape smiley conversion in code and pre blocks 2012-02-21 23:13:03 -08:00
friendica
3f2497ad20 add full email link to notification 2012-02-21 18:10:15 -08:00
friendica
f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
Fabio Comuni
01a2791e3a template: add support for variable filters 2012-02-21 11:25:22 +01:00
friendica
5910fbf420 fill in notify msg with redirect link after we get the id 2012-02-21 00:02:42 -08:00
friendica
32d9008dd4 more cleanup of community followup detection. Remote worked well but local didn't. 2012-02-20 21:07:40 -08:00
friendica
b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
friendica
6edd6d8ae1 Merge branch 'pull' 2012-02-20 18:07:16 -08:00
friendica
11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr
3ef6344d41 include/nav.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
fed6330ea6 include/api.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
19fea9c2ce poller.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
7ed1e3f177 acl_selectors.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
03834b2433 text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
0bca36109a Scrape.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Michael
e2f276881e Some testing stuff 2012-02-20 11:15:22 +01:00
friendica
15e9933ddf include item links in web notification messages 2012-02-19 20:27:32 -08:00
Michael
0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
root
b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
Michael
064c843119 Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes. 2012-02-19 21:07:45 +01:00
Michael
31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
Simon L'nu
49179f9033 add :headdesk and fix doc/Pages.md to remove the absolute URL to / 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-02-19 05:17:26 -05:00
friendica
5734d5f357 change notify messages for web 2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
4222f506a8 deprecating two-char smilies 2012-02-17 23:44:25 -08:00
Fabio Comuni
7bd43613fa oembed: revert changes from 48f5bd492d 2012-02-17 15:34:05 +01:00
friendica
48f5bd492d naked link with no protocol being passed from Diaspora 2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1 a few fixes for offsite community members 2012-02-16 18:29:09 -08:00
friendica
7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
friendica
1b445d511b another sql typo 2012-02-16 00:08:38 -08:00
friendica
ada2a555dc sql typo in auto-friend with D* 2012-02-15 23:58:28 -08:00
friendica
b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica
d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
fabrixxm
16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00
Fabio Comuni
fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica
f865939653 localise links to private photos inside messages 2012-02-14 18:07:13 -08:00
friendica
134fdda75f refactor smilie code to allow for extensions and generation of a table of the entire list 2012-02-14 15:31:08 -08:00
Vasudev Kamath
e4b1c07727 cry, foot in mouth, cool, undecided and embarassed smiley's are mapped 2012-02-14 23:10:11 +05:30
friendica
803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f Merge branch 'pull' 2012-02-13 14:17:20 -08:00
friendica
dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00
Fabio Comuni
850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
friendica
85c831bcbf finish translation of 'xxxxx wrote:' 2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr
9697e82331 Merge branch 'master' into bbcode 2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr
135005571f Added [th] bbcode tag support. 2012-02-12 17:27:08 -08:00
friendica
3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. 2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr
e575a3a02c Fixed bbcode [li] and [*] handling. 2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr
10e66d293d Added [quote=Name] bbcode support. 2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr
3a07973ffa Added [center] bbcode support. 2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr
74b529bda2 BBCode [size=50] --> font-size: 50px (with the unit px). 
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
 2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr
92a585ed23 Added support to [noparse], [nobb] and [pre] as bbcode escape tags. 2012-02-12 14:35:29 -08:00
friendica
330a876d81 bug #281 2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr
6a17a3a8e2 Added support for [ol] standard ordered list bbcode. 2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr
5479142efc Added support for [ul] standard unordered list bbcode. 2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr
5107ee52d3 Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes 2012-02-12 06:13:49 -08:00
Vasudev Kamath
495d0fb80f Merge branch 'master' of git://github.com/friendica/friendica 2012-02-12 15:06:41 +05:30
Vasudev Kamath
cbf53beec1 ;) :D and :-O are also enabled for wink laugh and surprised smiley's 2012-02-12 15:06:12 +05:30
friendica
8b101c6cb8 do not display contact_block if config for num shown is 0 2012-02-11 23:49:05 -08:00
friendica
bb19c8ba4e kissing smilie may need escaping (thanks - Abinoam) 2012-02-11 21:46:48 -08:00
friendica
75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
friendica
d79c3351ea db installation sync 2012-02-10 13:43:35 -08:00
Fabio Comuni
ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica
b346f4464c send notify emails to community pages as well as people 2012-02-10 00:08:23 -08:00
friendica
2f2e331c33 bug #274 2012-02-09 22:44:59 -08:00
friendica
ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica
5859f9dcf6 add render_location hook to both sets of conversations 2012-02-09 18:09:28 -08:00
friendica
7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes 2012-02-09 15:58:26 -08:00
friendica
ec26f88be9 render_location hook 2012-02-09 15:02:59 -08:00
friendica
171249966e add tag notifications to enotify 2012-02-09 14:06:17 -08:00
friendica
c506bb42a9 :coffee extended smilie 2012-02-07 17:03:09 -08:00
friendica
8a3c1f7930 beer smilie 2012-02-07 15:41:06 -08:00
friendica
a869bd2fe5 don't link tags enclosed inside Diaspora links 2012-02-07 02:16:28 -08:00
friendica
2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). 2012-02-06 20:28:50 -08:00
friendica
3d099bd99a beer 2012-02-06 01:08:00 -08:00
friendica
4cf6bd5469 do an optimise after an expunge 2012-02-02 18:02:08 -08:00
friendica
9fc36d3da4 improvements in d* markdown conversion 2012-02-01 17:09:53 -08:00
friendica
86c0eac27d transport for email contacts phase II 2012-01-31 20:03:46 -08:00
friendica
4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica
c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica
d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica
5161be67e9 logging of manage identities 2012-01-27 12:56:36 -08:00
friendica
94b9e9ce6d for people whose DB's are not updating 2012-01-26 23:08:51 -08:00
friendica
3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica
8fe5168259 restore diaspora test mode 2012-01-26 20:46:42 -08:00
friendica
167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica
10f768630b D* event formatting 2012-01-25 15:16:43 -08:00
friendica
e2d0eb4a88 redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic 2012-01-24 18:59:55 -08:00
friendica
dae0c1ded2 more robust cache api handling (was throwing errors on occasion) 2012-01-24 17:04:49 -08:00
friendica
8ff2bb4cd3 backtrace errant input to base64url_decode 2012-01-24 16:45:58 -08:00
friendica
3a1a4d62d9 bug #254 2012-01-24 16:23:30 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica
1f074cb44c shaka, slackr theme 2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2 nav: fix "See all notifications" 2012-01-23 09:23:37 +01:00
friendica
11aa83742e more logging of D* photo transactions 2012-01-22 15:25:29 -08:00
Fabio Comuni
30fcda7576 nav: fix intro notification url, fix "See all notifications" url and make it translatable 2012-01-22 19:27:56 +01:00
friendica
b5ec475906 bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC 2012-01-21 14:07:28 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
d840943621 use reltoabs - primarily for github activity feeds 2012-01-17 16:30:32 -08:00
friendica
e12341b716 api post broken with recent change to use REQUEST vars in mod_item 2012-01-15 13:57:00 -08:00
friendica
4b6990e1ff modularise successful authentication 2012-01-12 15:46:39 -08:00
friendica
aa1c28cf39 fine tuning diaspora markdown to bbcode 2012-01-11 22:49:17 -08:00
friendica
6573c94d6c modified item_photo_menu hook 2012-01-11 17:34:02 -08:00
friendica
c5f41d8b6c fix D* links+text smushed together 2012-01-11 14:03:27 -08:00
friendica
cf7008e575 post preview to loozah 2012-01-10 17:47:11 -08:00
friendica
7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica
a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica
3bdcb52471 markdown bug is Diaspora's. We can't fix it. 2012-01-08 17:20:03 -08:00
friendica
df0f7ef560 make network_to_name extensible 2012-01-08 02:08:20 -08:00
friendica
977a49ad93 fix images with links going to diaspora, the D* markdown processor changed and these are no longer working. 2012-01-08 00:57:36 -08:00
friendica
358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -08:00
fabrixxm
ad02af4e8f Merge pull request #23 from fabrixxm/master 
Theme works
 2012-01-06 00:42:06 -08:00
friendica
cfe8094b45 nets widget - allow all children of specified parent net regardless of network 2012-01-06 00:23:05 -08:00
Fabio Comuni
f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica
b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica
5b809328af send diaspora share notification back to originator for auto friending 2012-01-05 13:25:43 -08:00
friendica
47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica
d0b743529d support auto-friend page types for Diaspora 2012-01-04 14:30:25 -08:00
friendica
c1cf6e48c2 Allow Diaspora to post to forums 2012-01-04 13:50:12 -08:00
friendica
48a5a2484e new smiley 2012-01-04 00:04:19 -08:00
friendica
fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica
969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
friendica
c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
friendica
184230e068 check count before foreach 2012-01-02 22:58:09 -08:00
friendica
f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica
4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
Fabio Comuni
1fbffc76b1 text: "turn off" logger() if module is "install" 2012-01-02 20:11:06 +01:00
Fabio Comuni
85fbdb00ac dba: leave unconnected if $server and $user are not defined 2012-01-02 20:10:23 +01:00
Fabio Comuni
f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl 
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
 2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica
0afb636e46 change default ostatus poll interval 2012-01-01 11:45:56 -08:00
friendica
3e162bcf8f function not defined 2011-12-30 20:48:49 -08:00
friendica
a76be1934a migrate more notifications 2011-12-29 22:32:30 -08:00
friendica
da21473c34 add notifications to d* private messages 2011-12-27 15:49:47 -08:00
friendica
0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica
5c7df6e964 notify_intro 2011-12-26 15:47:40 -08:00
friendica
356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica
bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica
0b598dedd0 more work on enotify 2011-12-23 23:07:05 -08:00
friendica
949d3f0ff1 preparation for 3rd generation email contacts 2011-12-23 01:38:06 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni
0dce36bdbc Merge remote-tracking branch 'friendica/master' 2011-12-22 16:35:58 +01:00
Fabio Comuni
0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
friendica
dacbbfaafb bug #188 diaspora_signed_retraction not removing post 2011-12-21 14:42:12 -08:00
Fabio Comuni
7f2070ca91 Merge remote-tracking branch 'friendica/master' 2011-12-21 17:37:35 +01:00
friendica
7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
Fabio Comuni
ba732c97c1 Merge remote-tracking branch 'friendica/master' 2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119 quattro: more on editor 2011-12-20 17:17:17 +01:00
friendica
63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica
79f3bbbf2b more data checking, cleans up some infrequent php errors 2011-12-19 16:51:57 -08:00
friendica
7c6bc5a93d invalid thread-id in "nouveau" mode of conversation, bug 245 2011-12-19 13:51:55 -08:00
Fabio Comuni
2a3f94e452 Merge remote-tracking branch 'friendica/master' 2011-12-19 18:04:04 +01:00
Fabio Comuni
a6f3b58293 config: set/get arrays with pconfig 2011-12-19 18:01:38 +01:00
friendica
ad54a91d4d poco_load aborting after debug statement 2011-12-19 00:40:00 -08:00
friendica
dc46a01cd4 suggest query for no friends messed up 2011-12-18 13:03:20 -08:00
friendica
e6b538c046 add webfinger addr to gcontact for friend "connect" links 2011-12-18 00:50:17 -08:00
friendica
22d59350e9 improve the email regex a bit more 2011-12-16 14:31:39 -08:00
friendica
690b3f57b7 bug 241 - valid emails may contain + on lhs 2011-12-16 14:06:50 -08:00
friendica
193435e980 default suggestions not being collected properly 2011-12-15 13:52:52 -08:00
friendica
cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica
50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica
834639ebab \o/ smiley 2011-12-11 16:58:36 -08:00
friendica
5b3155579a fix diaspora's illegal webfinger xml before sending to parser 2011-12-09 16:46:18 -08:00
friendica
3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica
0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica
be8e9d3616 d* pm 2011-12-06 00:16:13 -08:00
friendica
adbc84c48e maintain backward compatibility with old PMs 2011-12-05 14:06:41 -08:00
friendica
c8d5274cee data structures to support hidden friends 2011-12-05 02:16:59 -08:00
friendica
116e20c89d add conv structure 2011-12-05 00:35:44 -08:00
friendica
6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
friendica
fb01d8bec5 fix incorrect default author 2011-12-04 03:54:40 -08:00
friendica
fb437a874e typo 2011-12-04 03:50:26 -08:00
friendica
f6dd834284 fix author-name when missing on comments 2011-12-04 03:45:09 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica
29b5d398fd everybody group gets id 0 2011-11-30 23:01:42 -08:00
friendica
37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica
8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica
aa73d38845 begininning d* conversation mode 2011-11-29 01:19:09 -08:00
friendica
034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica
ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica
d9e1ebfc48 wrong length in image extractor 2011-11-27 14:03:49 -08:00
friendica
1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica
cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica
0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica
4b95e8ebe8 rework the liveupdate fixes - what a mess 2011-11-24 18:26:06 -08:00
friendica
9e8053e3bd fixing conversation updates 2011-11-24 16:42:12 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
335c0cddcf diaspora reshared lists rendering as html 2011-11-23 01:44:07 -08:00
friendica
53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
friendica
c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni
cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
Fabio Comuni
a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
friendica
aaedac8f57 community forums cleanup 2011-11-19 13:45:20 -08:00
friendica
191a9b048f forum cleanup 2011-11-19 03:13:46 -08:00
friendica
72dd6457b0 first forum test 2011-11-19 03:06:15 -08:00
friendica
6463543832 new approach to secondary delivery fork 2011-11-18 22:20:08 -08:00
friendica
fd4fe24406 Merge branch 'master' into groups 2011-11-18 22:04:41 -08:00
friendica
6893df991e update user-agent string for remote http requests 2011-11-18 22:03:49 -08:00
Fabio Comuni
590f1d2b25 log less in expire items 2011-11-17 16:18:59 +01:00
Fabio Comuni
79603e3146 expire settings for items, notes and photos. 
show default privacy acl in popup
 2011-11-17 15:53:59 +01:00
Fabio Comuni
844a36e2b6 Merge remote-tracking branch 'friendica/master' 2011-11-17 13:40:27 +01:00
Fabio Comuni
02281be0c3 oembed: don't try to fetch media files and add Accept request header to fetch_url 2011-11-17 13:40:11 +01:00
friendica
c9846b745d allow dup tag names with different urls 2011-11-16 17:09:58 -08:00
fabrixxm
d0bf9d371c Merge pull request #6 from fabrixxm/master 
small fix
 2011-11-16 02:30:38 -08:00
Fabio Comuni
ef8b5bc682 fix localize item tag 2011-11-16 11:27:20 +01:00
friendica
7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
friendica
485f97b3d8 tgroup relays 2011-11-15 20:30:34 -08:00
Fabio Comuni
962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
friendica
973620a9e6 translate vimeo and youtube bbcode to naked links so D* will oembed them again 2011-11-13 19:32:05 -08:00
friendica
ce7a3615b5 d* - remove dupe bbcode code tags 2011-11-13 19:04:59 -08:00
friendica
02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -08:00
Friendika
58ba7c3969 Merge branch 'pull' 2011-11-12 04:12:03 -08:00
Friendika
cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
friendica
ab6bf767df Merge pull request #3 from fabrixxm/master 
fix for #191 and some other
 2011-11-12 04:06:14 -08:00
Friendika
d23867f5a0 incorrect total use for get_feedtags 2011-11-12 02:53:53 -08:00
Fabio Comuni
1ff8cddeb6 oembed: replace base64 url for iframe with url site/oembed/url_encoded 
fix http://bugs.friendika.com/view.php?id=191
 2011-11-11 17:33:32 +01:00
Friendika
02f21fb74c some testbubble fixes 2011-11-10 19:53:13 -08:00
Friendika
199da623ff testbubble showing post jot-tools on edit page - these are not changed so should not be visible 2011-11-10 18:20:25 -08:00
Friendika
83e55cf9f4 bbcode list styles 2011-11-09 19:32:54 -08:00
Friendika
15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika
05cabf24a9 first checkin - updated contact_edit, more work remains 2011-11-08 18:30:20 -08:00
Friendika
20ca93191f cleanup and loose ends 2011-11-08 16:54:32 -08:00
Friendika
02a1fdacd7 strip duplicate code blocks bb2d* 2011-11-08 15:38:06 -08:00
fabrixxm
eeec29c6be Merge pull request #2 from fabrixxm/master 
Oauth1 support in API
 2011-11-08 00:18:37 -08:00
Friendika
9fabdbf2c9 D* scaled images not containing link to original size 2011-11-07 20:41:12 -08:00
Friendika
99a548d4ac fix friend suggest link in testbubble 2011-11-07 17:25:40 -08:00
Fabio Comuni
00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni
41cbd84a74 api: login with oauth 2011-11-07 17:36:58 +01:00
Fabio Comuni
10e5754e24 oauth: authorize 2011-11-07 17:36:41 +01:00
Friendika
327105a4ea try and fix diaspora multiple items queued issue 2011-11-06 16:48:13 -08:00
Friendika
f07c0b2cfb implement signed_retractions 2011-11-05 14:45:29 -07:00
Friendika
a203820efe reduce polling load 2011-11-04 15:21:46 -07:00
Friendika
0130052b2c bbcode lists 2011-11-03 21:30:01 -07:00
Friendika
014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika
bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -07:00
Fabio Comuni
69e41f7703 oauth: authorize view, wrong verifier. 2011-11-02 09:54:07 +01:00
Friendika
e38aa67263 link suggestions into the main code 2011-11-01 21:27:11 -07:00
Friendika
158028a0ac first cut friend suggestions 2011-11-01 20:29:55 -07:00
Friendika
3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00
Friendika
0975ea8610 add attachments to Diaspora posts 2011-11-01 17:30:52 -07:00
Friendika
573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika
ae7425dadb don't send diaspora profile updates in batch mode 2011-11-01 14:24:56 -07:00
Friendika
05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika
f4518c646a fixes to diaspora profiles, batch mode duplicates, social graph table name 2011-11-01 00:50:41 -07:00
Friendika
e28b143fb6 perform poco_load 2011-10-31 20:54:24 -07:00
Friendika
d4644d7339 name change continued, social graph tools and stuctures, fix for spanish province name 2011-10-31 20:39:04 -07:00
Friendika
e4dd2a5a9a begin the name change 2011-10-28 17:29:13 -07:00
Friendika
b025981858 yet more diaspora images to scale 2011-10-28 16:13:54 -07:00
Friendika
2914ffb396 log scale_diaspora_image 2011-10-28 04:35:10 -07:00
Friendika
e5992003e8 better handling of remote urls - especially FB opengraph 2011-10-28 02:50:00 -07:00
Friendika
e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Friendika
ea0ab6fbac poco should now be spec compliant 2011-10-27 04:38:33 -07:00
Friendika
abe96155b4 hmmm - why won't poco xml work 2011-10-27 01:54:52 -07:00
Fabio Comuni
ff7fc68382 oauthapi: authorize app 2011-10-26 17:15:36 +02:00
Fabio Comuni
dc212de960 Merge remote-tracking branch 'friendika/master' 2011-10-26 12:15:38 +02:00
Friendika
6d6136cdb5 fix diaspora cache 2011-10-25 20:30:01 -07:00
Friendika
d9f64deda0 sql error 2011-10-25 20:05:21 -07:00
Friendika
72d74b88be some dspr fixes 2011-10-25 19:59:57 -07:00
Fabio Comuni
afce790e56 oembed: wrap in iframe only html from remote service 2011-10-25 14:59:31 +02:00
Friendika
ae12074337 fix tag import for tag owner 2011-10-24 23:55:29 -07:00
Friendika
318f179408 D* formatting updates [code/blockquote] 2011-10-24 21:29:57 -07:00
Friendika
b20afbc9e4 @ tags becoming # tags during atom transit 2011-10-24 20:33:54 -07:00
Friendika
1a7badb405 use iframe for oembed - untrusted content 2011-10-24 20:10:46 -07:00
Friendika
790c4a4e1a tag display with item 2011-10-24 17:25:49 -07:00
Friendika
4218e3f494 Merge branch 'pull' 2011-10-24 15:51:14 -07:00
Friendika
ea9d3b06f6 Merge pull request #35 from fabrixxm/master 
Use oembed if possible without the addon

Awesome!
 2011-10-24 15:49:28 -07:00
Friendika
3b6b0eaa8b social tag - add UI 2011-10-24 15:47:17 -07:00
Fabio Comuni
2905df527f fix oembed video thumb display ratio 2011-10-24 17:31:14 +02:00
Fabio Comuni
40ea48bdab fix vimeo oembed bbcode regexp 2011-10-24 17:28:48 +02:00
Fabio Comuni
75d4f33233 move html for oembeded videos in template. fix oembed discovery 2011-10-24 17:28:28 +02:00
Fabio Comuni
ac474cf53c try to use oembed on vimeo tag 2011-10-24 14:39:39 +02:00
Fabio Comuni
a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika
f48fd5aa16 more tagging 2011-10-24 04:17:46 -07:00
Fabio Comuni
306036c626 cache api 2011-10-24 13:02:38 +02:00
Friendika
fe2c8a1845 Merge branch 'master' into tag 2011-10-23 19:06:04 -07:00
Friendika
3512adda33 never enough comments 2011-10-23 19:05:32 -07:00
Friendika
6eea312c21 workaround for transmitting photos to D* 2011-10-23 16:01:04 -07:00
Friendika
0b2c5bf8f5 fix queue_fns 2011-10-23 01:54:51 -07:00
Friendika
7cbb69d87f tagging 2011-10-23 00:24:37 -07:00
Friendika
0ada550a02 queue indexes 2011-10-22 01:29:26 -07:00
fabrixxm
a06c9768be Merge pull request #34 from fabrixxm/master 
fixs to oembed
 2011-10-21 07:32:12 -07:00
Fabio Comuni
6769436f3b oembed. fix html2bbcode when oembed html contains span and utf8 chars 2011-10-21 16:26:29 +02:00
Friendika
6e76c86ad2 queue api + queue limits 2011-10-21 03:33:34 -07:00
Friendika
d1833cabf6 fix hex2bin for empty input 2011-10-20 19:11:34 -07:00
Friendika
01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Fabio Comuni
b06588ffa1 Initial work adding oauth to api 2011-10-20 15:57:35 +02:00
Friendika
da416e0181 bug in diaspora_reshare 2011-10-20 05:43:33 -07:00
Friendika
96c0598737 diaspora_reshare - even more logging 2011-10-20 03:56:10 -07:00
Friendika
796056f810 provide link to missing d* images 2011-10-20 02:21:57 -07:00
Friendika
852ece39f4 more reshare logging to see what's going on 2011-10-20 02:07:38 -07:00
Friendika
33af8b0e20 diaspora_reshare - another try 2011-10-20 01:16:03 -07:00
Friendika
df996a8b5e fix for errant top-level posts from feeds 2011-10-19 21:54:33 -07:00
Friendika
c4179d989f more debug reshare 2011-10-19 21:34:48 -07:00
Friendika
10b2661176 suppress blank diaspora messages which are awaiting a photo that hasn't arrived 2011-10-19 15:18:41 -07:00
Friendika
19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika
1148cbab22 fix img link format diaspora share/asphoto 2011-10-19 00:29:43 -07:00
Friendika
9043e704f8 diaspora reshares 2011-10-18 15:56:35 -07:00
Friendika
32808a934d string update 2011-10-18 04:28:36 -07:00
Friendika
fb5bddb98f a few issues with diaspora_profile 2011-10-18 01:12:51 -07:00
Friendika
42a9817350 "cubbi.es" 2011-10-17 17:39:25 -07:00
Friendika
f0dc77ab6c Merge branch 'pull' 2011-10-17 14:55:46 -07:00
Friendika
278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Fabio Comuni
de44072172 works on login form 2011-10-17 16:53:59 +02:00
Fabio Comuni
2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Friendika
5dcc10a5d9 working on long-term solution to relay issue 2011-10-15 03:26:37 -07:00
Friendika
af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika
05e26e4895 handle diaspora profile update message 2011-10-13 18:32:02 -07:00
Friendika
89c771a26e remove queued items for contact when removing contact 2011-10-13 15:39:05 -07:00
Friendika
4eae1e5d8a don't propagate deletions for other people's stuff 2011-10-13 15:32:43 -07:00
Friendika
2911bf9434 sql issue item_store 2011-10-13 01:00:06 -07:00
Friendika
3db43d5a39 storage race condition 2011-10-12 02:21:18 -07:00
Friendika
3ef7dcac4b solve intro/notify naming issue by providing both or either, theme decides what to do 2011-10-11 20:38:09 -07:00
Friendika
2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget 
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
 2011-10-11 19:27:58 -07:00
Friendika
557a7d0cec stuff 
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
 2011-10-11 18:24:37 -07:00
Fabio Comuni
e9eb15373f Remove full profile html from php and add new template 'profile_advanced.tpl' 2011-10-10 16:48:38 +02:00
Friendika
3174847de8 bug #177 - birthday month on profile incorrect if October or later and no year 2011-10-10 01:03:34 -07:00
Friendika
1d05c564d4 missing arg to diaspora_transmit from share/unshare 2011-10-07 15:49:41 -07:00
Devlon Duthie
f5fc8dabe5 Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme 2011-10-07 01:25:08 -05:00
Friendika
2802c142cb local_deliver testing 2011-10-06 19:10:57 -07:00
Friendika
53efeb8d1f local deliver 1 2011-10-06 17:27:37 -07:00
Friendika
ce11d231b8 use strpos instead of strstr, faster 2011-10-05 21:04:53 -07:00
Friendika
d0bef869db ensure D* photos only attached once 2011-10-05 21:02:00 -07:00
Friendika
4c0ee7f41f bug 173 2011-10-05 20:48:00 -07:00
Friendika
7d6a67f903 mostly cosmetic changes to make DB tables accurately reflect the conversation members 2011-10-05 19:16:05 -07:00
Friendika
7df6cb850e Merge branch 'pull' 2011-10-05 15:37:17 -07:00
Friendika
b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Tobias Diekershoff
feaba3d300 point Diaspora* to the foundation homepage instead of joindiaspora.com 2011-10-05 21:01:48 +02:00
Friendika
924d419378 added prepare_body hooks 2011-10-05 02:35:25 -07:00
Friendika
6c521017f5 document backward compat issue 2011-10-04 22:03:57 -07:00
Friendika
ab50521971 yikes 2011-10-04 22:00:45 -07:00
Friendika
7b648e6da8 performance enhancements 2011-10-04 18:53:56 -07:00
Friendika
aeb83fa063 document multi-pass mode on consume_feed 2011-10-04 04:38:58 -07:00
Friendika
07b09300a9 improve feed import performance 2011-10-04 03:06:34 -07:00
Friendika
c6ac438735 item_store: prevent storing a duplicate item with same uri+uid 2011-10-03 06:04:17 -07:00
Fabio Comuni
4d5580ab77 fix typo 2011-10-03 09:38:58 +02:00
Fabio Comuni
2465b3274a Merge remote-tracking branch 'friendika/master' 2011-10-03 08:13:40 +02:00
Friendika
8f9656da92 basic support for AS friend requests 2011-10-02 16:18:01 -07:00
Friendika
7c1968907d attack of the zombie orphans 2011-10-02 05:32:05 -07:00
Fabio Comuni
60e0f79b9f Merge remote-tracking branch 'friendika/master' 2011-09-30 14:31:20 +02:00
Fabio Comuni
dfb3ee6e29 fix star icon viewing profile page as unlogged user 2011-09-30 14:31:01 +02:00
Friendika
52557b011d possible sql errors 2011-09-29 21:56:44 -07:00
Friendika
097c1f8da7 do not poll for abandoned accounts 2011-09-29 21:20:19 -07:00
Friendika
c1221cc052 add display_item hook to 'search|new' message display 2011-09-29 15:52:31 -07:00
Friendika
ffa3b67365 fix nav-selected duepuntozero 2011-09-28 23:10:23 -07:00
Friendika
a1786cbf61 fixes for statusnet/identi.ca empty vcard page - which appears to be deprecated. Scrape the feed for everything we used to get from the vcard. 2011-09-28 04:35:44 -07:00
Fabio Comuni
41617ee987 fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme 2011-09-28 10:30:32 +02:00
Fabio Comuni
c120cc8ea9 added missing "delete selected items" link 2011-09-28 09:32:53 +02:00
Fabio Comuni
dccd2da356 Merge remote-tracking branch 'friendika/master' 2011-09-28 09:27:59 +02:00
Friendika
4f9c072d66 requeue deliveries on 503 errors which have 'retry-after' headers 2011-09-27 19:27:47 -07:00
Fabio Comuni
e986fc3e30 quattro: actions in wall_item 
less html in conversation.php
removed unused tpls
fixed old themes
 2011-09-27 16:54:33 +02:00
Friendika
25ac93f44d Merge pull request #3 from fabrixxm/master 
Works on UI
 2011-09-27 01:04:54 -07:00
Friendika
8d3910c78c sql error diaspora re-queue 2011-09-27 00:58:59 -07:00
Fabio Comuni
e9638b6980 Adds theme info file to define 'parent' theme from where load tpl files 2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a Merge remote-tracking branch 'fabrix/newui' 2011-09-27 08:57:16 +02:00
Friendika
e04d9b8646 bug #165 2011-09-26 23:39:47 -07:00
Friendika
ec16525c86 expire expired accounts from poller 2011-09-26 05:43:22 -07:00
Fabio Comuni
8d93eefea8 remove global $lang var in templates. can't work as intended 2011-09-26 12:18:39 +02:00
Fabio Comuni
968e7bb3b1 Fixes for testbubble 2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
116fc7fcf2 zot endpoint 2011-09-26 02:25:43 -07:00
Devlon Duthie
3426ce5f94 Merge remote-tracking branch 'upstream/master' 2011-09-25 13:30:55 -05:00
Devlon Duthie
cb1c6dd1e3 really commiting files this time, still getting the hang of git. 
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
 2011-09-25 13:20:19 -05:00
Friendika
6a9e22550d . 2011-09-24 05:45:34 -07:00
Friendika
3a2bf8ab7c w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator 2011-09-23 03:12:31 -07:00
Friendika
d6b446d63f starting the big delivery shakeup 2011-09-22 04:11:39 -07:00
Friendika
542aa22eb9 provide ability to unset session language 2011-09-21 16:00:17 -07:00
Friendika
030e1e82c3 finish up ability to switch languages without function collision 2011-09-21 15:37:16 -07:00
Friendika
c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Friendika
11ca81adba keychecks 2011-09-21 05:43:26 -07:00
Friendika
9115e9c90b no need to scrape Twitter profile photo from page - it's no longer there. 2011-09-20 18:07:33 -07:00
Friendika
8294dde936 typo in Twitter probe update 2011-09-20 17:59:18 -07:00
Friendika
38444aedd7 improvements to Twitter probe 2011-09-20 17:56:44 -07:00
Friendika
1c8e89bd03 social bookmark API, oexchange enhancements 2011-09-20 16:31:45 -07:00
Friendika
deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika
119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika
9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika
c2ccb78869 template escapes 2011-09-19 19:51:14 -07:00
Friendika
63277b57fc template escapes 2011-09-19 19:46:18 -07:00
Friendika
97deaa3118 resume strict verification of Diaspora messages 2011-09-19 03:36:41 -07:00
Friendika
fd18b42a5a Check all keys before use 2011-09-19 03:30:59 -07:00
Friendika
2aef98f71d cripple account when expired 2011-09-19 01:17:12 -07:00
Friendika
48ee3fa3b9 build diaspora public (batch) message 2011-09-18 20:17:44 -07:00
Friendika
5b3f645939 account expiration structures 2011-09-18 19:53:45 -07:00
Friendika
8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika
e2e29b2dea only header encode if necessary 2011-09-18 17:16:02 -07:00
Friendika
5899c9f406 bug #157 - allow deleted group to be revived, but warn of side effects 2011-09-18 06:20:18 -07:00
Friendika
da05ef2ae4 rfc2047 encode notification email headers 2011-09-18 04:34:17 -07:00
Friendika
309df84172 again fix bbcode image sizes 2011-09-18 00:19:19 -07:00
Friendika
5f4ab62fe3 fix bbcode image size 2011-09-18 00:16:18 -07:00
Friendika
ce77c7287e show real profile link location on hover 2011-09-16 15:40:34 -07:00
Friendika
6c4ad7df3a public D* post fix 2011-09-16 14:57:41 -07:00
Friendika
d7243be2ea log the D* publc messages 2011-09-16 14:51:25 -07:00
Friendika
5a6a3cab8e may fix diaspora send 2011-09-16 14:46:04 -07:00
Friendika
9b5d5eca07 Merge branch 'friday' 2011-09-16 06:51:33 -07:00
Friendika
9c3503a706 update timestamp on activity change (comment/like) 2011-09-16 06:49:24 -07:00
Fabio Comuni
6b6f45f9f1 quattro: initial style of conversations 2011-09-16 12:51:14 +02:00
Fabio Comuni
9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika
80f94bb12b federation friday update 2011-09-15 17:47:16 -07:00
Fabio Comuni
d9bce6b852 Fix issue 151 2011-09-15 11:05:09 +02:00
Friendika
cdf2fe859f don't escape underscore within links going to diaspora 2011-09-14 21:35:13 -07:00
Friendika
1778e4a315 bloody ampersands 2011-09-14 20:47:49 -07:00
Friendika
5c0e135fe9 diaspora protocol changes 2011-09-14 19:33:42 -07:00
Friendika
1248a561e1 group_public_members sql query typo 2011-09-13 15:26:47 -07:00
Friendika
43da1429cc import image sizes from html source 2011-09-13 04:53:17 -07:00
Friendika
08fc3e91b6 bug #148 email subscription issue 2011-09-12 22:24:36 -07:00
Friendika
ff572487a3 smilie hook 2011-09-12 03:21:39 -07:00
Friendika
17b081f9f7 allow html post to api 2011-09-11 21:52:50 -07:00
Friendika
7a06c7c3bf bug #146 - br HTML tags showing up in events 2011-09-11 15:44:07 -07:00
Friendika
0e441fe196 bug #147 comments not working on private notes page 2011-09-11 15:09:57 -07:00
Friendika
0c0a604396 block imap function from spitting out errors to the page 2011-09-10 03:14:00 -07:00
Friendika
ebb9af8946 One day we'll have ignored all purely numeric hashtags like #33. Found yet another edge case. 2011-09-09 17:35:26 -07:00
Friendika
d7a2ab9c1f send profile visits to 'redir' window 2011-09-09 16:22:32 -07:00
Friendika
f5c9de19d5 network insecure warnings on feeds 2011-09-09 01:37:46 -07:00
Friendika
1e8b3278b0 share not available in display module, as no editor window to paste into 2011-09-08 22:07:16 -07:00
Friendika
3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni
49ffd30e1c global lang array in templates 2011-09-08 14:09:45 +02:00
Friendika
fdd372a798 speed up friend requests and avoid parse errors by using hcard address instead of profile url 2011-09-07 22:49:58 -07:00
Friendika
a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika
e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni
20ca451200 move js to js folder 2011-09-05 11:15:30 +02:00
Fabio Comuni
0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika
e440353013 truncate overflow text on acl selector items (3 themes) 2011-09-04 05:41:11 -07:00
Friendika
260d652168 scrape_url - use feed url if no name can be found 2011-09-04 05:07:25 -07:00
Friendika
1d01b3a088 Merge branch 'pull' 2011-09-04 00:51:42 -07:00
Friendika
9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika
c0a2cc3e98 diaspora has no timezone - use UTC for events 2011-09-03 07:40:05 -07:00
Friendika
59a6a04e26 format events for diaspora 2011-09-03 07:13:12 -07:00
Friendika
c8f61ef890 no plink on imported D* posts 2011-09-03 05:23:36 -07:00
Friendika
b026dcb860 match bbcode multiline 2011-09-03 04:36:45 -07:00
Friendika
93b9d71377 completely enclose ~f hashtags so they don't get hijacked by D* 2011-09-02 05:13:38 -07:00
Friendika
1621630b06 login_hook 2011-09-01 06:29:29 -07:00
Friendika
0cfc8570d2 save plink for diaspora items so likes will point to right post 2011-08-31 21:46:37 -07:00
Fabio Comuni
8b615133d5 remove html from profile vcard code 2011-08-31 17:31:44 +02:00
Fabio Comuni
5ce6f893a6 Apps popup menu in navbar 2011-08-31 16:18:03 +02:00
Friendika
c60d45752d translate D* images (markdown) before links, they overlap and conflict 2011-08-30 23:24:45 -07:00
Friendika
f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika
b11a0efff1 This *might* fix Diaspora @ tags - or it might not. 2011-08-30 20:20:17 -07:00
Friendika
f0a4a6af61 relayed likes did not verify 2011-08-30 19:20:56 -07:00
Friendika
f8da48a880 unsafe chars in admin, add img to diaspora markdown processor 2011-08-30 18:46:34 -07:00
Fabio Comuni
d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika
0f1bc6e957 log every possible diaspora return for posts and comments 2011-08-29 22:50:41 -07:00
Friendika
454882812e wrong time format string, 24hr clock 2011-08-29 18:01:59 -07:00
Friendika
7e79b140f0 don't deliver on first pass if already queued 2011-08-29 17:52:31 -07:00
Friendika
177e0e15d7 allow zero delivery interval on dedicated servers 2011-08-29 00:59:44 -07:00
Friendika
391330d95f better handling of relayed Diaspora comments 2011-08-29 00:51:08 -07:00
Friendika
bfc708e07b logging on notifier 2011-08-28 23:05:06 -07:00
Friendika
88e6e4699a Merge branch 'pull' 2011-08-28 23:01:42 -07:00
Friendika
51615f57ac flag top level post 2011-08-28 23:00:45 -07:00
Friendika
b61d535f81 remove item from queue 2011-08-28 22:59:49 -07:00
Friendika
846c4cea7c implement delivery queue in case notifier gets killed 2011-08-28 21:41:42 -07:00
Friendika
f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika
030dcbd467 Merge branch 'pull' 2011-08-28 05:05:32 -07:00
Friendika
4572f32603 cleanup 2011-08-28 05:04:49 -07:00
Friendika
41b00a6f3b allow comment relaying for comments which were never Diaspora signed 2011-08-28 05:00:30 -07:00
Friendika
ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
fabrixxm
3bbdbee87c Merge pull request #163 from fabrixxm/master 
API and IT translation: smal fixes
 2011-08-27 00:10:25 -07:00
Friendika
721db93e84 check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up 2011-08-26 17:52:24 -07:00
Friendika
144f241c5d fix bad embeds 2011-08-26 15:21:21 -07:00
fabrixxm
fcf45db075 API: fix friends profile, statuses etc 2011-08-26 16:35:51 +02:00
Friendika
506853adcd break up delivery into per-person processes 2011-08-26 07:29:22 -07:00
Friendika
1861dc1fae don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error 2011-08-26 01:32:22 -07:00
Friendika
a4739aef91 more logging diaspora pubdeliver 2011-08-25 20:35:55 -07:00
Friendika
c15c53d307 one more little tweak to linkificator 2011-08-25 20:12:56 -07:00
Friendika
5eb08d43b6 tweak to bbcode linkificator 2011-08-25 20:09:32 -07:00
Friendika
99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika
21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika
1b33ba6587 third attempt to get rid of this stupid warning 2011-08-25 06:01:40 -07:00
Friendika
71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Friendika
8f6ae2b660 missing salmon key? report it. 2011-08-24 20:40:08 -07:00
Friendika
d6f9e0e2a4 change the way public feeds work just to fix statusnet's bug, because they won't 2011-08-24 05:58:31 -07:00
Friendika
a775474dff cleaned up the conditions on when to and when not to relay. 2011-08-24 04:42:28 -07:00
Friendika
b6fdd3c76b turn off notifier - runaway 2011-08-24 01:55:34 -07:00
Friendika
2aa23843e4 D* queue 2011-08-24 01:21:24 -07:00
Friendika
2cfdcee29a author and owner sign exactly the same string - apparently 2011-08-23 19:54:35 -07:00
Friendika
b57a01dc14 that was ugly - let's do better 2011-08-23 19:42:45 -07:00
Friendika
838d89a110 fix for public posts to D* 2011-08-23 19:40:50 -07:00
Friendika
6a052c3586 correct time in photo msg 2011-08-23 19:01:08 -07:00
Friendika
c1acea330c photo fixes 2011-08-23 18:50:18 -07:00
Friendika
3b4da00495 fix it again 2011-08-23 18:28:17 -07:00
Friendika
b41592f556 fix group public members 2011-08-23 18:22:15 -07:00
Friendika
56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
Friendika
91de9edecd retractions - precedence issue 2011-08-23 04:02:29 -07:00
Friendika
99681e33af testing retractions 2011-08-23 03:49:38 -07:00
Friendika
0739ae315b typo 2011-08-23 03:07:26 -07:00
Friendika
afbc46c00f don't process diaspora communications if no pubkey 2011-08-23 03:06:08 -07:00
Friendika
8cfbe2c432 include bb2diaspora at top level 2011-08-23 03:02:31 -07:00
Friendika
92504b5df7 more testing with images 2011-08-23 01:55:46 -07:00
Friendika
c55d24b451 second try 2011-08-23 01:52:59 -07:00
Friendika
124881903e forget about the image link we have it in the wrapper 2011-08-23 01:51:37 -07:00
Friendika
508f22f859 photos a bit messed up on d* 2011-08-23 01:47:42 -07:00
Friendika
c1a1b2ab60 updates bb2md 2011-08-23 01:33:58 -07:00
Friendika
561051e805 convert bbcode to markdown for diaspora (first try, will need tweaking) 2011-08-23 01:00:29 -07:00
Friendika
56ea11a561 bad param in like function 2011-08-22 23:18:22 -07:00
Friendika
58651f7eb8 public posts ~f to D* 2011-08-22 21:15:31 -07:00
Friendika
b9e4668f68 d* retractions 2011-08-22 20:35:34 -07:00
Friendika
b0211499c1 invoke notifier 2011-08-22 19:27:40 -07:00
Friendika
eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
fabrixxm
d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Friendika
564ade0685 store key with contact record 2011-08-22 04:55:09 -07:00
Friendika
812222fb17 correct the diaspora_like signable string format 2011-08-22 01:57:52 -07:00
Friendika
4ec706cfc7 log the friend request - it's important 2011-08-21 17:48:42 -07:00
Friendika
213f832443 add trailing slash to diaspora notify url on send 2011-08-21 17:24:50 -07:00
Friendika
e3eb4c131f D* likes not verifying, ignore result until we figure out the signable_string exactly 2011-08-21 04:18:39 -07:00
Friendika
c97652a044 php error when no aliases 2011-08-21 00:13:44 -07:00
Friendika
a3eb73ed11 diaspora sign/verify requires SHA0 hash algorithm 2011-08-20 20:54:03 -07:00
Friendika
c6f0d997e6 set author/owner on likes 2011-08-20 18:14:19 -07:00
Friendika
c6cab2cfa8 get_app for diaspora_like 2011-08-20 18:08:43 -07:00
Friendika
f5c0443b91 sql syntax 2011-08-20 18:05:05 -07:00
Friendika
c6a05443f7 stricmp does not exist - strcasecmp does 2011-08-20 17:50:39 -07:00
Friendika
349ea8d475 don't generate guid if one provided wirth msg 2011-08-20 17:46:33 -07:00
Friendika
8fa6f49242 until algorithm is sorted, ignore D* verification failures so we can debug the rest 2011-08-20 15:09:09 -07:00
Friendika
0d9d576aa6 move encryption functions to crypto file 2011-08-20 04:53:11 -07:00
Friendika
6aa633efc8 Merge branch 'pull' 2011-08-19 14:36:08 -07:00
Friendika
8e24db3ef5 incorrect iv length for blocksize 2011-08-19 14:34:28 -07:00
fabrixxm
a66f063e68 Merge pull request #159 from fabrixxm/master 
Some works on API 2
 2011-08-19 11:37:29 -07:00
fabrixxm
46dd2535df API work. Identicurse compatiblity 2011-08-19 20:33:34 +02:00
fabrixxm
b465d1f30b Merge pull request #158 from fabrixxm/master 
Some works on API
 2011-08-19 08:03:20 -07:00
fabrixxm
5c78872940 API: private messages (only json) 2011-08-19 16:55:43 +02:00
fabrixxm
43040faf22 move send private message code out of view code 2011-08-19 16:54:41 +02:00
fabrixxm
fc9c73da49 API: missing template and small fix for hotot 2011-08-19 15:09:10 +02:00
fabrixxm
62e939de52 API: add pagination in timelines and add statuses/friends and followers 2011-08-19 14:57:54 +02:00
Friendika
9a52b15271 don't allow removal of self contact 2011-08-19 05:20:30 -07:00
Friendika
b49175ec5d more logging 2011-08-19 04:48:54 -07:00
Friendika
68c237f79f typo on d* path 2011-08-19 04:11:06 -07:00
Friendika
16129a4b8c better reporting when d* parent not found 2011-08-19 02:53:44 -07:00
Friendika
395faae0b2 double url encode diaspora communications 2011-08-19 02:24:30 -07:00
Friendika
4cef4ec918 fix d* intros 2011-08-18 22:03:58 -07:00
Friendika
0a0c5013ce debug 2011-08-18 22:01:35 -07:00
Friendika
9167b2057b diaspora share - blocked specified twice 2011-08-18 21:50:41 -07:00
Friendika
c05c20aa56 set writable (e.g. writeable) flag for Diaspora contacts 2011-08-18 21:31:34 -07:00
Friendika
d2c6c21a88 lots more diaspora communications - can see light at the end 2011-08-18 21:09:44 -07:00
Friendika
457f8c3e95 use mb_strlen when iterating utf8 2011-08-18 19:14:13 -07:00
Friendika
2df7251b34 notifier issue 2011-08-18 17:30:06 -07:00
Friendika
bc5935061b dfrn friendship issue 2011-08-18 16:47:45 -07:00
Friendika
012e039dae store signature data if applicable for relaying 2011-08-18 05:08:39 -07:00
Friendika
c534dd2969 fill and expire fcontact cache 2011-08-18 04:20:30 -07:00
Friendika
69b7c2f0be documentation 2011-08-17 23:10:55 -07:00
Friendika
9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
Friendika
37fc7324b7 fix largest_photo mixup in probe_url 2011-08-17 21:14:21 -07:00
fabrixxm
07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika
db03b1ab17 diaspora continued... 2011-08-17 04:24:26 -07:00
Friendika
673e114bbd D* like and start of relay code 2011-08-16 22:31:14 -07:00
Friendika
fafcab70e1 fill in framework for d* outgoing 2011-08-16 20:43:34 -07:00
Friendika
b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika
98cdf5d315 fix API time - wrong format string 2011-08-16 04:55:38 -07:00
Friendika
2c0404fdc8 cleanup after refactor 2011-08-16 00:52:34 -07:00
Friendika
c7197b99f9 refactor the diaspora contact logic 2011-08-15 23:19:17 -07:00
Friendika
0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika
3d45f9f133 remove disable oembed 2011-08-15 21:46:52 -07:00
Friendika
d0c8f11dff typos 2011-08-15 21:01:44 -07:00
Friendika
9634bb514f doh! add body to the item 2011-08-15 19:46:47 -07:00
Friendika
a93b6757b1 set parent-uri for top level posts 2011-08-15 19:39:49 -07:00
Friendika
44918e2736 turn diaspora posts into x-www-form-urlencoded 2011-08-15 17:14:51 -07:00
Friendika
805770521e errant debug statement 2011-08-15 06:27:17 -07:00
Friendika
5d6155a968 fixes share from diaspora 2011-08-15 05:27:24 -07:00
Friendika
9cd77b56ab temporarily disable oembed 2011-08-15 01:29:58 -07:00
Friendika
5b24050875 split off facebook and other cron hooks from poller 2011-08-14 22:59:34 -07:00
Friendika
d723ff4770 diaspora top level status posts, string update 2011-08-14 21:23:02 -07:00
Friendika
0729e205c8 diaspora follow from friendika 2011-08-14 20:38:31 -07:00
Friendika
7952961222 diaspora probe/scrape changes 2011-08-14 18:13:52 -07:00
Friendika
025485ea69 partially fill in diaspora stub functions for comments and likes - these both need lots more work 2011-08-13 19:03:59 -07:00
Friendika
4b4ff75b72 basic post message from diaspora (untested) 2011-08-13 16:39:59 -07:00
Friendika
88f94325a4 incoming diaspora share notification turned into Friendika friend request 2011-08-13 06:52:33 -07:00
Friendika
e15e18e0d1 hopefully fix statusnet bug by altering our feed format slightly 2011-08-12 21:01:51 -07:00
Friendika
aefc6209a3 improved diaspora discovery 2011-08-12 03:01:11 -07:00
Friendika
04b59ac49a enhanced email privacy 2011-08-11 01:52:31 -07:00
Friendika
3f61f9f2c5 comment box premature close due to race condition with liveupdate 2011-08-10 22:20:59 -07:00
Friendika
ac4ce27e88 keep private emails out of any offsite feeds 2011-08-10 21:46:19 -07:00
Friendika
684ebd2ed8 enhance random_string, block public email replies 2011-08-10 21:06:35 -07:00
Friendika
06408664db Diaspora logo 2011-08-10 05:28:39 -07:00
Friendika
72873cd827 diaspora function dispatcher 2011-08-10 05:10:48 -07:00
Friendika
ee6806d82b never enough comments 2011-08-10 01:19:27 -07:00
Friendika
cbfb40c43f use mailto: to specify a new email contact and over-rider webfinger 2011-08-09 22:11:01 -07:00
Friendika
1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika
49be394182 diaspora - remove debugging code on encrypt/decrypt 2011-08-09 06:40:28 -07:00
Friendika
70017ebb8c diaspora encrypt+decrypt working !! 2011-08-09 02:53:51 -07:00
Friendika
07c48191b6 AES_256_CBC 2011-08-08 21:51:56 -07:00
Friendika
df3062c612 basic diaspora encryption 2011-08-08 21:44:29 -07:00
Friendika
6be5da67b1 reparenting imported item was only partially reparenting. 2011-08-08 19:10:36 -07:00
Friendika
8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika
1eec10329a guid functions 2011-08-07 16:56:26 -07:00
Friendika
48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika
aa3a14ec36 bug #117, use realname for screen_name in API if nickname missing 2011-08-05 21:30:12 -07:00
Friendika
8ae0a8a94c fix statusnet_html timelines on api 2011-08-05 07:26:54 -07:00
Friendika
112fc59e31 more api tweaks 2011-08-05 05:17:18 -07:00
Friendika
b8592dba8a integer values don't show up in xml api results 2011-08-05 01:02:12 -07:00
Friendika
2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika
12d5482fc1 some fields in API timeline JSON must be int 2011-08-04 19:47:45 -07:00
Friendika
d45a66e700 allow custom avatar sizes - needed for Diaspora hcard/vcard 2011-08-03 21:05:39 -07:00
Friendika
ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika
e22e823e93 allow group selection from contact edit page 2011-08-02 22:39:35 -07:00
Friendika
6bf800c6c8 Provide a way to lie about textlimit as far as API is concerned. 2011-08-02 20:08:40 -07:00
Friendika
1aaded10b4 api compatibility fixes 2011-08-02 20:02:07 -07:00
Friendika
2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika
8b31ff15f5 breaking up boot file (part of zot refactor) 2011-08-01 16:51:01 -07:00
Friendika
e76990ae7b bug #111 - don't parse an @ address as a feed 2011-08-01 16:15:37 -07:00
Friendika
326a873082 merge diaspora/friendika vcard formats - not yet complete 2011-08-01 05:13:59 -07:00
Friendika
823d7ba42a api/friends/ids, api/followers/ids 2011-07-31 22:22:34 -07:00
Friendika
996425206f api profiles 2011-07-31 20:01:00 -07:00
Friendika
b0a9ec0a73 better handling of api comments/replies 2011-07-31 17:52:36 -07:00
Friendika
0c9f033505 some api enhancements 2011-07-31 16:35:53 -07:00
Friendika
b96b7d4608 get attribution correct in api items 2011-07-31 00:53:46 -07:00
Friendika
149d52da8b show correct self profile in api 2011-07-30 20:48:55 -07:00
Friendika
60caffcd77 convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field 2011-07-30 01:03:24 -07:00
Friendika
dbc3283681 api/statusnet/version 2011-07-29 18:21:54 -07:00
Friendika
829dc24464 api/statusnet/config does not require login 2011-07-29 17:01:57 -07:00
Fabio Comuni
ac6945eed1 Merge remote-tracking branch 'friendika/master' 2011-07-29 17:23:09 +02:00
Fabio Comuni
b1e766dadb allow GET or POST data in statuses/update 2011-07-29 17:21:02 +02:00
Fabio Comuni
d12e2cbfe9 Fix nav template and add missing strings 2011-07-29 16:23:47 +02:00
Friendika
f47d582736 api/statusnet/config.xml 2011-07-28 21:56:56 -07:00
Friendika
41c7d71e3b make profile-jot-desc track lock state changes 2011-07-28 20:44:35 -07:00
Friendika
a45b94033e issue with remote mentions 2011-07-28 19:08:38 -07:00
Friendika
8042f874f3 more progress on key conversion functions 2011-07-28 18:16:57 -07:00
Friendika
b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika
e6c5afdf4f privacy issue introduced yesterday 2011-07-26 22:57:48 -07:00
Friendika
c17890ab62 privacy settings on event item not propagated correctly 2011-07-26 22:40:11 -07:00
Friendika
454ff3c7f0 configurable format for date input selectors 2011-07-25 20:59:25 -07:00
Friendika
ec52010e16 helper functions for Diaspora cert mangling 2011-07-25 19:57:17 -07:00
Friendika
c0749f18d6 event ownership issues 2011-07-25 18:41:48 -07:00
Fabio Comuni
23d6339a41 change to some nav ids, notice in empty notifications popup 2011-07-25 17:12:42 +02:00
Fabio Comuni
99ab06bad3 js to open close popup nav menu and to populate notification menu via ping. 
Update mod/ping to return details about messages and intros
 2011-07-25 16:54:39 +02:00
Fabio Comuni
e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Fabio Comuni
93eda9d9c1 Initial work on new UI 2011-07-22 17:37:51 +02:00
Friendika
77cea581b0 better fix for bug #107, last one was flawed 2011-07-21 20:19:55 -07:00
Friendika
f4b4f61f66 provide fake first arg to ajax updater 2011-07-21 17:55:15 -07:00
Friendika
1d7d4bf8c6 wrong path for salmon verify 2011-07-20 23:14:43 -07:00
Friendika
5307225682 ajax pause - any key to resume 2011-07-20 17:17:08 -07:00
Fabio Comuni
11d1d309c2 Recursive string replacement in template 2011-07-20 11:05:41 +02:00
Friendika
1d35d1e5a1 Merge pull request #141 from fabrixxm/newacl 
New jot ACL selector
 2011-07-19 17:24:09 -07:00
Fabio Comuni
89eefbe46c Fix style and scrollbar 2011-07-19 16:34:27 +02:00
Fabio Comuni
9fa0956966 New jot acl selector 2011-07-19 16:17:58 +02:00
Friendika
7008bec045 improved code blocks 2011-07-18 19:17:16 -07:00
Friendika
1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika
43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika
09f9e658e9 Merge branch 'pull' 2011-07-15 03:09:07 -07:00
Friendika
69f4db9e12 zot stuff 2011-07-15 03:08:43 -07:00
Friendika
f35a61761a Merge pull request #139 from fabrixxm/update 
Experiment with on-line update
 2011-07-15 01:29:46 -07:00
Friendika
c8d969e84c my -> your 2011-07-14 03:08:48 -07:00
Friendika
7534b8873b link tips on nav bar 2011-07-14 03:05:54 -07:00
Friendika
180c15cdf8 zot scraper 2011-07-11 18:28:13 -07:00
Fabio Comuni
4fdc5ff30c First test for friendika "live" update 2011-07-08 17:12:08 +02:00
Friendika
eccaa525cc 'dislike' is not part of activitystreams core schema - use symblic constants instead 2011-07-07 16:56:44 -07:00
Friendika
8cc6e69705 Merge pull request #138 from fabrixxm/master 
some minor tweaks
 2011-07-07 15:33:32 -07:00
Fabio Comuni
9dfd798368 Add post type "event" to like/unlike localizated text 2011-07-07 14:02:58 +02:00
Friendika
3f25830076 more friendika-z 2011-07-06 20:16:40 -07:00
Fabio Comuni
e7834e60f8 Update settings page to use field templates. 
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
 2011-07-06 12:10:00 +02:00
Friendika
40aa6f33b5 incorrect links for "view in context" on community page 2011-07-05 21:03:37 -07:00
Friendika
c552248b7c item tags instead of feed 2011-07-05 20:32:43 -07:00
Friendika
8992c27fa6 better handling of feed photos (e,g, google+) 2011-07-05 20:29:26 -07:00
Friendika
d7154a4606 ability to link contacts that are "really me, but on another system/network". 2011-07-05 19:55:09 -07:00
Friendika
db30a2342c undo last checkin 2011-07-05 18:21:56 -07:00
Friendika
1a4a6b5ff9 explicitly close db connections - do not rely on process exit 2011-07-05 17:45:33 -07:00
Friendika
5e1335ac89 don't show delete buttons on community page 2011-07-04 21:52:21 -07:00
Friendika
20d3aa2e77 community page 2011-07-04 20:57:07 -07:00
Friendika
5ceeb6752d starred items 2011-07-03 19:41:04 -07:00
Friendika
24836f2966 improvied group highlighting, move new group link down 2011-07-02 02:47:01 -07:00
Friendika
d28d2ff440 better (more consistent) handling of ostatus contacts 2011-07-01 18:18:01 -07:00
Friendika
9816f14d40 statusnet improvements 2011-07-01 17:39:16 -07:00
Friendika
813d6c453c missed block 2011-07-01 06:26:46 -07:00
Friendika
f53a2d6da9 add group highlight to other pages 2011-07-01 06:23:09 -07:00
Friendika
b1aa77584f indicate currently selected group in group picker 2011-07-01 06:14:15 -07:00
Friendika
6e5532149a missing minutes in event listings 2011-06-30 23:27:16 -07:00
Friendika
c08b85777a too much logging 2011-06-30 22:00:08 -07:00
Friendika
481cd708ac allow polling to mostly survive minor memory shortages. 2011-06-30 21:56:07 -07:00
Friendika
cdddfca0b5 photos were not working in private mail 2011-06-30 19:02:11 -07:00
Friendika
53653f6a4d consolidate perrmisions sql, minor duepuntozero validation fixes 2011-06-30 17:35:35 -07:00
Friendika
994011ddb6 load db configs (config,system) for all "executables" 2011-06-30 01:15:18 -07:00
Friendika
3eb0b4be2a now that we have admin interface, completely remove register approvals from notifications 2011-06-29 22:38:30 -07:00
Fabio Comuni
f4a1820110 re-added last item date in admin user page. relative_date return 'never' if null is passed 2011-06-29 16:06:32 +02:00
Friendika
baead9f4c8 very minor nit - if $abs is false, return before trying to use false in a numeric calculation 
also return 'never' if we have an uninitialised date
 2011-06-29 03:54:29 -07:00
Fabio Comuni
1e307e9869 Fix bug #98, add "never" to relative_date(), fix batch operations 2011-06-29 12:05:09 +02:00
Friendika
d5855967a7 do not translate hidden photo album 'Contact Photos' as it may become unhidden when different language is used. 2011-06-28 22:33:02 -07:00
Friendika
0b221e8945 bug #96 move libraries to library - better alignment of like rotator 2011-06-28 21:11:52 -07:00
Abinoam P. Marques Jr.
390fd8e74a Fixed: Twitter profiles link. 2011-06-27 20:51:33 -07:00
Friendika
06a4c0f703 ignore current contact on friend suggestion picker 2011-06-27 03:03:58 -07:00
Friendika
3fe1e19725 pass notify endpoint with friend suggestions 2011-06-26 19:30:57 -07:00
Friendika
c9604ef578 allow cross-site xrd/lrdd/webfinger 2011-06-25 19:40:37 -07:00
Friendika
694c1c1af4 new contact_selector function to provide more fine-tuned selection options. 2011-06-23 21:55:27 -07:00
Friendika
8ffcd4323b never enough comments 2011-06-23 18:56:24 -07:00
Friendika
a15bd91d17 don't update an event that hasn't changed. 2011-06-23 18:25:33 -07:00
Friendika
38cf37d3c3 new item view, sort by received date - not posted date. 2011-06-23 17:56:59 -07:00
Friendika
5633430a19 don't allow tags in app source 2011-06-23 15:58:43 -07:00
Friendika
0e809b9301 bug #94 mis-spell Czech 2011-06-23 14:11:23 -07:00
Friendika
96857389ac friendika-z initial implementation 2011-06-23 01:57:14 -07:00
Friendika
e6086e2363 missed some images, table border property 2011-06-21 16:45:47 -07:00
Friendika
043bde42a6 fix banding on logo, xhtml compliant list and basic table support 2011-06-21 16:29:43 -07:00
Friendika
ab143a3102 Merge pull request #123 from fabrixxm/api 
Api
 2011-06-21 03:47:27 -07:00
Fabio Comuni
655f5c7b9f use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls like "domain/<id_user>". 
This seem to make StatusNet Desktop client work better.
 2011-06-21 12:00:52 +02:00
Fabio Comuni
7cd7a79807 remove duplicate tag in atom response 2011-06-21 11:44:26 +02:00
Fabio Comuni
296f1b0123 add users infos to rss and atom api responses 2011-06-21 11:41:16 +02:00
Friendika
7f387d93ae only show app on top-level or standalone posts 2011-06-21 00:56:24 -07:00
Friendika
55112cfdd0 item source 2011-06-20 19:08:40 -07:00
Friendika
db336929cd add rate limit call so spaz will work 2011-06-20 17:16:13 -07:00
Friendika
b86ae9de7f use atom_time on atom entries 2011-06-20 01:38:26 -07:00
Friendika
f3292e68a2 user and status outputs reversed for api post 2011-06-19 21:08:51 -07:00
Friendika
b56e00c7c5 api post sort of working - output status,user need to be swapped 2011-06-19 20:13:24 -07:00
Friendika
cc7c72be90 statusnet API posting (untested as behind firewall at the moment) 2011-06-19 18:50:18 -07:00
Friendika
cf9f23fb74 Merge pull request #118 from fabrixxm/admin 
Admin work
 2011-06-18 00:17:36 -07:00
fabrixxm
23931ab719 Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example. 2011-06-18 08:29:59 +02:00
Friendika
9e2db5d5a6 tooltip for selecting items 2011-06-17 23:06:42 -07:00
Friendika
787f079d13 improved UI for checked items to be deleted 2011-06-17 22:58:15 -07:00
Friendika
a66083b3e4 imported event should not have wall flag set 2011-06-16 18:11:00 -07:00
Friendika
b61a7158da Merge pull request #116 from fabrixxm/admin 
Admin pages
 2011-06-16 15:27:12 -07:00
Fabio Comuni
ede011cc32 Admin users page. some fix to template processor. 2011-06-16 14:56:43 +02:00
Fabio Comuni
ffee5dd69e ping updates trigger 'nav-update' custom event from <nav> 2011-06-16 12:04:27 +02:00
Fabio Comuni
63390aa800 {{ if }} {{ else }} support in templates 2011-06-16 12:02:05 +02:00
Friendika
e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Friendika
7601ce7de7 iframes 2011-06-15 03:41:28 -07:00
Friendika
cee63c7a0d preserve original timezone adjust selection when editing events 2011-06-14 21:44:27 -07:00
Friendika
c379774300 add some whitespace in event html 2011-06-14 21:22:52 -07:00
Friendika
5105b3febc event calendar links, editing 2011-06-14 19:48:37 -07:00
Fabio Comuni
b1184f3fde Merge remote-tracking branch 'friendika-master/master' into admin 2011-06-14 10:37:54 +02:00
Friendika
dc10178b18 apps is not an array... 2011-06-13 21:37:56 -07:00
Friendika
05eb9ceaba avoid returning events from getting posted again 2011-06-13 20:42:37 -07:00
Friendika
fb92dbf5d6 link events + personal notes to profile tabs 2011-06-13 20:32:30 -07:00
Friendika
d5fdd4287d event sharing, cont. 2011-06-13 19:06:49 -07:00
Fabio Comuni
f80521923d Add {{ if a==b }} and {{ if a!=b }} to templates 2011-06-13 18:02:40 +02:00
Fabio Comuni
e14d5851a7 fix template's {{ for }} variable lookup 2011-06-13 12:53:41 +02:00
Fabio Comuni
494288ab9f Add admin page in nav 2011-06-13 12:52:52 +02:00
Friendika
d66056af9d reduce visibility of lang-select flag (duepuntozero) 2011-06-10 20:39:46 -07:00
Friendika
7c60701efc fixed a few feed problems affecting activity objects/targets 2011-06-10 01:51:14 -07:00
Friendika
8aaf55c1e6 event item 2011-06-09 20:02:48 -07:00
Friendika
67021c132a event communication basics 2011-06-09 16:24:29 -07:00
Friendika
d371241e66 events 2011-06-09 00:58:45 -07:00
Friendika
df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -07:00
Friendika
e2f1540f25 events, continued. Also better regex matching accounting for empty elements 2011-06-07 22:13:07 -07:00
Friendika
33fe26ecb0 more progress on events 2011-06-07 20:10:43 -07:00
Friendika
c1b2e90e37 basic saving of events 2011-06-06 22:27:38 -07:00
Friendika
fcb4316c29 tinymce for event fields 2011-06-06 21:49:07 -07:00
Friendika
9f51233451 event listings 2011-06-06 20:17:36 -07:00
Friendika
452245d988 more events framework 2011-06-06 19:59:20 -07:00
Friendika
c0094aa4f8 strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues 2011-06-06 16:26:11 -07:00
Friendika
4c629e274b begin event module 2011-06-05 23:10:07 -07:00
Friendika
4284c6f9ee use icon for language selector instead of hotkey 2011-06-05 17:32:56 -07:00
Friendika
7b02e178a4 more work on facebook re-queue 2011-06-05 02:18:18 -07:00
Friendika
182582eed8 load hooks inside queue 2011-06-05 02:09:31 -07:00
Friendika
00c548cc8f new member page 2011-06-03 06:12:34 -07:00
Friendika
a27391c33a facebook queueing on failure, sync update.php with boot.php update version to avoid race condition 2011-06-03 01:16:17 -07:00
Friendika
f2bdcb19e7 adjust acl_selector max name length to prevent div overflow 2011-06-02 20:58:44 -07:00
Friendika
1eb177235b add queue_deliver plugin hook 2011-06-02 18:26:06 -07:00
Friendika
b8c4d73377 show group affiliations in contact editor 2011-05-31 19:24:26 -07:00
Friendika
656d861b3e on rare occasions posts do not get a parent. The only thing which could cause it is if we can't find our new post. So we'll check for this and try one more time before failing. 2011-05-29 22:50:36 -07:00
Friendika
dd4d5707b0 order groups by name 2011-05-29 21:45:00 -07:00
Friendika
547fd1e0e5 small fixes to item post to try and sort out segfault issues on php 5.3 (?) 2011-05-29 15:47:26 -07:00
Friendika
4e8a97f30a bug #38 posts and photos only visible to friends if so configured 2011-05-28 00:42:01 -07:00
Friendika
b0c383a6d0 begin event module 2011-05-27 21:01:30 -07:00
Friendika
b93f0df890 email - search from, to, cc, and bcc 2011-05-27 04:07:44 -07:00
Friendika
ecb300177c troublesome feed was a 307 redirect. We didn't recognise 307 2011-05-26 23:10:40 -07:00
Friendika
2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika
73b4faca5c basic file upload/attach 2011-05-24 22:40:52 -07:00
Friendika
bc8eba4884 turn on attach display 2011-05-24 20:45:02 -07:00
Friendika
87de839974 attachment display 2011-05-24 20:41:29 -07:00
Friendika
e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Friendika
21769d7390 improve push_lang and pop_lang to do basically nothing if the new language is the same as existing 2011-05-23 20:37:36 -07:00
Friendika
040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Friendika
19ccd658eb Merge branch 'pull' 2011-05-23 18:18:01 -07:00
Friendika
78b2db3a98 Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-05-23 18:17:02 -07:00
Friendika
9a3f5eaf7d Merge pull request #107 from fabrixxm/oembed 
Oembed plugin
 2011-05-23 18:12:14 -07:00
Friendika
3e6180183b improved browser language detect, set user language on login 2011-05-23 17:18:36 -07:00
Fabio Comuni
e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message. 
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
 2011-05-23 11:39:57 +02:00
Fabio Comuni
7c5a7a94d4 Add oembed user option for use oembed instead of standard yotube embedding. 
Remove global option and parse_url use of oembed.
 2011-05-23 10:37:09 +02:00
fabrixxm
ef64c5187d add config [system][embed_all] to use oembed with links and youtube. Url parse fallback to default if url has not an oembed rappresentation. 2011-05-23 09:14:57 +02:00
fabrixxm
072e414636 Fix missing wrapping span on bbcode to html, split embed data fetch and rappresentation in two functions. Prettier video embed. 2011-05-23 09:13:35 +02:00
fabrixxm
570a22de74 update oembed plugin. embed preview in editor 2011-05-23 09:13:35 +02:00
Chris Case
150830d38c Merge remote branch 'upstream/master' 2011-05-22 19:20:12 -07:00
Chris Case
991885f1d4 improved standards compliance of some of the tags and fixed an issue which caused text to bump-over youtube video embeds 2011-05-22 19:18:58 -07:00
Friendika
44a22c2915 more improvements in twitter handling, reduce duplicates from FB when double friended 2011-05-22 18:40:00 -07:00
Friendika
ea0a28ebfb removed buggy debug code ;) 2011-05-22 14:20:31 -07:00
Friendika
f3f063c0dd Drupal doesn't provide absolute URL on feed. Fix to allow importing Drupal "contacts". 2011-05-21 19:15:55 -07:00
Friendika
ccbdc9b2fc regex stuffed up 2011-05-21 01:17:07 -07:00
Friendika
0abf2f11c6 patches for youtube's change in link and embed formats, please test 2011-05-20 15:46:41 -07:00
Friendika
681885a120 "notes" app 2011-05-20 01:15:02 -07:00
Friendika
a27b7fb28d more indicators of public visibility 2011-05-19 19:55:34 -07:00
Friendika
e51e772abc typo in email delete sql, add message sender to body for better handling of mailing lists 2011-05-19 18:53:35 -07:00
Friendika
44d5c90af4 better mailing list support, email addr can be either 'from' or 'to' 2011-05-19 17:25:41 -07:00
Friendika
a6603a54d9 don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once. 2011-05-18 20:34:18 -07:00
Friendika
990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Friendika
8fa9ca520b "show all n comments" comes back after toggled and ajax updated, plus connector doc improvements 2011-05-17 17:40:00 -07:00
Friendika
85c6457e6e bug #65 'show all nn comments', 'show more posts like this' are misleading after they've been clicked once. Solution, hide them once clicked. 2011-05-16 17:57:29 -07:00
Friendika
730322ee5f bug #70 - error messages on group deletion, warning cleanup 2011-05-15 16:36:49 -07:00
Friendika
45b9bd96ba wrong author came from feed, not from FB 2011-05-14 06:16:21 -07:00
Friendika
b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika
a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika
c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika
a5e0190f23 missing self photo on remote site comment boxes 2011-05-09 22:15:19 -07:00
Friendika
be84d51767 use local contact photo if available 2011-05-09 01:35:24 -07:00
Friendika
2c63b65e3c refactor "which link to show" logic 2011-05-06 06:30:33 -07:00
Friendika
26d748f6d8 Merge pull request #96 from fabrixxm/api 
Status.net Api
 2011-05-05 04:29:45 -07:00
Friendika
59fd70e568 issues with private photos - hitting internal size limits 2011-05-04 02:20:44 -07:00
Friendika
64a7d0b578 lost comment boxes on status.net conversations 2011-05-03 18:05:11 -07:00
Friendika
6c47f262cc warn if msg is visible to all 2011-05-01 19:50:00 -07:00
Friendika
e00068334f fix private images 2011-04-30 17:24:37 -07:00
Friendika
7d455a0395 missing location after editor was consolidated 2011-04-28 20:04:02 -07:00
fabrixxm
daa7dc983b Icons as CSS classes, hide net/home/mail/notify-update divs with no value 2011-04-28 19:01:35 +02:00
fabrixxm
976d1eaf43 API work 2011-04-27 17:46:23 +02:00
Friendika
a5d478233c misspell 2011-04-26 18:39:19 -07:00
Friendika
cde17704dd over-ride comment box 2011-04-26 18:36:51 -07:00
Friendika
a01c40a845 no insecure warning on FB connections 2011-04-26 05:45:53 -07:00
Friendika
245a56f0c1 lots of facebook fixes 2011-04-26 04:39:27 -07:00
Friendika
a0e7d8fa00 redirect to profile photo upload on very first login 2011-04-23 17:31:23 -07:00
Fabio Comuni
41f6ccc039 More works on api 2011-04-21 17:03:31 +02:00
Fabio Comuni
e472d79b1e Reworked template processor. support for "if" "for" and "inc" blocks, also nested 2011-04-21 17:03:19 +02:00
Fabio Comuni
1fb097951d work on api. 2011-04-21 09:08:50 +02:00
Fabio Comuni
b505e76393 First attemp of api 2011-04-21 09:04:15 +02:00
Friendika
e302741e49 merge status editor instances 2011-04-20 05:48:12 -07:00
Friendika
0af6014c94 keep space before t() for legacy string puller 2011-04-20 05:00:58 -07:00
Friendika
afe4cc8bfa pull request #91 fabrixxm (manual merge) 2011-04-20 04:50:12 -07:00
Friendika
afdbbaf27d photos_link not photo_link 2011-04-19 20:55:20 -07:00
Friendika
d874a55178 per contact network page (link in photo menu) 2011-04-19 20:50:02 -07:00
Friendika
a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika
2afd4c9d5a "wait" cursor when submitting comments bug #45 2011-04-18 19:08:50 -07:00
Friendika
4b6a24ec3f don't try to connect to port 0 2011-04-18 16:00:02 -07:00
Friendika
b84f49df10 Merge branch 'translateitems' of https://github.com/fabrixxm/friendika into fabrixxm-translateitems 2011-04-18 15:51:03 -07:00
Friendika
1e967eddb7 multi-user, do not cache open mbox 2011-04-18 15:16:51 -07:00
fabrixxm
1d8bd89fec translate "like"/"dislike"/"friends with" messages at print time 2011-04-18 20:38:48 +02:00
Fabio Comuni
60fbe0b39b translate verb items at display time 2011-04-18 17:37:02 +02:00
Friendika
4f952979d5 show email contacts in acl selector 2011-04-18 00:55:54 -07:00
Friendika
b81eefbffb sv language had unquoted quotes in strings 2011-04-17 23:38:12 -07:00
Friendika
ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika
7cc5a9bba9 email follow seems to be stabilising 2011-04-17 15:24:24 -07:00
Friendika
12571c42f1 we need a profile url. Something. 2011-04-16 15:48:08 -07:00
Friendika
863ddf1676 mail changes 2011-04-16 08:45:08 -07:00
Friendika
c7bcdf0c18 get meta info for email msgs 2011-04-16 01:14:25 -07:00
Friendika
27cbb830a7 more work on email contacts 2011-04-15 23:40:43 -07:00
Friendika
158b65894a initial checkin mailbox reading functions - lots more to do 2011-04-15 19:16:37 -07:00
Friendika
13eaa802e4 relocated "follow" url scraping code so it can be used elsewhere (contact repair, etc.) 2011-04-15 00:59:00 -07:00
Friendika
b5ccb8e205 ensure host xrd is correct, even if installed in subpath 2011-04-14 19:43:00 -07:00
Friendika
de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika
c3b42fdbcb it's tough getting the photo menu right in all circumstances. Lots of variables. Much better now. 2011-04-14 16:40:14 -07:00
Fabio Comuni
0afef6b17e arrays and simple conditional blocks in template, template for nav, load templates from themes 2011-04-14 09:22:38 +02:00
Friendika
767f165965 local documentation library 2011-04-13 07:07:21 -07:00
Friendika
3c4e501435 convert feed attach to bbcode 2011-04-13 01:53:40 -07:00
Friendika
e8a0dd40b2 profile visibility editor 2011-04-12 21:21:33 -07:00
Friendika
f04e2e7044 edit group links on network page 2011-04-12 18:22:58 -07:00
Friendika
5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Friendika
38014e9b4d show busy cursor during ajax call 2011-04-12 15:45:41 -07:00
Friendika
5545c8ada9 cleanup 2011-04-12 05:37:26 -07:00
Friendika
61915a524d first cut at group chooser UI 2011-04-12 01:31:55 -07:00
Friendika
4cb21fc60b cleanup 2011-04-11 20:34:10 -07:00
Friendika
0ed2d19ac8 death to comment box oddities (a slow death as it will take some time for everybody to upgrade) 2011-04-11 20:11:21 -07:00
Friendika
a4836ac1ba wallwall oddities on display page 2011-04-11 16:15:38 -07:00
Friendika
ff15ea0993 wrong variable passed 2011-04-11 15:45:19 -07:00
Friendika
8b323b566f set writable flag on all stat contacts with notify link 2011-04-11 03:30:25 -07:00
Friendika
c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -07:00
Friendika
9133a2384a all conversations unified except photos 2011-04-11 01:31:04 -07:00
Friendika
a0956ee955 some w3c validation issues 2011-04-10 23:01:38 -07:00
Friendika
7192299ff1 first cut at profile page conversation 2011-04-10 21:43:44 -07:00
Friendika
a65c595b16 "display list of status items" moved to include/conversation.php, 
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
 2011-04-10 21:21:16 -07:00
Friendika
3d51518a13 set writable flag on dfrn_poll 2011-04-10 19:29:21 -07:00
Friendika
940d216395 initial dfrn update to pass perms 2011-04-10 18:38:55 -07:00
Friendika
c12927042e nav link to help & documentation 2011-04-10 05:55:45 -07:00
Friendika
58508201a5 bug #37, ampersand + everything following in url is stripped when using link icon to share link 2011-04-10 03:36:12 -07:00
Friendika
bf865f0210 bug #34, line breaks double in retweet/share 2011-04-10 03:00:29 -07:00
Fabio Comuni
969cc6996a Fix a typo, updated IT strings 2011-04-08 12:35:42 +02:00
Friendika
e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika
cc45ac14b5 attachment storage 2011-04-06 21:59:07 -07:00
Friendika
c8d827a671 xmlify enclosure items 2011-04-06 20:36:24 -07:00
Friendika
109c25a1bd some fixes to attachment output in feed 2011-04-06 20:03:06 -07:00
Friendika
6728a11ee3 support feed attachments/enclosures, and fix for bug #30 2011-04-06 19:42:35 -07:00
Friendika
438473529c atom categories and tag import 2011-04-05 17:41:02 -07:00
Friendika
4c5e091b78 better twitter follow support 2011-04-04 20:40:31 -07:00
Friendika
793967a1d3 better handling of troublesome feeds. 2011-04-04 19:36:18 -07:00
Friendika
b5bcf44354 profile not set 2011-04-04 01:18:28 -07:00
Friendika
9b50b0e16f Public exposure warning on affected network group pages. config-able so a plugin can shut it up. 2011-04-03 20:41:40 -07:00
Friendika
08032e0453 change language dynamically - bound to F8 key 2011-03-31 04:57:31 -07:00
Friendika
89e81862ec bug #29 - commas not linkified 2011-03-30 16:18:59 -07:00
Friendika
0fe997490d dfrn remote profile protocol revision 2011-03-30 15:04:18 -07:00
Friendika
04cd865cc9 placeholder arg in dfrn conversations 2011-03-30 04:20:40 -07:00
Friendika
f198c5cff8 secure profile failure 2011-03-30 04:07:47 -07:00
Friendika
8f547283c0 update comment count as new comments come in 2011-03-29 18:20:52 -07:00
Friendika
ca113bfaa0 change link to project website 2011-03-24 21:10:51 -07:00
Friendika
82bd1ce3cb installation issues 2011-03-21 03:33:58 -07:00
Friendika
b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
Friendika
be67cf663b minor edits 2011-03-19 05:10:05 -07:00
Friendika
7e33c1072a stuff to make connecting to diaspora profiles easier 2011-03-19 01:19:11 -07:00
Friendika
9838245c6c Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext 2011-03-18 05:07:42 -07:00
Friendika
ea03d9fa86 more thorough cleanup on account/contact removal 2011-03-17 21:15:27 -07:00
Friendika
f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika
4cc20f1288 fix youtube videos that use https:// urls 2011-03-15 00:56:25 -07:00
Friendika
852ea1aedd force last-child on foster children, disallow time travel 2011-03-14 18:34:58 -07:00
Friendika
f2734681e5 friend finder support functions 2011-03-13 22:07:56 -07:00
Friendika
aebf9bb4d6 non-code change 2011-03-13 19:12:46 -07:00
Friendika
0cf647bf6f don't let somebody install with a bogus db hostname as this seems to lead to spectacular failure modes 2011-03-13 16:47:41 -07:00
fabrixxm
8a40c718fb Move translation functions. Add tt() for plural cases. 2011-03-11 00:18:29 +01:00
Friendika
35c3e12df5 ability to edit image permissions 2011-03-09 21:10:16 -08:00
Friendika
32e96d2647 reload plugins if they change 2011-03-09 02:12:32 -08:00
Friendika
c40944fc86 inherit 'wall' setting from parent post on remote item 2011-03-08 14:40:33 -08:00
Friendika
216f038456 icon changes, feed security improvements 2011-03-04 20:55:32 -08:00
Friendika
69e2252fd6 that would be mysql !i! connect_errno... 2011-03-03 15:47:13 -08:00
Friendika
b8757fb456 make sure db queries never get called if the database isn't open 2011-03-03 15:41:08 -08:00
Friendika
6480fd73a7 units conversion app - needs some styling and code cleanup 2011-03-02 03:25:12 -08:00
Friendika
377f991ac5 switch identities to manage pages 2011-03-01 20:18:47 -08:00
Friendika
5ff1462e1e install issue (memory exhausted) due to incorrect db open check 2011-03-01 16:24:22 -08:00
Friendika
80ed4242ee singleuser site mode plus fix search template layout 2011-02-28 19:44:47 -08:00
Friendika
f089b1610e feeds: update content when updated/edited changes 2011-02-28 18:24:32 -08:00
Friendika
05d3eb59ec status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower. 2011-02-26 01:53:18 -08:00
Friendika
8ed085c64e don't truncate names across multi-byte char sequences 2011-02-24 03:48:21 -08:00
Friendika
755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika
365ff94137 push directory on register - if permitted 2011-02-23 01:37:15 -08:00
Friendika
a5b80e5d56 add some calendaring functions 2011-02-22 20:08:15 -08:00
Friendika
5f2f644064 resolve file inclusion conflicts w/ multiple plugins, improve the typo checker 2011-02-21 20:19:33 -08:00
Friendika
ee35c06a8d more punctuation characters added to linkify patterns 2011-02-20 20:20:33 -08:00
Friendika
af0fe4cf42 Merge branch 'chriscase-master' 
Conflicts:
	mod/dfrn_notify.php
 2011-02-20 01:42:11 -08:00
Chris Case
dba7874131 added reusable EmailNotification library to facilitate more efficient maintenance of email related code 2011-02-19 05:33:42 -08:00
Friendika
642a71ffde app menu - and a demo application 'tictac' 2011-02-19 00:56:15 -08:00
Friendika
45bd7d5e29 no delimiter if empty 2011-02-17 01:06:20 -08:00
Friendika
f7b2f9f5e7 convert update script arg passing to js - remembering the browser prefetch issues 2011-02-17 00:40:35 -08:00
Friendika
4bff52990e ajax reload fixes 2011-02-16 21:17:49 -08:00
Friendika
527e050ecc sanitise all incoming url's - also stop them from getting mangled by simplepie 2011-02-16 17:32:15 -08:00
Friendika
fb3bb41dc2 Merge branch 'fabrixxm-master' 2011-02-16 02:09:02 -08:00
Friendika
9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -08:00
Fabio Comuni
c8116932c2 Fix #8 \"recycle symbol getting mangled from status.net retweets\" 2011-02-16 09:22:32 +01:00
Friendika
b87ddbd58a Merge branch 'ajaxcomms' 
Conflicts:
	view/comment_item.tpl
 2011-02-14 04:46:49 -08:00
Friendika
39dd36176b ajax comments 2011-02-14 04:43:19 -08:00
Friendika
e32cda6542 app not defined 2011-02-13 13:35:08 -08:00
Friendika
ee46a028d6 more test ajax comments 2011-02-12 03:42:57 -08:00
Friendika
0bfe63e7d8 reinstate send slaps but only at the top level (and followup) 2011-02-11 03:17:16 -08:00
Friendika
de2c9531db post permission hooks 2011-02-09 19:39:49 -08:00
Friendika
05c52ae81d preserve newlines inside <pre> tags when importing feeds 2011-02-09 17:51:05 -08:00
Friendika
971b16ea4a Accept pretty much bloody anything inside a [url] tag as a legal URL. 2011-02-09 16:55:31 -08:00
Friendika
5899ae9017 Support bbcode size tag - I may regret this... 2011-02-08 21:26:28 -08:00
Friendika
6b8bbef6c7 suppress parse warnings 2011-02-08 20:55:34 -08:00
Friendika
f70a0b0282 more graceful handling of some statusnet followups 2011-02-08 18:44:30 -08:00
Friendika
9a1e5aaf09 tweaks to reworked remote deletion, which also fixes some comment box oddities 2011-02-08 05:08:10 -08:00
Friendika
d8cd693f11 rework remote deletion 2011-02-08 04:25:27 -08:00
Friendika
9f5d3000c7 don't change photo visibility if only album name was changed 2011-02-07 21:16:39 -08:00
Friendika
18c5d1ff90 feed cleanup 2011-02-07 17:06:04 -08:00
Friendika
0d9ed48738 functionise birthday 2011-02-06 22:41:07 -08:00
Friendika
b96d6c015b fix contact photo updates - a result of baseurl being wrong for cmdline processes 2011-02-06 19:15:20 -08:00
Friendika
147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme. 
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
 2011-02-06 15:50:50 -08:00
Friendika
8e988341d0 Merge branch 'fabrixxm-master' 2011-02-06 13:27:52 -08:00
fabrixxm
64be33a3ff fixed missing close parenthesis 2011-02-06 21:24:41 +01:00
Friendika
ac3f3a6e9f kill orphans 2011-02-06 02:33:02 -08:00
Friendika
8cced061bb found it - typo 2011-02-04 13:40:51 -08:00
Friendika
1d0d765344 more error checking on posts 2011-02-04 13:37:04 -08:00
Friendika
2a9bfae2b7 prevent runaway notifications when parent=0 due to race condition 2011-02-04 04:25:53 -08:00
Friendika
c6b00f7230 allow parentless items from SN - add more tracing on notify failures 2011-02-03 17:40:04 -08:00
Friendika
01cd7cc9f2 don't parse garbage in phase2 of dfrn_deliver either 2011-02-03 04:19:05 -08:00
Friendika
a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika
0a32370e32 silence php notices about $manual_id not being defined 2011-02-02 19:56:27 -08:00
Friendika
a8cea3f30c don't try to parse non-xml in dfrn_deliver 2011-02-02 19:28:40 -08:00
Friendika
25c2640c17 be more forgiving about the order of link parameters in html->bb 2011-02-02 18:09:27 -08:00
Friendika
ee45dee932 suppress some scraping errors when confronted with hybrid/strange 
feeds that provide insufficient content-type and choke the html parser.
 2011-02-02 14:48:27 -08:00
Friendika
fce9988f73 backward compatibility 2011-02-01 22:45:46 -08:00
Friendika
a347d040f0 protocol reversal, roll dfrn_version to 2.1 2011-02-01 21:21:47 -08:00
Friendika
22acba2460 trying to solve the double encoding issue 2011-02-01 18:20:25 -08:00
Friendika
bafae56b39 make sure content is unaltered 2011-02-01 17:50:49 -08:00
Friendika
968e8bb9c4 typo 2011-02-01 17:05:17 -08:00
Friendika
6a4ae2e845 get correct article timestamp for feeds with no 'published' and with non-utc stamps 2011-02-01 16:50:19 -08:00
Friendika
8c5c07b265 don't try to scrape atom/rss feeds. missing param in contact store (mod_follow) 2011-02-01 14:55:29 -08:00
Friendika
8acc76a3c6 provide ability to survive transport mangling when travelling through html networks 2011-02-01 05:10:04 -08:00
Friendika
9d561d4471 oembed contsant name, fix dfrnpubdeliver, add 'code' editor button 2011-01-31 23:06:45 -08:00
Friendika
2cd1da5462 readjust name length limits - acl selector 2011-01-31 19:53:40 -08:00
Friendika
e2544abd50 truncate names in acl selector 2011-01-31 19:49:56 -08:00
Friendika
082909fe1a Merge branch 'fabrixxm-oembed' 2011-01-31 15:26:02 -08:00
Friendika
1908c7ad82 deliver up to 150 contacts per person using dfrn - in case hub is whacked 2011-01-31 14:01:38 -08:00
Fabio Comuni
bdbbfe17b0 cache oembed request 2011-01-31 17:23:55 +01:00
Fabio Comuni
3dbca2a804 delete old cache in poller.php 2011-01-31 17:16:35 +01:00
Fabio Comuni
49ea05b8ff use microformat to mark html from [embed] tag, convert html with oembed microformat to [embed] tag 2011-01-31 16:45:58 +01:00
Fabio Comuni
6ea87223d3 Add 'system''no_oembed' config option 2011-01-31 11:00:35 +01:00
Fabio Comuni
23d1b994cc Move [embed] bbtag from oembed plugin to core 2011-01-31 10:38:49 +01:00
Friendika
d8877b88d6 limit privacy ACL's to networks which can handle privacy 2011-01-30 22:45:02 -08:00
Friendika
6935d34e76 disable "take me home" hotkey, different on FF (shift-home), IE ($). 2011-01-30 19:49:26 -08:00
Friendika
3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -08:00
Friendika
a598f17e6d wrong ref in ssl policy 2011-01-30 18:25:41 -08:00
Friendika
26cc2e02fe Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-01-28 18:50:20 -08:00
Fabio Comuni
ef33ca6750 modded scripts to be runned in cli so they can be included and executed in main program 2011-01-28 14:04:18 +01:00
Friendika
ebba294189 remote links 2011-01-27 14:34:11 -08:00
Friendika
c7ace10ffb dissolve relationship (new protocol) working 2011-01-26 02:32:00 -08:00
Friendika
696eff1031 no comment box if no notify, not no poll 2011-01-25 18:25:04 -08:00
Friendika
5a7ff660c4 "unfriend" protocol 2011-01-25 03:57:10 -08:00
Friendika
08d6fe5ae7 allow RSS for feed contacts, but no comments 2011-01-24 19:36:20 -08:00
fabrixxm
2020ea23b1 Mods to script runned via CLI to permits to run also included 2011-01-24 22:01:56 +01:00
Friendika
a068f8e614 linkify - need at least one character after :// 2011-01-24 00:00:57 -08:00
Friendika
5be98e3ec8 following random feeds 2011-01-23 20:09:34 -08:00
Friendika
ab62b8f712 fix quotes (again) 2011-01-23 03:25:03 -08:00
Friendika
461625e378 new network types 2011-01-23 02:45:37 -08:00
Friendika
6c0218563f linkify naked urls when they are at the beginning of the text 2011-01-22 05:19:53 -08:00
Friendika
c574e4c587 repair double-encoded double quotes 2011-01-20 21:02:02 -08:00
fabrixxm
2ea85fd67e show 'login' tab selected on login page 2011-01-20 20:16:57 +01:00
Friendika
028460a5c1 tracking errant bin2hex call 2011-01-17 21:08:16 -08:00
Friendika
fa1f2ce8f3 fix some linebreak issues 2011-01-17 19:50:18 -08:00
Friendika
710cb7d13c activity object link had incorrect attribute, highlight critical install steps 2011-01-17 16:06:22 -08:00
Friendika
d5ac7e938b newlines were getting stripped 2011-01-16 23:48:44 -08:00
Friendika
2e0a3e0693 birthday notifications: missing div close 2011-01-16 17:56:26 -08:00
Friendika
f4ebd2a213 Don't send conversation slaps, only immediate replies. Redundant and flawed. 2011-01-16 14:58:07 -08:00
Friendika
456a7a9740 string update 2011-01-14 02:16:30 -08:00
Friendika
a1c069ee02 compatibility: version discovery 2011-01-14 02:04:09 -08:00
Friendika
5bfb0ba4c2 birthday notifications working 2011-01-13 20:28:33 -08:00
Friendika
3494b23bfe create birthday event from feed 2011-01-13 15:45:42 -08:00
Friendika
9d6f3aa4dd add owner's birthday information to feed (if allowed to) 2011-01-12 21:04:49 -08:00
Friendika
89a28bf0f7 preserve body content in feed to extract microformat stuff 2011-01-12 13:21:37 -08:00
Friendika
91db3b3f41 more doco on header/nav region 2011-01-11 14:20:01 -08:00
Friendika
9493c29810 more defensive measures against failed or lost DB 2011-01-10 20:14:19 -08:00
Friendika
cb1832a755 fallback dbesc() when db is not there 2011-01-10 13:57:59 -08:00
Friendika
b2176538f4 add page start/end hooks, cleanup couple of notice msgs 2011-01-10 13:45:42 -08:00
Friendika
85b0eca9c1 call get_app() 2011-01-09 13:18:56 -08:00
Friendika
618adb1593 missing 'else' 2011-01-07 14:31:05 -08:00
Friendika
1b0ddc928d make home tab work from remote profile, fix link in comment notify emails 2011-01-05 01:53:34 -08:00
Friendika
45c1559b38 Merge branch 'fabrixxm-master' 2011-01-04 16:42:11 -08:00
Friendika
45d8676dc2 use shift-home instead to take you home 2011-01-04 14:35:12 -08:00
fabrixxm
ea978af9c1 Merge branch 'friendika-master' 2011-01-04 14:48:19 +01:00
fabrixxm
0df91fd9a2 Manage user registrations in REGISTER_APPROVE mode. 2011-01-04 14:46:08 +01:00
Friendika
64628c800d provide "return home" key 2011-01-04 05:06:10 -08:00
Friendika
236474da0b convert received ostatus unfollow verb to activity streams stop-following 2011-01-04 02:20:00 -08:00
fabrixxm
c061603746 import items from feeds in inverse date order 2011-01-03 10:04:54 +01:00
Friendika
d8985b3a54 try to auto-fill the profile address if we actually do know it. 2011-01-01 13:12:31 -08:00
Friendika
ca83d24c02 and slashes - sigh... 2010-12-30 23:48:11 -08:00
Friendika
e490c9459d and right angles 2010-12-30 21:09:58 -08:00
Friendika
53928bec87 oops escape left angles in expressions 2010-12-30 21:08:06 -08:00
Friendika
afaacd134c linkify audio/video links for non-html5 browsers (or those with unsupported codecs?) 2010-12-30 18:43:42 -08:00
Friendika
9296d178b3 html5 video/audio support - still needs multiple source 
selection,  and check that it isn't blocked by html purifier
 2010-12-30 18:32:49 -08:00
Friendika
98dcc19511 page_header hook 2010-12-30 14:36:35 -08:00
Friendika
279469ab35 plugin hooks for bbcode conversions 2010-12-30 14:21:05 -08:00
Friendika
fd9b506c2f Add sample external authentication plugin (ldap) 2010-12-27 14:59:26 -08:00
Friendika
f6556e0a72 more plugin hooks 2010-12-25 15:01:02 -08:00
Friendika
3ba322889f undo one of the hooks from last checkin - passing objects led to error 2010-12-24 19:04:40 -08:00
Friendika
10731ea361 more plugin hooks 2010-12-24 18:32:23 -08:00
Friendika
c217e9da34 add authentication plugin hooks 2010-12-24 15:59:12 -08:00
Friendika
e287014b98 navigation aid: show server name on page 2010-12-22 20:04:20 -08:00
Friendika
0e6eb4d002 link the logo text 2010-12-22 19:23:54 -08:00
Friendika
6808d53d0f plugin/addon API landing - still things left to do before it's useful 2010-12-22 14:16:22 -08:00
Friendika
5b1fde8b0f allow configurable poll interval override when hub is used 2010-12-21 14:51:26 -08:00
Friendika
b9ca44678d match the documentation 2010-12-19 19:55:03 -08:00
Friendika
f60f82727f register/login timestamps 2010-12-16 16:35:45 -08:00
Friendika
df2e79dcaf prevent concurrent ajax updates 2010-12-15 14:41:24 -08:00
Friendika
d8c5c1cd6b added brand link 2010-12-14 15:21:31 -08:00
Friendika
1cffecd1be footer is serving no useful purpose. 2010-12-12 17:40:23 -08:00
Friendika
b7abdf8795 fix youtube videos on FF 2010-12-09 13:41:08 -08:00
Friendika
03c1e5a5ad never enough comments 2010-12-08 23:08:59 -08:00
Friendika
a42b9ea3de display the fact that a conversation is private without disclosing the details of who can/cannot see it. 2010-12-07 20:47:53 -08:00
Friendika
e241c401cf significantly enhanced profile security 2010-12-07 19:40:12 -08:00
Friendika
8eea856131 no newline at EOF 2010-12-05 19:42:28 -08:00
Friendika
e9a1abd133 flatten conversation hierarchy to one level on import but preserve all thread info 
in case somebody wants to write a plugin to display as multi-level thread
 2010-12-04 23:16:16 -08:00
Friendika
4d84a87ce4 cache result of (expensive) security check for visitor rights 
begin tightening x-profile security
 2010-12-02 21:09:55 -08:00
Friendika
e09d164882 ignore malformed xml before it hits the parser. 2010-12-02 18:32:46 -08:00
Friendika
42d66874be improved linkification of naked text urls 2010-12-01 21:13:09 -08:00
Friendika
9513f1f166 rino recipient patch 2010-12-01 13:39:00 -08:00
Friendika
99bbc29747 rino landing 2010-11-30 18:32:34 -08:00
Friendika
67e827e128 paranoid option to reduce session hijacking by enforcing an IP match on session validation. This is not claimed to be a perfect solution to the problem by any stretch, it merely raises the bar on the script kiddies to the detriment of those whose dynamic IPs aren't long lived. For these reasons it is opt-in. 2010-11-29 23:16:14 -08:00
Friendika
3672335dec 15 gender choices, 12 sexual preference choices and 30 relationship status options are probably adequate. :-) 2010-11-29 20:56:54 -08:00
Friendika
62bb471ba0 localise login template, allow openid to be disabled 2010-11-28 20:58:23 -08:00
Friendika
34a8fb935d no newlines in tags 2010-11-28 14:43:14 -08:00
Friendika
1cd20e1757 array_unique didn't have a second argument before PHP 5.2.9 2010-11-26 02:38:41 -08:00
Friendika
e15b1a8755 don't attempt to deliver queued items to sites which have already timed out 2010-11-25 23:42:03 -08:00
Friendika
cce7380756 more optimising when confronted with dead servers 2010-11-25 18:50:28 -08:00
Friendika
60ef474d46 log queue startup 2010-11-25 18:31:33 -08:00
Friendika
a1458f899a change remote welcome message 2010-11-25 18:22:54 -08:00
Friendika
847c264787 wrong function name 2010-11-25 17:27:56 -08:00
Friendika
041df1c011 queue logging 2010-11-25 15:50:08 -08:00
Friendika
0a03a710b3 ensuring all non-deliveries get in the queue 2010-11-25 15:03:59 -08:00
Friendika
ca706ccbed added more notifier logging 2010-11-25 02:53:19 -08:00
Friendika
9d7130e403 tag search boolean mode 2010-11-24 19:25:47 -08:00
Friendika
dd52aec243 use optional openid photo for registration - if supplied 2010-11-23 20:56:20 -08:00
Friendika
f9f08b4355 send unfollow before removing ostatus contact 2010-11-23 19:29:38 -08:00
Friendika
81e1e4245b premature removal of queue item 2010-11-23 17:08:35 -08:00
Friendika
9be4b3482e drop mail delivered flag now that queue is implemented 2010-11-23 16:08:48 -08:00
Friendika
1278305de9 salmon error handling issue 2010-11-22 19:58:35 -08:00
Friendika
fb58801aa4 schedule the queue re-delivery process 2010-11-22 15:30:52 -08:00
Friendika
0bcb68200e queue/redeliver module 2010-11-22 14:53:25 -08:00
Friendika
2528c40269 return code is no longer a string 2010-11-21 23:07:25 -08:00
Friendika
de6c777d3f infrastructure for queueing, redelivery 2010-11-21 23:00:01 -08:00
Friendika
72fd6eec4b make sure to use local avatar if we have one 2010-11-21 17:36:01 -08:00
Friendika
f1630780e9 add google buzz 2010-11-21 15:25:10 -08:00
Friendika
1131b2ea53 minor layout stuff 2010-11-18 17:42:23 -08:00
Friendika
0c7ae3aeee smooth a few rough edges of openid 2010-11-18 15:06:33 -08:00
Friendika
875b31fb8e openid logins working 2010-11-17 17:03:27 -08:00
Friendika
c2086ec50e pull some template strings 2010-11-16 23:26:14 -08:00
Friendika
5d47417711 more view cleanup 2010-11-15 21:06:44 -08:00
Friendika
8c395f96de view directory cleanup 2010-11-15 21:02:59 -08:00
Friendika
c2b4791af0 prevent redirect loop if an account is manually removed while logged in 2010-11-15 16:55:11 -08:00
Friendika
eae34f323b add openid slot to db 2010-11-14 15:17:27 -08:00
Friendika
7db4a0dd2e give orphans a second chance, linkify naked links 2010-11-11 20:32:20 -08:00
Friendika
7be66b1d91 ff account manager 2010-11-11 02:49:28 -08:00
Friendika
29b9d18871 lint 2010-11-09 20:38:24 -08:00
Friendika
f4fd679928 couple of issues w/ profile photo update propogation 2010-11-09 18:24:35 -08:00
Friendika
f7c0480f1b use raw db queries wherever query items could contain '%' 2010-11-09 15:11:47 -08:00
Friendika
098478e3a5 linkify hash tags 2010-11-08 22:39:03 -08:00
Friendika
1f4048067e more refactor remote reply off network 2010-11-08 20:56:09 -08:00
Friendika
e521dfd5e6 refactor outgoing comment ability for off network contacts 2010-11-08 20:43:58 -08:00
Friendika
188b1d2d6f participate in public conversations 2010-11-08 20:15:42 -08:00
Friendika
4514927128 added search 2010-11-08 17:30:00 -08:00
Friendika
a8d6d72b7b use date ordering on public feeds 2010-11-08 01:11:50 -08:00
Friendika
fbb0166690 lint 2010-11-07 21:07:47 -08:00
Friendika
9e35fb26f7 lint 2010-11-07 17:29:30 -08:00
Friendika
05236adf0f notification email on follow activities 2010-11-06 14:40:19 -07:00
Friendika
db22a6cbe0 installation var mis-tagged 2010-11-05 22:23:11 -07:00
Friendika
05cd91129e branding 2010-11-05 22:20:33 -07:00
Friendika
206eee0229 preserve newlines on all networks 2010-11-05 02:19:39 -07:00
Friendika
b94cb8d234 add micro profile photo 2010-11-04 23:50:32 -07:00
Friendika
4cba826a2f hub anomolies & swat0 compliance 2010-11-04 20:47:44 -07:00
Friendika
8341ce9ce8 ativity rel links went to target instead of object 2010-11-04 03:23:09 -07:00
Friendika
95a425a1f3 minor stuff 2010-11-04 00:37:29 -07:00
Friendika
4f8445760c cleanup photo page a bit more, some work on branding 2010-11-04 00:19:10 -07:00
Friendika
b3856a797b show like/dislike when no comments yet, bit of lint 2010-11-03 19:47:07 -07:00
Friendika
a985ad4a54 add activity target to items, allow multiple link relations 2010-11-03 16:48:21 -07:00
Friendika
98a508532f fix like/dislike refresh on photos/display items 2010-11-02 22:21:49 -07:00
Friendika
07b78e9d1c more branding 2010-11-02 21:25:59 -07:00
Mike Macgirvin
2a23a7e840 project rename 2010-11-02 20:17:46 -07:00
Mike Macgirvin
d8630dbdd8 infrastructure for swat0 (#fsw) 2010-11-01 23:42:26 -07:00
Mike Macgirvin
36a77c6db2 build feeds rather than template them 2010-11-01 17:56:36 -07:00
Mike Macgirvin
4f4d6bace6 add rel=mentioned links for tagged persons 2010-10-31 21:57:30 -07:00
Mike Macgirvin
b376f21533 notify folks who have been tagged in a post 2010-10-31 20:36:59 -07:00
Mike Macgirvin
f0b6400584 more lint 2010-10-31 16:38:22 -07:00
Mike Macgirvin
fab63ca751 -Wall cleanup 2010-10-30 13:25:37 -07:00
Mike Macgirvin
f01e8743fc match schemeless activities per the latest activity spec 2010-10-27 15:50:44 -07:00
Mike Macgirvin
2028e1695c rework the logging interface 2010-10-26 22:09:13 -07:00
Mike Macgirvin
eb5e6aae72 a few more fsw tweaks 2010-10-26 19:01:16 -07:00
Mike Macgirvin
d453560be9 more robust (though wasteful) salmon, try both encodings 2010-10-26 15:56:19 -07:00
Mike Macgirvin
d2e20d029a de-duplicate photo importation logic 2010-10-26 14:50:38 -07:00
Mike Macgirvin
c16f314ec3 two-way subscriptions working with federated social accounts 2010-10-25 21:52:30 -07:00
Mike Macgirvin
1335ef7595 no sparkle on federated network 2010-10-24 21:10:52 -07:00
Mike Macgirvin
b41218ca30 workflow for federated/non-dfrn followers 2010-10-24 20:39:24 -07:00
Mike Macgirvin
b8b227b328 add nicknames to contact records (going forward and retroactive) 2010-10-23 01:20:26 -07:00
Mike Macgirvin
d850badf2b pull out follow, unfollow and as:actor for handling 2010-10-21 21:48:22 -07:00
Mike Macgirvin
8d59ff3c06 aid salmon discovery for feed scrapers that look for the old-style rel type. 2010-10-21 18:07:22 -07:00
Mike Macgirvin
a8a88d2532 clean up the salmon consumer bits 2010-10-21 15:32:09 -07:00
Mike Macgirvin
5edee3c4d1 magic-envelope verification, status.net appears to do it wrong. 
Ultimately we need to do it right (or why bother having a spec?),
and fallback to doing it wrong if we're talking to a broken system - which
ironically seems to include most of the federated social web projects.
 2010-10-21 04:53:43 -07:00
Mike Macgirvin
a8e4ec7801 use browser geolocation when desired 2010-10-19 20:52:05 -07:00
Mike Macgirvin
3876cab8ea sorting out the last(?) quirks in group pages. 2010-10-18 16:38:48 -07:00
Mike Macgirvin
ac824fe83e eradicate redundant get_uid function 2010-10-18 14:34:59 -07:00
Mike Macgirvin
664cf8ac8e pass community page permissions through notification feeds 2010-10-18 03:02:51 -07:00
Mike Macgirvin
be981a4f8a wrong type comparison (string, int) which was the cause of the last problem. 2010-10-17 20:27:27 -07:00
Mike Macgirvin
1d2fdb259e funny behaviour with post permissions after recent changes 2010-10-17 20:24:58 -07:00
Mike Macgirvin
3789c288a7 dash, not underscore 2010-10-17 20:13:45 -07:00
Mike Macgirvin
0f47ac282c celebrity/group/community pages about 75% implemented 2010-10-17 20:04:17 -07:00
Mike Macgirvin
36e1afa6ae allow login by username and multiple unique email addresses on system - this will provide support for group/celebrity pages (coming soon). 2010-10-16 20:38:27 -07:00
Mike Macgirvin
6d646e9df5 don't allow ignored contacts to post through the hub, change default poll 
for hub subscribers to once a day now that we can utilise multiple hubs.
 2010-10-15 04:58:13 -07:00
Mike Macgirvin
35a9b49ed0 allow for multiple pubsub hubs so everything can still work when/if one goes flaky 
(Google's hub has been particularly unreliable recently and the symptoms are that
you just stop receiving updates, and/or updates you send are silently dropped and
never delivered). Also add more instrumentation to help debug pubsub issues.
 2010-10-15 04:20:42 -07:00
Mike Macgirvin
d96ae0f9f5 can no longer avoid recording the curl response code 2010-10-13 22:01:23 -07:00
Mike Macgirvin
033935c194 cleanup to ensure protocol version is passed properly. We will need it if/when any incompatible protocol changes are introduced. 2010-10-12 20:29:04 -07:00
Mike Macgirvin
f1977d420e minor cleanup 2010-10-12 17:11:06 -07:00
Mike Macgirvin
dba866c689 more comprehensive XRD linkages 2010-10-12 04:39:32 -07:00
Mike Macgirvin
013d2604f8 inline salmon magic keys 2010-10-12 04:07:03 -07:00
Mike Macgirvin
eafd225bdd protocol revision, send dfrn_confirm binary items as hex 2010-10-11 03:16:25 -07:00
Mike Macgirvin
dcb7bc5e71 Use dual delivery when dealing with flaky hub, reduce poll to once/hour 2010-10-10 21:08:25 -07:00
Mike Macgirvin
70bd7a6509 activity objects weren't escaped properly 2010-10-10 20:02:29 -07:00
Mike Macgirvin
d8283a35ba google hub not working, this fix may be temporary or it may be permanent if the hub cannot be relied on. 2010-10-10 19:42:07 -07:00
Mike Macgirvin
0ddfdce6a4 make it much easier to debug friend acceptance issues 
by reporting specific error conditions across the wire.
 2010-10-10 16:16:29 -07:00
Mike Macgirvin
e23ec64c90 put the correct cursor on the jot links, still having some 
issues with the photo upload link, since it's overlayed with an ilayer
 2010-10-10 01:39:14 -07:00
Mike Macgirvin
948cb29302 after login from arbitrary page, send back to that page 2010-10-09 01:05:53 -07:00
Mike Macgirvin
9dc0e659d6 issue #1, need login link on profile pages 2010-10-09 00:45:09 -07:00
Mike Macgirvin
4714f3a9e1 sort out the magic cursor 2010-10-08 22:21:34 -07:00
Mike Macgirvin
f9ff5b36bf match patterns against the encoder 2010-10-07 21:18:26 -07:00
Mike Macgirvin
a0ecdd025e infrastructure for salmon 2010-10-06 19:46:44 -07:00
Mike Macgirvin
66a6fd8df0 more instrumentation 2010-10-06 18:14:11 -07:00
Mike Macgirvin
c7c3db8c54 i18n officially ready for prime time. 2010-10-06 17:40:58 -07:00
Mike Macgirvin
a6c7a233a6 more little stuff 2010-10-05 21:05:37 -07:00
Mike Macgirvin
8424f31aad a bit more robust about loading external pics 
also friend confirm was getting wrong email
 2010-10-04 16:04:52 -07:00
Mike Macgirvin
941b2331f1 xrd cannot be called before db is open to get language 2010-10-04 04:22:34 -07:00
Mike Macgirvin
336aea26dc notify hub only on public updates 2010-10-02 03:38:53 -07:00
Mike Macgirvin
7658acbe0a automatically subscribe to hub if conditions are right 2010-10-01 04:41:53 -07:00
Mike Macgirvin
f5615068ca trialing pubsubhubbub - operational tweaks 2010-10-01 02:28:06 -07:00
Mike Macgirvin
2ae38e3fbf pass params as string rather than array so it doesn't 
get changed to multipart/forma-data
 2010-09-30 22:30:18 -07:00
Mike Macgirvin
0d2650b29b the rest of pubsubhubbub except for the UI that actually turns it on 2010-09-30 21:38:45 -07:00
Mike Macgirvin
632c557008 pubsubhubbub db refinements 2010-09-30 21:00:06 -07:00
Mike Macgirvin
465ba71b58 pubsubhubbub - discovery and notifier 2010-09-30 20:24:03 -07:00
Mike Macgirvin
abe6a3286e pubsubhubbub endpoint 2010-09-30 19:41:22 -07:00
Mike Macgirvin
7ad27f5737 implement rel alternate, some corresponding last minute touchups on display module 2010-09-30 16:06:53 -07:00
Mike Macgirvin
d0bb2d3036 bloody ie8 2010-09-29 23:19:19 -07:00
Mike Macgirvin
dda5195418 show members of locked conversations 2010-09-29 22:11:26 -07:00
Mike Macgirvin
e25e40f1ef i18n string extraction util 2010-09-29 18:11:23 -07:00
Mike Macgirvin
8ba3737b3b moved a couple of translatable strings from js include file to translatable view 2010-09-29 16:09:10 -07:00
Mike Macgirvin
d150b8e8b1 inherit parent ACL's on remote children 2010-09-28 22:32:48 -07:00
Mike Macgirvin
27946c102d animate the sparkler, author was getting sparkled on own page 2010-09-27 22:43:30 -07:00
Mike Macgirvin
4d8e8de0bf clarify birthday doco, Facebook really screwed this one up. 2010-09-27 00:46:29 -07:00
Mike Macgirvin
627c65b49f doco 2010-09-27 00:38:26 -07:00
Mike Macgirvin
84d2ad8ebf cleaned up ACL expansion to remove unwanted '0' elements 2010-09-26 19:44:03 -07:00
Mike Macgirvin
34eedb503a stronger type checking on comparisons 2010-09-26 17:24:20 -07:00
Mike Macgirvin
1105cdb065 configurable logo banner 2010-09-26 16:56:45 -07:00
Mike Macgirvin
b91494d22e preliminary network abstraction, configurable debugging. 2010-09-26 16:30:21 -07:00
Mike Macgirvin
d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin
188dc1fcf8 relationship direction was too confusing to work with. instead of "in,out,both" it's now declared by role e.g. "vip,fan,bud". 2010-09-21 19:51:08 -07:00
Mike Macgirvin
399b6828f6 remove debugging on public repository 2010-09-21 17:16:34 -07:00
Mike Macgirvin
a428695f8e pass vars via javascript, not html. Also fix broken pause img on IE 2010-09-20 22:27:33 -07:00
Mike Macgirvin
3ad52463f6 more robust feed error handling, at the expense of performance. 
Pass profile owner through HTML (yuk) to the ajax updater - as
browser  pre-fetch totally buggers passing it via the server session.
 2010-09-20 19:34:44 -07:00
Mike Macgirvin
177a6d7f79 provide visual indicator when pausing ajax updates 2010-09-20 01:13:19 -07:00
Mike Macgirvin
65a420b227 theme cleanup 2010-09-18 21:11:18 -07:00
Mike Macgirvin
22429cd432 friends not being correctly unmarked for death after contact resumed 2010-09-17 16:50:30 -07:00
Mike Macgirvin
a50947a4bc like, dislike, activity streams, etc. 2010-09-17 03:10:19 -07:00
Mike Macgirvin
c5031139eb abstractify items, check photos for birthday paradox 2010-09-13 22:57:31 -07:00
Mike Macgirvin
2c96ad7739 tag each side of the duplex 2010-09-12 21:25:37 -07:00
Mike Macgirvin
19661d4c25 reverse sort order for public feeds 2010-09-10 01:45:58 -07:00
Mike Macgirvin
ca8566008d upgrading the photo and name update 2010-09-10 00:42:53 -07:00
Mike Macgirvin
3a69413f86 more preparation for activities 2010-09-09 22:02:28 -07:00
Mike Macgirvin
3a3bf273c7 item cleanup 2010-09-09 19:48:08 -07:00
Mike Macgirvin
887a8add2d populate wall element 2010-09-09 19:14:42 -07:00
Mike Macgirvin
62fdf346ff cleanup 2010-09-09 16:48:33 -07:00
Mike Macgirvin
e8c39ff49f found the missing comment box bug 2010-09-09 05:25:01 -07:00
Mike Macgirvin
f1e17b1707 undo debug statements 2010-09-09 02:00:54 -07:00
Mike Macgirvin
c59948f1dc more fixes from landing 2010-09-09 02:00:01 -07:00
Mike Macgirvin
bc9e175ced fixing typos from 2.0 landing 2010-09-09 01:49:03 -07:00
Mike Macgirvin
e800dba185 onemore missing paren 2010-09-09 01:41:02 -07:00
Mike Macgirvin
ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin
b49858b038 start on 2way comms, 2.0 dev 2010-09-02 00:31:11 -07:00
Mike Macgirvin
2d76a5c76b fix last-child in face of deletions 2010-08-29 21:55:57 -07:00
Mike Macgirvin
c35dab713d can't use ActivityStreams for location. Grrr. 2010-08-24 16:25:02 -07:00
Mike Macgirvin
828316ce70 ajax stop/resume hot key 2010-08-23 20:48:47 -07:00
Mike Macgirvin
b02e30f1cf sort out notify x-domain 2010-08-22 20:57:20 -07:00
Mike Macgirvin
709c86b2da added location tagging 2010-08-20 14:33:15 -07:00
Mike Macgirvin
f9f284ba70 share youtube videos 2010-08-19 20:52:49 -07:00
Mike Macgirvin
e0045a43e2 mongo checkin, global directory, redir rework, location basics 2010-08-19 04:59:31 -07:00
Mike Macgirvin
1a1f9b296c contact search + sync to personal edition, installer db check + curl proxy 2010-08-17 18:44:13 -07:00
Mike Macgirvin
4d34ec85cf misc little fixes 2010-08-16 22:05:04 -07:00
Mike Macgirvin
facca43e2d no more url in cmdline 2010-08-16 20:47:40 -07:00
Mike Macgirvin
30e3a65c0f full theming support 2010-08-16 05:23:26 -07:00
Mike Macgirvin
35e29e10e6 installer changes, pe sync 2010-08-15 21:49:29 -07:00
Mike Macgirvin
51f6671466 only escape dbg tags when running in server mode 2010-08-14 19:48:32 -07:00
Mike Macgirvin
8f83c4ab64 make rego button business compliant 2010-08-14 17:06:32 -07:00
Mike Macgirvin
47e9613acd mongo notification checkin, wall, comments, settings 2010-08-14 07:55:18 -07:00
Mike Macgirvin
dfd3cef734 added code, quote styles to editor 2010-08-12 01:47:08 -07:00
Mike Macgirvin
8d0ba93436 make debugging safe 2010-08-11 22:24:08 -07:00
Mike Macgirvin
d2c6fa3fa1 group removal 2010-08-11 04:14:47 -07:00
Mike Macgirvin
f4e634ad52 group drop 2010-08-11 01:48:43 -07:00
Mike Macgirvin
9662c44a17 even more fixes 2010-08-10 21:22:36 -07:00
Mike Macgirvin
d11c1c63c0 lots of fixes - most recent photo updates for contacts 2010-08-08 21:03:08 -07:00
Mike Macgirvin
adce88e564 photo editing 2010-08-07 06:20:27 -07:00
Mike Macgirvin
40a06771ff reciprocal verification on notify, poll 2010-08-05 02:57:03 -07:00
Mike Macgirvin
d090033a0a more photo progress 2010-08-04 20:03:38 -07:00
Mike Macgirvin
93d0ef4042 fixup image on wall 2010-08-02 19:06:36 -07:00
Mike Macgirvin
3fd4b4264e set frequency of poll per contact, other misc fixes (photo now has contact-id) 2010-08-01 05:46:51 -07:00
Mike Macgirvin
b399b20dee mail, i18n, etc. 2010-07-30 06:09:20 -07:00
Mike Macgirvin
050be99034 added friend viewer 2010-07-28 18:24:07 -07:00
Mike Macgirvin
fac6e7e60b link email to nav 2010-07-28 04:46:44 -07:00
Mike Macgirvin
aaa06c57e6 i18n nav menu 2010-07-28 04:13:26 -07:00
Mike Macgirvin
887a324956 readonly support for polling 2010-07-28 01:29:45 -07:00
Mike Macgirvin
fa154248dc working on readonly contact attribute 2010-07-27 22:32:21 -07:00
Mike Macgirvin
2e5fb9c37e lots of formatting, bug fixes on profile updates, i18n 2010-07-27 19:27:14 -07:00
Mike Macgirvin
e15265be3c start at i18n 2010-07-26 22:48:08 -07:00
Mike Macgirvin
557ebe4700 working on delete 2010-07-26 03:33:56 -07:00
Mike Macgirvin
9f81c3345b fixup of some nits with live update and remote comment display on profile page 2010-07-25 22:51:45 -07:00
Mike Macgirvin
52a2c7eb46 group select on network page 2010-07-25 16:27:22 -07:00
Mike Macgirvin
89c15cc092 added webfinger support 2010-07-23 16:33:34 -07:00
Mike Macgirvin
88bfe21bea first cut at ajax photo upload 2010-07-22 20:22:03 -07:00
Mike Macgirvin
466267fbb5 lotsoflittlestuff 2010-07-20 05:21:19 -07:00
Mike Macgirvin
ba8da761e6 more cleanup - start on ajax 2010-07-19 22:52:31 -07:00
Mike Macgirvin
c3fd5ed732 one true profile photo, force nicknames 2010-07-19 19:09:58 -07:00
Mike Macgirvin
6695b4a203 more bugs 2010-07-19 06:58:03 -07:00
Mike Macgirvin
bbe53699f2 bug fixes 2010-07-19 05:24:22 -07:00
Mike Macgirvin
9b0584e593 revamp of item structure 2010-07-18 23:23:18 -07:00
Mike Macgirvin
3c0c8a2dc1 poller 2010-07-18 20:49:54 -07:00
Mike Macgirvin
21f0cd206d more poll stuff ahead of item revamp 2010-07-18 20:49:10 -07:00
Mike Macgirvin
07274bb922 feed generator 2010-07-18 06:02:55 -07:00
Mike Macgirvin
5ed87a44e6 fix reference to if(item->remote-id), which now gets set more often 2010-07-18 02:54:47 -07:00
Mike Macgirvin
aff4f63ff8 remote comments working now 2010-07-17 19:26:00 -07:00
Mike Macgirvin
2a17c20fb8 remote comments - though still needs a bit more work 2010-07-17 07:03:06 -07:00
Mike Macgirvin
5e4df4b3f7 added network page 2010-07-16 17:16:50 -07:00
Mike Macgirvin
059e090b53 sorting out visitor sessions 2010-07-16 06:24:41 -07:00
Mike Macgirvin
56a37deb73 mostly done with dfrn-notify 2010-07-16 01:26:42 -07:00
Mike Macgirvin
d20e1a6f93 feed related 2010-07-14 23:04:10 -07:00
Mike Macgirvin
c4f31ec65a child conversations inherit ACL's from parent 2010-07-13 16:09:53 -07:00
Mike Macgirvin
c6267a2cd2 turn groups back into numbers 2010-07-13 02:00:53 -07:00
Mike Macgirvin
7e16f8cdae groups and acls 2010-07-12 23:08:07 -07:00
Mike Macgirvin
f30dfa8513 here if it's needed 2010-07-12 16:44:56 -07:00
Mike Macgirvin
e0e2a032cf mongo commit 2010-07-12 16:43:59 -07:00
Mike Macgirvin
b0f8cd5fe6 facebook style comments 2010-07-12 00:49:06 -07:00
Mike Macgirvin
83dc89d859 group creation 2010-07-11 06:06:30 -07:00
Mike Macgirvin
c34189c033 fix birthday 2010-07-11 04:54:39 -07:00
Mike Macgirvin
7a21a000a2 lots of little stuff 2010-07-11 02:52:47 -07:00
Mike Macgirvin
30a88a41e5 remove hidden country/state vars 2010-07-10 17:11:43 -07:00
Mike Macgirvin
44b1984136 profile additions 2010-07-10 07:09:57 -07:00
Mike Macgirvin
cb54cda174 more directory work 2010-07-09 22:47:32 -07:00
Mike Macgirvin
d24038d558 country/state selector more or less working (arghhh) 2010-07-09 07:02:22 -07:00
Mike Macgirvin
bec3d15c52 more work 2010-07-08 17:49:41 -07:00
Mike Macgirvin
9a6a60a9c1 mucho progress on notifier, email style dfrn url's 2010-07-08 07:03:25 -07:00
Mike Macgirvin
e98aaa3cbd getting deeper into notifications 2010-07-08 00:18:23 -07:00
Mike Macgirvin
4b4d680dc4 sort out anon profile display and write permissions 2010-07-07 22:44:22 -07:00
Mike Macgirvin
9cc49f27e6 minor stuff, getting ready for notify 2010-07-06 23:08:38 -07:00
Mike Macgirvin
6817c5d59a lots of work, 2way friends, comments... 2010-07-05 21:39:55 -07:00
Mike Macgirvin
f5826105bf group work, dfrn_poll 2010-07-05 03:33:02 -07:00
Mike Macgirvin
766b317070 some changes 2010-07-04 20:45:56 -07:00
Mike Macgirvin
b9e1a126c5 found good city/state selector 2010-07-01 20:47:01 -07:00
Mike Macgirvin
6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00