friendica

Author	SHA1	Message	Date
Rabuzarus	73f9d06e3e	move some html code from photos.php to photo_album.tpl	2014-12-25 16:20:55 +01:00
Michael Vogel	043c406091	Update function for creating the shadow entries.	2014-12-21 21:19:37 +01:00
Michael Vogel	d054ac8d9c	redone the changes I accidentally overwrote ... Me and GIT will never be in love ...	2014-12-21 11:02:31 +01:00
Michael Vogel	bc5c470cac	Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active	2014-12-14 12:47:16 +01:00
Michael Vogel	086b3e30c6	Clarification for the hidewall property.	2014-12-12 23:03:23 +01:00
Michael Vogel	9124d922e9	In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems.	2014-12-01 22:54:01 +01:00
Michael Vogel	9a414cc4a0	Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch	2014-11-15 19:21:54 +01:00
Fabrixxm	2fee5966f1	fix #1222	2014-11-10 15:37:52 +01:00
Fabrixxm	84e93602de	small indentation fix	2014-11-10 15:07:35 +01:00
fabrixxm	fd61391e3e	Merge pull request #1221 from annando/1411-default-value-type Fix: "not null" fields were not set	2014-11-10 09:57:42 +01:00
Michael Vogel	030784ad35	Fix for issue "Field 'type' doesn't have a default value" in the challenge table.	2014-11-08 20:52:15 +01:00
Michael Vogel	70ba1667e1	It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.	2014-11-08 00:07:21 +01:00
Michael Vogel	691aa17025	fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"	2014-10-30 00:24:23 +01:00
tobiasd	ec4e3d76bc	Merge pull request #1212 from annando/1410-remote-self Remote-Self is now working for Friendica and Diaspora contacts as well	2014-10-29 15:06:21 +01:00
Michael Vogel	59517f6e58	Remote self is now working for diaspora contacts as well.	2014-10-29 01:42:43 +01:00
Michael Vogel	3e57954807	remote-self: Moved the code in a single function and cleaned it up.	2014-10-29 01:05:09 +01:00
Michael Vogel	b1cdaefcb2	Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self	2014-10-27 11:45:39 +01:00
Michael Vogel	2b5372aebe	Forcing all non-SSL requests to SSL requests is now an option.	2014-10-26 22:15:12 +01:00
fabrixxm	4c66a3486a	Merge pull request #1207 from annando/1410-remote-self-with-keywords remote self: There is now an option if the keyswords should be used as tags or not	2014-10-24 10:55:22 +02:00
Michael Vogel	c77a63fb27	remote self: There is now an option if the keyswords should be used as tags or not.	2014-10-24 01:37:33 +02:00
Michael Vogel	26c82f210e	Merge pull request #1198 from fabrixxm/issues/1190 Issues/1190	2014-10-23 22:29:50 +02:00
Fabrixxm	f7cf72e450	fix use of $->query_string	2014-10-22 09:32:24 +02:00
Fabrixxm	63168905ec	Fix #1190	2014-10-22 09:04:32 +02:00
Michael Vogel	f6522658f6	Using "remote self" to synchronize Frandiaca accounts	2014-10-22 08:30:16 +02:00
fabrixxm	9d6bcd2572	Merge pull request #1195 from annando/1410-new-hook-getsiteinfo New hook "getsiteinfo" and "page_info_data"	2014-10-22 08:18:42 +02:00
Michael Vogel	97ec2787c6	New feature: Storing the field "extid" is now possible	2014-10-20 08:21:23 +02:00
Michael Vogel	3600289262	New hook "getsiteinfo", separating fetching site info from generating bbcode	2014-10-20 08:03:47 +02:00
Tobias Diekershoff	56cd536652	use noscrape by default, add opt-out option to disable it	2014-10-13 19:19:54 +02:00
fabrixxm	bff688ef91	Merge pull request #1175 from fabrixxm/master Friendica 'Ginger' 3.3	2014-10-06 10:18:36 +02:00
Fabrixxm	e2dc4f922c	Friendica 'Ginger' 3.3	2014-10-06 08:56:55 +02:00
Michael Vogel	759f199b6f	Created hashtags from keywords now are links. URL are cleaned from tracking data.	2014-10-03 13:02:15 +02:00
Michael Vogel	904f8ac422	Creating hashtags from keywords of a feed, when additional data should be fetched.	2014-10-03 12:18:33 +02:00
Michael Vogel	459fc2fabd	Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID.	2014-09-27 12:49:00 +02:00
Fabrixxm	51e6c30188	add id to album name tag this should be in template	2014-09-17 11:02:18 +02:00
Fabrixxm	f971f52482	remove messages link from notification tabs bar	2014-09-17 11:01:47 +02:00
Fabrixxm	fbe664cc44	fix settings page aside menu active item add aside menu to delegate page	2014-09-17 11:00:34 +02:00
Michael Vogel	f9bec79a2c	In the profiles the remote connect field was missing	2014-09-11 23:38:24 +02:00
Michael Vogel	c8482ae19e	Bugfix: When repairing the url, the nurl wasn't set.	2014-09-11 23:37:55 +02:00
fabrixxm	7687342849	fix email for - registration request - registration approval - account created by admin add a reditect after registration approval or deny	2014-09-09 22:07:47 +02:00
fabrixxm	3ac5e4508b	fix email to new registerd users. fix notification in case of error sending email.	2014-09-07 17:46:31 +02:00
fabrixxm	21b1e09fad	Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup	2014-09-07 14:28:03 +02:00
fabrixxm	a8c90155f8	db update mail via notification() remove last template	2014-09-07 14:23:03 +02:00
fabrixxm	5861bdd6e9	registration request as system notification kill the template send email to all admins	2014-09-07 13:55:02 +02:00
fabrixxm	5997fb19ee	More template gore!	2014-09-07 12:29:13 +02:00
fabrixxm	803854738b	another massacre of templates	2014-09-07 11:48:23 +02:00
fabrixxm	36a67158d2	Merge pull request #1119 from annando/1409-issue-881 The useragent string doesn't contains of the words "Mozilla" anymore	2014-09-07 11:41:51 +02:00
fabrixxm	89f8341ce8	Merge pull request #1117 from annando/1409-suppress-unsported-themes Unsupported themes aren't displayed anymore	2014-09-07 11:37:25 +02:00
fabrixxm	fe02619114	fix indentation	2014-09-07 11:31:42 +02:00
fabrixxm	9a0c37eb47	new password mail via notification() new include/text.php::deindent() function remove unused templates	2014-09-07 11:20:06 +02:00
Michael Vogel	7af5c3c560	The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url	2014-09-07 10:47:37 +02:00
fabrixxm	d85bdd8fb0	lost password verification mail via notification()	2014-09-07 10:27:39 +02:00
Michael Vogel	871b425c6e	Unsupported themes aren't displayed anymore	2014-09-07 10:06:57 +02:00
fabrixxm	1bdddebd44	connection confirm notification mail via notification() remove unused email templates add a check for unexpected reponse from server	2014-09-06 17:28:46 +02:00
Michael Vogel	3b6c6d0cd9	Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it.	2014-09-06 17:22:59 +02:00
tobiasd	0e9c8f6f1a	Merge pull request #1108 from tugelbend/master jquery update to version 1.11	2014-09-06 16:35:24 +02:00
hauke	87fa2ee2af	updated jquery to version 1.11, updated themes frost and diabook where necessary	2014-09-06 16:21:03 +02:00
tobiasd	ca1f408f9b	Merge pull request #1107 from annando/1409-issue-964 Issue 964 "Image upload from Twidere" is solved now	2014-09-06 15:57:35 +02:00
Michael Vogel	f8845b6014	Issue 964 "Image upload from Twidere" is solved now	2014-09-06 15:47:45 +02:00
Tobias Diekershoff	2312b56947	when editing a posting save it, not edit it to submit the changes	2014-09-06 12:49:34 +02:00
tobiasd	7eef05e4f5	Merge pull request #1098 from Beanow/release/profile-editor-improvements Profile editor improvements	2014-09-05 22:20:31 +02:00
Beanow	992684c362	Merge branch 'feature/edit-profile-improvements' into develop	2014-09-04 23:58:22 +02:00
Michael Vogel	e21bcb82d2	Enhance the database structure checks when they failed.	2014-09-04 09:26:56 +02:00
Michael Vogel	e32e458cb8	Added new file for ignoring threads	2014-09-04 01:04:43 +02:00
Michael Vogel	dd908c8415	Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct messages.	2014-09-03 01:03:23 +02:00
Michael Vogel	2b182b2dcf	After a new friendica contact is added, the user is directed to the contact page of the new contact. (Instead of the remote profile)	2014-09-01 16:55:16 +02:00
Michael Vogel	e35c55dd3b	Remote-self: It is now possible to chose between two different modes of mirroring.	2014-09-01 14:00:21 +02:00
Michael Vogel	4bdd905b3e	Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile.	2014-08-28 01:06:41 +02:00
Michael Vogel	4ad2bbddc7	If a post is a pure reshare, then show the profile of the original author on the display page.	2014-08-26 17:10:46 +02:00
Michael Vogel	69bb3ff637	Make the network page the new default page after login.	2014-08-25 23:34:29 +02:00
Michael Vogel	dd511ac70a	The "display" page now shows the current author profile with a "connect" link (if there is no current connection)	2014-08-25 14:09:56 +02:00
Michael Vogel	94d2557077	Vier: Some more design changes to "plus" style.	2014-08-21 01:00:56 +02:00
Michael Vogel	d23d26f44d	Reduced options when adding a friendica contact and an address was provided via URL parameter.	2014-08-21 00:56:21 +02:00
Michael Vogel	271a184e1e	proxy: Added support for long addresses. "vier": New style "Plus"	2014-08-16 01:40:38 +02:00
Michael Vogel	de75d8ca7f	Merge remote-tracking branch 'upstream/master' Conflicts: mod/admin.php	2014-08-13 00:18:05 +02:00
Michael Vogel	d4b2d3bf8a	Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.	2014-08-13 00:13:13 +02:00
tobiasd	d28c1febc7	Merge pull request #1069 from annando/master Solved (possible) encoding problem, encoding of URLs with GUID	2014-08-12 09:01:12 +02:00
tobiasd	016b6428a0	Merge pull request #1067 from Beanow/feature/noscrape Added noscrape feature.	2014-08-10 13:24:21 +02:00
Beanow	9026810496	Added noscrape feature.	2014-08-10 12:45:34 +02:00
Michael Vogel	b99737986d	The GUID in the link to the items has to be encoded, since it could contain special characters	2014-08-09 09:17:28 +02:00
tobiasd	cf0ebd952f	Merge pull request #1065 from annando/master Refreshing of the network page only when the page is at the beginning	2014-08-07 08:42:25 +02:00
Michael Vogel	f2f73799ba	When storing items, the object-type is detected and stored.	2014-08-07 08:02:24 +02:00
Michael Vogel	e974e586cc	Unified user agent string when fetching data.	2014-08-07 07:58:20 +02:00
Michael Vogel	4d6f28d224	Optimized version of the possibility to reload the content of the network page only at its top.	2014-08-02 00:35:25 +02:00
Michael Vogel	1a865bf400	New description for the option to reload the page only when on top.	2014-08-01 20:11:56 +02:00
Michael Vogel	2f89a9b3e8	Auto update of network page only at top of the page	2014-08-01 19:59:06 +02:00
fabrixxm	27024e3b1d	preferred item image size for theme, get smallest photo near scale requested themes can declare preferred image size for images in items, with $a->theme_info = array( "item_image_size" => 1 ); 0: original, 1:640px, 2:320px mod/photo.php returns the nearest scaled image near requested one if it doesn't exists, instead of nothing	2014-07-30 15:37:34 +02:00
Michael Vogel	25237c0929	Make the friendica android client work again (it had problems with the GUID in the notifications)	2014-07-26 15:01:01 +02:00
Michael Vogel	dbcfe58ea8	parse_url: Removing of warnings with invalid charsets	2014-07-24 22:50:56 +02:00
Michael Vogel	ed1dce93d6	Usage of /display/(guid) as path instead of /display/(user)/(id) Bugfix for adding tags to photos	2014-07-22 00:36:20 +02:00
Michael Vogel	bb5f797047	Preventing an endless loop while fetching site infos	2014-07-14 08:37:40 +02:00
Michael Vogel	58c3ac09a3	Improved option to suppress message flooding by some users.	2014-07-10 23:13:50 +02:00
Michael Vogel	6f5bc8d9a7	Setting the user agent to "Mozilla/5.0 (compatible; Friendica)"	2014-07-10 23:13:07 +02:00
tobiasd	829a92a10e	Merge pull request #1042 from annando/master Workaround for likes from Diaspora, disabling of the automatic reload of the network page	2014-07-10 07:45:27 +02:00
Michael Vogel	6e67d39241	Relocate the site now relocates adresses in the "unique_contacts" table as well.	2014-07-09 21:36:20 +02:00
Michael Vogel	c980e6d20d	Possibility to disable the automatic reload of the network page	2014-07-09 21:32:32 +02:00
Michael Vogel	660bd39efa	Let an item be accssible via the GUI (additionally to uid and item id)	2014-07-09 20:48:34 +02:00
Beanow	e9dc6e4faa	Some changes to the labels and an edit profile button.	2014-07-03 18:39:22 +02:00
Beanow	6089bc94b3	Extend profile editor information. * Labels for splitting fields into sections. * Security token for profile_photo action.	2014-06-28 01:31:11 +02:00
Beanow	e6364f6680	Redirect profiles list to default profile, when multi_profiles is disabled.	2014-06-28 01:30:10 +02:00
Beanow	a3895c8dee	Exposes new profile data for templating. * Boolean value of whether multi_profiles is enabled. * Array needed for yesno_field for the hide-friends option.	2014-06-27 18:12:15 +02:00
tobiasd	3600ab1ffc	Merge pull request #1033 from annando/master Temporary paths are now defined automatically	2014-06-24 06:29:35 +02:00
Michael Vogel	5ed5773f57	The temporary paths (temp, lock, itemcache) are now detected automatically when used.	2014-06-23 01:24:39 +02:00
Tobias Diekershoff	b6e546d1e3	don't add http:// if homepage is not set	2014-06-22 09:44:59 +02:00
Michael Vogel	405a0aaee2	Community: New option to reduce the maximum amount if posts per person.	2014-06-10 20:21:43 +02:00
Michael Vogel	48e2b422dd	Preparation for an bidirectional app.net connector	2014-06-04 21:25:31 +02:00
Michael Vogel	0c77cee667	New database update system that uses the database structure defined in dbstructure.php	2014-06-04 00:44:58 +02:00
Michael Vogel	13fea42d8c	Merge remote-tracking branch 'upstream/master'	2014-05-29 23:04:57 +02:00
Michael Vogel	00b8355ad5	The number of comments per post are now editable.	2014-05-29 22:26:03 +02:00
fabrixxm	d5f80f54d4	Merge pull request #999 from annando/master Starring now works again	2014-05-29 14:22:15 +02:00
Michael Vogel	3da39a0b0d	Starring now works again	2014-05-29 14:17:37 +02:00
fabrixxm	77a54c66be	Merge pull request #998 from annando/master "Vier": New font version, fallback for oembed, more tracking variables removed	2014-05-29 14:04:04 +02:00
Michael Vogel	53d925095f	Added some functionality if oembed isn't working. (Should be extended in the future)	2014-05-29 11:45:32 +02:00
tobiasd	97e74f1570	Merge pull request #987 from annando/master Auto-killing processes, somce changed code in the plaintext function and speed issues in network	2014-05-25 07:59:22 +02:00
Michael Vogel	235eae66bb	New query parameter that Speeds up the network viee when there are many contacts	2014-05-24 11:01:52 +02:00
tobiasd	01c146414c	Merge pull request #965 from annando/master Only show connectors when not "hide wall" is enabled	2014-05-10 06:28:41 +02:00
tobiasd	31312ab1d2	Merge pull request #956 from annando/master New database system that uses PDO if present/Test script for doing database upgrades.	2014-05-09 21:55:01 +02:00
Michael Vogel	5616c58535	Better error handling during install.	2014-05-09 20:44:25 +02:00
Tobias Diekershoff	fd7e17f91e	save selection to suppress language results (fix 961)	2014-05-05 13:44:33 +02:00
Michael Vogel	6b38968f80	The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users.	2014-05-04 21:11:25 +02:00
Michael Vogel	c41b1c2d55	Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons.	2014-05-03 12:04:54 +02:00
Michael Vogel	2db1029830	APC support is removed due to problems with PHP 5.5.	2014-05-03 12:02:25 +02:00
Michael Vogel	a6b03b6263	The remove page now has the settings menu.	2014-04-29 22:34:48 +02:00
Michael Vogel	7b7e372fb0	Suppress showing unsupported addons in the administration.	2014-04-29 14:22:37 +02:00
Fabrixxm	aba27ad404	fix photo comments: use $drop array as in wall_thread and search_item	2014-04-28 09:29:48 -04:00
tobiasd	a9c8aed9b1	Merge pull request #942 from davidmoerike/master Line: 68 f.	2014-04-26 09:16:03 +02:00
tobiasd	c1d14bcc98	Merge pull request #944 from annando/master Some more frontend stuff/Native Diaspora reshare	2014-04-26 09:13:17 +02:00
Michael Vogel	2846dfeb05	Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.	2014-04-26 02:22:30 +02:00
David	741aab0916	Now more friendly error message. Will tomorrow add a german translation. David	2014-04-25 06:29:03 +02:00
Tobias Diekershoff	2dfbd448a3	ideni.ca is now pump.io, so don't mention it in OStatus settings	2014-04-24 21:18:12 +02:00
Michael Vogel	9ae9b66328	Export personal data: Now the settings menu on the left side is taken from the settings module.	2014-04-24 11:58:04 +02:00
Michael Vogel	b9656cbe23	Delegations: Now the menu of the settings appears at the delegations settings	2014-04-24 11:49:11 +02:00
fabrixxm	807fc60d3e	Merge pull request #941 from annando/master Moved and renamed menu entries to improve the usability, global css, icons for social networks	2014-04-24 10:48:07 +02:00
Michael Vogel	30efb0c1e6	menu entry for "Delegations" moved to the settings.	2014-04-24 10:16:02 +02:00
David	44beff1a9a	Line: 68 f. When trying to upload a file greater than PHP's max_upload_filesize, the filesize is 0, and maybe some html code appears in the text input window of the form. Problem seems to disappear when refusing all uploads if filesize <=0.	2014-04-23 20:22:53 +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	5f3d584716	Code beautification and some more logging data - no changes in the functionality.	2014-04-04 11:02:36 +02:00
Michael Vogel	12866209e8	parse url: Emtpy values in meta headers are now ignored. Oembed data has priority. Videos are embedded with some further information.	2014-04-04 10:58:31 +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	e1a41aff05	Groups should now be fast (and accurate)	2014-03-20 23:34:09 +01:00
Michael Vogel	a03014a47c	Adding functions for the file- and category handling	2014-03-20 18:51:13 +01:00
Michael Vogel	8689ab3e1b	Now changing categories also changes them in the term table.	2014-03-20 18:48:08 +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	b23dd95c5e	OStatus auto completion: option to completely disable the auto completion.	2014-03-16 18:09:42 +01:00
Michael Vogel	285f0774a1	Auto creation of photo directory to improve caching	2014-03-16 17:49:56 +01:00
Michael Vogel	b013537124	parse url: Improvements for detecting the page type	2014-03-16 17:48:28 +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	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	37edb3079d	parse_url: Trim the content of the description field.	2014-03-02 01:00:36 +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	608d5255ec	Support for twitter cards (in both directions)	2014-02-22 15:46:19 +01:00
tobiasd	623bf1c4d1	Merge pull request #912 from annando/master More compatible "Vier", more speed and problems with some parsed characters	2014-02-17 08:00:21 +01:00
Michael Vogel	254159cc26	Only some code beautification.	2014-02-16 17:36:52 +01:00
Michael Vogel	7cba752f8a	parse url: Characters like < and > has to be escaped when showing the parsed output.	2014-02-16 17:35:01 +01:00
Michael Vogel	046096e705	Speeding up showing marked posts.	2014-02-16 17:30:42 +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	a7079d4327	Adding metadata in the schema.org format.	2014-01-26 09:58:41 +01:00
fabrixxm	d1befd9069	Merge pull request #890 from tobiasd/bbcode_in_registertext add bbcode support for the page register textfield (close #871)	2014-01-18 01:02:02 -08:00
Tobias Diekershoff	b84502c4e6	move <div> to the register.tpl	2014-01-13 14:40:26 +01:00
Tobias Diekershoff	fda7bdca2e	better logic	2014-01-13 14:25:50 +01:00
Tobias Diekershoff	0d7c91fc10	added a check for http in homepage url, this should fix issue #768	2014-01-12 09:16:46 +01:00
Tobias Diekershoff	c52ae17df4	add bbcode support for the page register textfield (Bug #871 )	2014-01-12 08:40:52 +01:00
Michael Vogel	8eedebfee3	Cleaning up some changes from the merge	2014-01-05 16:28:42 +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	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	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
fabrixxm	230ce659bd	Merge pull request #866 from annando/master API: reworked	2013-12-26 02:12:27 -08:00
Tobias Diekershoff	25d83f780d	only show the remote_self option if admin allows it	2013-12-22 19:30:09 +01:00
Tobias Diekershoff	f515def280	added remote_self as option to the contact repair dislog	2013-12-22 17:05:49 +01:00
Tobias Diekershoff	22a6c72b31	added option to the admin panel to allow users to set the remote_self flag	2013-12-22 16:14:34 +01: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	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	b0dd16696a	Solving some more SQL warnings ("limit" must never be used in update statements)	2013-12-02 20:30:24 +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	70e017745a	Just some code beautification.	2013-12-02 00:41:59 +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	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
Tobias Diekershoff	9144dd3780	rename some fields to fix issue #775	2013-11-17 16:45:24 +01:00
Tobias Diekershoff	5fd58b29e0	wording for the SUBMIT button while handling with contact groups	2013-11-17 15:33:07 +01:00
Tobias Diekershoff	4101127c01	better worting of the SUBMIT button in the settings tab and the admin panel	2013-11-17 15:22:11 +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
maase2	940f55a2ec	Update admin.php Improve the SQL query to keep the result quantity small	2013-11-10 13:23:06 +01: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
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
Tobias Diekershoff	8faeee9965	added config->info and system-suppress_language options to the admin panel	2013-10-20 16:17:39 +02:00
Michael Vogel	028dc3c3b4	Switching the user agent because CloudFlare has blocked the old one	2013-10-15 01:11:01 +02:00
Michael Vogel	e70b110984	Switching from "new share" to "old share"	2013-10-15 00:49:49 +02:00
Michael Vogel	1b0b686116	Speeding up the search for tags.	2013-10-15 00:49:13 +02:00
Michael Vogel	693b6d0fd4	Infinite scroll: At the end of the network page new content is loaded automatically	2013-10-15 00:43:11 +02:00
Michael Vogel	370d8d7063	Reverting a forced index. It was good for a profile with many entries - but not on a profile with only a few items.	2013-10-12 08:22:49 +02:00
Michael Vogel	2d1b261fad	Speed improvements of queries	2013-10-05 12:30:10 +02:00
Michael Vogel	ab7d8bc6ab	Delete all APC values before showing them in the settings and admin section	2013-09-27 23:02:59 +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
Silke Meyer	9152198927	Added link to import a profile im register tpl	2013-09-04 20:51:04 +02:00
Tobias Diekershoff	3ff982be99	we use the bugtracker on github now	2013-08-20 11:35:26 +02:00
Michael Vogel	e40bcbb4bc	Some debugging information added	2013-08-05 23:06:40 +02:00
Michael Vogel	741b932cc9	Merge remote-tracking branch 'upstream/master'	2013-08-05 20:32:02 +02:00
Michael Vogel	f70a80bbe5	Changed the tag search. This hopefully speeds it up on larger systems.	2013-08-05 20:31:08 +02:00
fabrixxm	3e4c4f53f7	Merge pull request #750 from zered/deleted_user_disp Deleted user display in admin page	2013-08-05 04:24:54 -07:00
Zered	82972be85e	Adding a "User waiting for permanent deletion" table in admin page	2013-08-05 06:08:33 +02:00
Fabrixxm	2f6333c751	remove debug code. again.	2013-08-04 03:11:01 -04:00
Fabrixxm	11d1c1ae8e	add tag to term table. fix "#xNNNN" tag filter.	2013-08-03 15:12:50 -04:00
Tobias Diekershoff	0972189372	allow admins to add a new user from the admin panel (eventually fixing oldbug #383 )	2013-07-21 08:46:57 +02:00
fabrixxm	a4a3ad5327	Merge pull request #720 from fabrixxm/feed_push Feed PuSH	2013-07-01 10:16:53 -07:00
Fabrixxm	759afb4237	uexport: fix full export - add new line after each valid json line - export table row as single json object	2013-06-28 03:16:25 -04:00
Fabrixxm	0a1697d13a	add pubsubhubbub support to feed contacts	2013-06-27 09:51:13 -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
Abinoam Jr	a29f592ba7	Fix tiny typo on mod/uimport.php	2013-05-29 10:00:35 -03:00
friendica	0cc641fbbc	messaging	2013-05-22 22:30:53 -07:00
friendica	6ec1bd2fa8	double quotes in title mess up editpost	2013-05-18 16:02:31 -07: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	2c8d33a6e2	rev update	2013-05-09 01:15:22 -07:00
Zach Prezkuta	fec4581f34	basic video playback support using VideoJS	2013-05-03 18:17:56 -06:00
friendica	36f2930e52	http status for disallowed feeds	2013-04-23 20:12:49 -07:00
friendica	115c8a53bf	issue546 via Tobias	2013-04-23 18:58:52 -07:00
Tobias Diekershoff	b6d1a1f125	tabwidth	2013-04-14 18:19:01 +02:00
Tobias Diekershoff	4dd406055c	check password when changing users email	2013-04-14 17:58:16 +02:00
Tobias Diekershoff	5827db0ea3	check current password before changing the password	2013-04-14 17:22:42 +02:00
Zach Prezkuta	2cc73dbef3	allow visiting other people's display/ links if I have a copy of the post	2013-04-07 11:38:37 -06:00
friendica	9660117c70	sync username when changed in either the default profile or the settings page	2013-04-04 15:10:14 -07:00
Tobias Diekershoff	c43e65e26b	OStatus conversation poll option in the admin panel	2013-03-25 11:00:13 +01:00
Tobias Diekershoff	4ee23069ad	typo found in the php.logs	2013-03-24 09:37:11 +01:00
Tobias Diekershoff	39cc7f4565	use _Enable Debugging_ instead of only _Debugging_ in the interface	2013-03-19 07:01:34 +01:00
friendica	108f2e1b81	Merge https://github.com/friendica/friendica into pull	2013-03-18 16:41:56 -07:00
friendica	1ff37ca4c1	double encode any text that is destined for meta fields.	2013-03-18 16:40:33 -07:00
Zach Prezkuta	03f2fa5119	prevent infinite redirect on network page for non-existant group	2013-03-16 10:11:32 -06:00
tobiasd	3bf560f22f	Merge pull request #643 from annando/master Vier - many changes	2013-03-05 22:06:39 -08:00
fermionic	1b74e3ff10	Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option fix disable embedding option description	2013-03-04 15:57:57 -08:00
Zach Prezkuta	277c47732b	fix disable embedding option description	2013-03-04 16:55:07 -07:00
Michael Vogel	86e19dda22	Vier: Some more changes to the theme. Added a switch to suppress displaying of the tags.	2013-03-05 00:46:11 +01:00
friendica	1c55b0b359	Merge pull request #639 from annando/master Community/Open Graph	2013-03-03 12:07:52 -08:00
friendica	ee70e02d0d	Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option allow admin to prevent private image embedding on hub	2013-03-03 12:07:35 -08:00
Olaf Conradi	aa7aa59def	Fix SQL error for missing AND operator AND operator was missing from WHERE clause	2013-03-03 20:44:52 +01:00
Zach Prezkuta	0187283709	allow admin to prevent private image embedding on hub	2013-03-03 09:44:41 -07:00
Michael Vogel	05597b564d	Merge remote-tracking branch 'upstream/master'	2013-03-03 16:30:18 +01:00
friendica	f07df4f667	merge	2013-03-02 15:46:54 -08:00
Michael Vogel	2866f62c88	Suppoorting Open Graph and Dublin Core when displaying single item Following link shorteners in parse_url	2013-03-02 14:46:06 +01:00
Fabrixxm	4791e5b245	install: add check for php-cli Check won't pass if $php -v won't return "(cli)"	2013-03-01 04:43:04 -05:00
Thomas Willingham	f5d15a7ff8	Add support for members-only addons	2013-02-28 00:29:06 +00:00
Tobias Diekershoff	7186331a89	Admin panel: show if an account has expired	2013-02-25 13:02:17 +01:00
Michael Vogel	c35feb27f2	community: Only show top postings, no comments parse_url: Follow location in "meta"-header	2013-02-24 12:54:53 +01:00
Zach Prezkuta	3843f821b2	better description	2013-02-23 09:33:29 -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
Michael Vogel	0d4d15c73d	Merge remote-tracking branch 'upstream/master' Conflicts: mod/admin.php	2013-02-20 21:57:26 +01: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
Tobias Diekershoff	8e65e95d17	add multi vs. single user config to the admin panel	2013-02-17 17:42:32 +01:00
Tobias Diekershoff	aa2f1c38e9	add 'hide_help' to admin panel	2013-02-17 12:37:45 +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
Tobias Diekershoff	fca8a23265	use enotify to send CC mails	2013-02-17 08:20:29 +01:00
friendica	3d86f47bbd	Merge pull request #618 from tobiasd/master use item title (if set) as mail subject	2013-02-16 15:56:31 -08:00
Zach Prezkuta	8a8e02cb84	add support for doing a redir/ based on contact url	2013-02-16 11:38:41 -07:00
Tobias Diekershoff	77bc4cd0dc	use entry title (if set) as subject when send by email	2013-02-16 11:03:46 +01:00
Fabrixxm	0a79b2300c	delete item page respond with json if called via ajax.	2013-02-15 06:34:32 -05:00
Michael Vogel	5e077e541a	The community page is speeded up. Photos will be compressed before the output.	2013-02-06 08:01:46 +01:00
friendica	b00426c9fb	Merge pull request #605 from fermionic/20130204-events-request-too-many-dates limit event queries to one month even if no finish date is specified	2013-02-05 17:36:58 -08:00
friendica	132600eee2	Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir add 'quiet' paramter to redir and dfrn_poll to allow calls	2013-02-05 17:35:39 -08:00
friendica	34c9156fa1	Merge pull request #604 from fermionic/20130204-db-debugging-in-mod-display take debugging commands out of mod/display	2013-02-05 17:22:05 -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	439974a5d5	allow themes to use plugin hooks	2013-02-04 20:53:53 -07:00
Zach Prezkuta	7e4d4cf375	limit event queries to one month even if no finish date is specified	2013-02-04 20:45:14 -07:00
Zach Prezkuta	df53c98798	take debugging commands out of mod/display	2013-02-04 20:39:47 -07:00
Zach Prezkuta	cc38986c20	add 'quiet' paramter to redir and dfrn_poll to allow calls that don't produce a Welcome info	2013-02-04 20:34:42 -07:00
friendica	be29ae0bce	poco xml returning 500 - but with contents?	2013-01-29 18:36:10 -08:00
Michael Vogel	2350aa54eb	OStatus-Conversation auto completion works now. Some performance issues added as well.	2013-01-30 01:31:27 +01: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	b58189bb98	Merge pull request #592 from fermionic/20130126-richtext-feature-fixes make the richtext feature work for events, wall messages, and contact notes	2013-01-27 19:11:06 -08:00
friendica	c9cce9873d	search privacy enhancements for those with blocked walls	2013-01-27 13:14:13 -08:00
Michael Vogel	2cb576d305	Bugfixing after adding timestamps	2013-01-27 13:57:44 +01:00
Zach Prezkuta	187b6441c1	make the richtext feature work for events, wall messages, and contact notes	2013-01-26 13:03:01 -07: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
friendica	04b48688b6	add form security to invite page and set maximum per user invites	2013-01-25 13:48:57 -08: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
Michael Vogel	82c00660e0	Preloading of items in the cache when receiving them.	2013-01-17 23:20:40 +01:00
friendica	3742d0d5ba	events with no finish date don't appear in calendar	2013-01-16 03:16:45 -08:00
friendica	30f1fb2c4d	provide a date indication in reshared content	2013-01-15 14:58:50 -08:00
Zach Prezkuta	28c9123ac8	module to show system down message	2013-01-14 16:48:01 -07: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	b9afb38f4d	Some more function calls to ensure that the tags are deleted when an item is deleted	2013-01-13 15:11:06 +01:00
Michael Vogel	3dc615dd9d	Adding the tag creating function to the function when a photo is tagged	2013-01-13 15:05:24 +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	449b44fe4c	Merge https://github.com/friendica/friendica into pull	2013-01-12 15:09:35 -08:00
friendica	b5c0714bc4	fix live update on display page	2013-01-12 15:08:59 -08: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
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
Michael Vogel	c26cf428a6	The search now searches in the new tag table	2013-01-11 08:51:58 +01:00
Zach Prezkuta	bce29054b9	allow Smarty use on international templates	2013-01-10 21:46:48 -07: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
Thomas Willingham	0cf3d70875	If we find a home.html, also look for a home.css	2013-01-05 14:31:10 +00:00
friendica	07ba4da634	email header encoding everywhere	2013-01-04 15:47:29 -08:00
friendica	c0fd572fec	Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init Finalize theme decision in a module's _init function	2013-01-04 14:36:47 -08:00
Zach Prezkuta	fdd142c42e	never use profile_load outside of a module's _init() function	2013-01-03 10:47:45 -07:00
Christian Vogeley	d9961bc3b4	revert one change	2013-01-01 23:47:56 +01:00
Christian Vogeley	4ab7820663	.	2013-01-01 22:44:02 +01:00
Christian Vogeley	5bfd4cf5c4	Move HTML part of oid to template + replace outside the tpl	2013-01-01 22:40:05 +01:00
Christian Vogeley	2a3f8f8ee2	.	2013-01-01 21:08:30 +01:00
Christian Vogeley	cde9b6370d	Fix registration form	2013-01-01 21:05:24 +01:00
Zach Prezkuta	e684324032	use explicit include paths	2012-12-28 14:51:50 -07:00
Zach Prezkuta	b6981768ee	remove more dashes in templates	2012-12-27 09:38:42 -07:00
friendica	e935fa78c6	Merge pull request #557 from fermionic/20121224-installer-check-for-smarty3 add write access to view/smarty3/ as a requirement for the installer	2012-12-26 13:08:25 -08:00
Zach Prezkuta	263fe0f6bc	revert unnecessary variable name changes	2012-12-26 10:42:01 -07: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
fermionic	6603758a5e	Merge pull request #558 from fermionic/20121222-use-smarty-template-engine fix a few more templates for correct conversion to Smarty3 templates	2012-12-24 07:47:06 -08:00
Zach Prezkuta	ce445a385f	fix a few more templates for correction conversion to Smarty3 templates	2012-12-24 08:44:26 -07:00
Zach Prezkuta	f74a443c1b	add write access to view/smarty3/ as a requirement for the installer	2012-12-24 07:59:46 -07:00
Michael Johnston	cd5b9c10c4	fix filer dialog	2012-12-23 18:34:55 -05:00
fermionic	974f60d132	Merge pull request #551 from fermionic/20121222-use-smarty-template-engine 20121222 use smarty template engine	2012-12-23 05:31:11 -08:00
Zach Prezkuta	b9f4687260	one more place where the template engine is changed	2012-12-23 06:25:50 -07:00
friendica	e98dc70008	sn subscription fix	2012-12-23 02:47:14 -08: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	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	a6b1275f16	Merge remote-tracking branch 'upstream/master'	2012-12-17 10:32:53 +01:00
Michael Vogel	46c5a97a20	New caching system for photos	2012-12-14 22:47:30 +01:00
friendica	4793ebb141	change profile photo link on profile edit page	2012-12-07 16:02:40 -08:00
friendica	8ab24858fb	fix "insert web link" for those without richtext feature enabled	2012-12-03 16:31:28 -08:00
friendica	1ad4f5247c	default bbcode - don't check editor pref	2012-12-03 01:05:10 -08:00
friendica	8bb0f08c6c	default to bbcode format when uploading photos, since default editor is now plaintext	2012-12-03 00:43:06 -08:00
friendica	79fb5509ed	bug #511 - if birth year supplied but not a month or day, force a sane default. PHP datetime functions don't handle zero very well.	2012-12-02 13:47:41 -08:00
Zach Prezkuta	eb964bbe08	put the correct function with the logic	2012-11-27 19:33:04 -07:00
Zach Prezkuta	aef96a1d5e	add support for admin choice to force an entire hub to use alt-pager	2012-11-27 19:30:46 -07:00
Thomas Willingham	8c3ea4b4d4	Add max_daily_registrations to admin panel.	2012-11-27 17:13:32 +00:00
friendica	5d904a9fa8	improve performance of photo upload page	2012-11-25 19:34:54 -08:00
friendica	fcbdefcfd5	missing network_to_name	2012-11-22 21:04:03 -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	94204d9160	implement features	2012-11-22 09:14:22 -07:00
friendica	9835efc9e4	fix jenkins tests	2012-11-22 05:06:15 -08:00
friendica	4d289574ca	ensure that auto_redir does not loop	2012-11-21 15:41:14 -08:00
Michael Vogel	25b4ec32c7	Clean up code - removed useless cache code	2012-11-17 14:27:30 +01:00
Michael Vogel	f17377e6de	New cache system with subdirectories	2012-11-17 00:50:39 +01:00
friendica	3dc4c52022	Merge pull request #533 from fabrixxm/moveme Fix issue 508	2012-11-13 14:06:20 -08:00
fabrixxm	5a2c01d572	Merge pull request #532 from fabrixxm/quattrofixs template: new $item.shiny; some fix to quattro	2012-11-13 03:08:26 -08:00
zottel	c4e4ee892e	Mark items read on filtered network page, but still keep the "mark everything read" mechanism on viewing the unfiltered network page.	2012-11-13 11:30:43 +01:00
Fabrixxm	9afe50d1e5	uimport: add register policy and max daily registrations check (issue 508)	2012-11-13 04:40:15 -05:00
friendica	0e95b6b527	Merge pull request #531 from fabrixxm/master "Move Account" docs	2012-11-10 03:06:28 -08:00
Fabrixxm	41dfc7f29e	items: new property 'shiny'. separate 'indent' (''\|'comment') from 'shiny' (''\|'shiny')	2012-11-09 11:13:59 -05:00
Fabrixxm	1bc9f8b992	help: load Home.md in aside when not in home,add new markdown syntax New markdown block "warning" ! line1 ! line2 will be rendered as <div class="md_warning"><p>line1</p><p>line2</p></div>	2012-11-09 03:56:45 -05:00
friendica	b01ca0e345	what happened to the photos page vcard?	2012-11-09 00:21:16 -08:00
fermionic	cbbd68563b	Merge pull request #527 from fermionic/20121106-frost-updates frost updates	2012-11-07 07:41:17 -08:00
Fabrixxm	98958b4fb9	fix uexport query for groups and group members	2012-11-07 09:26:05 -05:00
Zach Prezkuta	999c3439e6	fix mobile photo uploads; better theme control; frost improvements	2012-11-06 08:43:19 -07:00
Thomas Willingham	3c61ba7f53	Uimport - slightly modify text (better English, not better doco).	2012-11-06 15:01:46 +00:00
Fabrixxm	5b4944fe8e	Merge remote-tracking branch 'remotes/friendica/master' into moveme	2012-11-05 09:37:58 +01:00
friendica	1d91b2d1b3	Merge https://github.com/friendica/friendica into pull	2012-11-04 13:43:42 -08:00
friendica	caebcc5e83	rev update	2012-11-04 13:43:28 -08:00
friendica	cc50abeabe	Merge pull request #522 from zzottel/master Delete contents from a user when he removes his account	2012-11-04 13:40:45 -08:00
Thomas Willingham	973efa0c75	Oops, re-kill the dead snake.	2012-11-04 20:02:41 +00:00
Thomas Willingham	190ab46e18	Only show "Welcome to $Sitename" if you haven't made your own homepage.	2012-11-04 19:58:59 +00:00
Thomas Willingham	234598280d	Merge remote-tracking branch 'upstream/master'	2012-11-04 19:56:33 +00:00
zottel	6aca58f320	Merge remote branch 'upstream/master'	2012-11-04 11:05:40 +01:00
friendica	0627fdcce7	positional params in "was tagged in a photo" string	2012-11-03 15:29:47 -07:00
friendica	f076d7f0dc	Merge https://github.com/friendica/friendica into pull	2012-11-03 14:44:46 -07:00
friendica	3303d9db75	put 1i8n position orders in welcome string	2012-11-03 14:43:48 -07: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
fermionic	d3290f314f	Merge pull request #521 from fermionic/20121101-updates Various updates	2012-11-02 12:26:49 -07:00
friendica	e8fa4279fa	no profile pic on photos page if no photos have been uploaded	2012-11-02 04:20:12 -07:00
Zach Prezkuta	c6a3b87359	update_display for display live updates	2012-11-01 18:36:11 -06:00
Zach Prezkuta	c9248b66db	display live update; don't collapse comments on live update	2012-11-01 18:31:50 -06:00
Zach Prezkuta	e9b26ffbb3	prevent double posting of status updates and comments	2012-11-01 17:14:42 -06:00
Fabrixxm	1a3a5ee8d9	moveme: first successful relocated user	2012-10-31 17:13:45 +01:00
friendica	e2ca9e9db5	poco - ignore archived contacts	2012-10-30 14:25:33 -07:00
Fabrixxm	c51e057fe6	Merge remote branch 'friendica/master' into moveme	2012-10-29 05:57:58 -04:00
friendica	88c8387c44	revive "mark everything seen" on main network page - see comments	2012-10-26 14:29:42 -07:00
friendica	2347a4326c	get rid of 'Friendika'	2012-10-18 21:51:45 -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	3af16ff92a	Merge https://github.com/friendica/friendica into pull	2012-10-14 17:16:41 -07:00
friendica	dec5298248	rev update	2012-10-14 17:16:25 -07:00
Michael Johnston	939227e820	Moved comment box on photos to be after the last comment, added text for the Preview link	2012-10-14 14:41:31 -04: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
friendica	816db4396a	better fix for threads with no parent showing up as unseen	2012-10-10 16:17:40 -07:00
friendica	8a1f9d32ab	Merge https://github.com/friendica/friendica into pull	2012-10-10 15:59:05 -07:00
friendica	675aa56b02	rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared	2012-10-10 15:57:40 -07:00
fermionic	14d8033e54	Merge pull request #510 from fermionic/lockview-plugin-support allow changing the lockview content with a plugin	2012-10-10 07:04:08 -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	86d6f380dc	add home_init hook to manage to call startpage plugin	2012-10-09 09:47:14 -06:00
Zach Prezkuta	96a245409b	allow changing the lockview content with a plugin	2012-10-09 09:45:54 -06:00
Zach Prezkuta	0ea89852d2	allow themes to decide where live updates appear	2012-10-09 09:41:33 -06:00
Domovoy	8e50b3f9ce	Use saved_searches_aside.tpl in search.php	2012-10-02 16:03:20 +02:00
fermionic	9daafe7489	Merge pull request #501 from fermionic/network-remember-filters don't set a date as a group	2012-10-01 13:08:48 -07:00
Zach Prezkuta	c6061d598f	don't set a date as a group	2012-10-01 14:07:32 -06:00
fabrixxm	9d4fdee65d	Merge pull request #500 from fabrixxm/quattro-fontsoptions Quattro fixes	2012-10-01 07:05:58 -07:00
Fabrixxm	864d022468	editpost: add short jot action text to edit post form	2012-10-01 10:00:25 -04:00
friendica	112fafcc81	consistent handling of scaled images when using imagick	2012-09-30 03:25:20 -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	c9536ac056	Merge pull request #498 from fermionic/more-robust-tag-conversion allow tagging of people by name or nickname	2012-09-30 01:55:23 -07:00
Zach Prezkuta	421c72d10f	remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters	2012-09-29 17:56:50 -06:00
Zach Prezkuta	ce73cd560f	allow tagging of people by name or nickname	2012-09-29 17:55:40 -06:00
Zach Prezkuta	f4f3c8375f	send less messages to server; remove delete option	2012-09-29 17:50:34 -06:00
friendica	ebabd25717	order photo album list in blog (reverse date) order	2012-09-29 06:08:44 -07:00
friendica	c357fddea7	photo "conversation streams" need work - quite a bit of it	2012-09-29 06:04:01 -07:00
friendica	260b0f7fe8	rev update	2012-09-27 19:53:23 -07:00
friendica	41db3fb983	declare array separately, doesn't work well when defined in hook	2012-09-26 04:50:24 -07:00
friendica	d1d5eca258	network_ping hook for next generation "page"/"forums" plugin	2012-09-26 04:46:54 -07:00
friendica	b6b8f40fa9	Merge https://github.com/friendica/friendica into pull	2012-09-21 18:10:32 -07:00
friendica	c2af97ef61	rev update	2012-09-21 18:04:09 -07:00
Zach Prezkuta	da7c5b19b1	allow hidden comments phrase to be accessed separately as number and text	2012-09-19 21:31:26 -06:00
friendica	490c98b7db	fix events	2012-09-19 00:44:37 -07:00
friendica	0b59d30e34	more infrastructure for ignored events	2012-09-18 22:49:05 -07:00
friendica	fa14723ef5	Merge https://github.com/friendica/friendica into pull	2012-09-18 17:44:38 -07:00
friendica	5cad3e114a	give themes more control over events/birthdays and provide them as notifications	2012-09-18 17:43:09 -07:00
friendica	6ebd56012a	Merge pull request #479 from fermionic/album-image-inserted-too-large dont insert images larger than scale level 2	2012-09-18 15:46:41 -07:00
Zach Prezkuta	cd25573038	select based on dimensions instead of scale level	2012-09-17 21:46:36 -06:00
Fabrixxm	6aa45fb9cc	admin: Don't allow to block or delete site admin in users admin page. fix bug 471	2012-09-17 08:48:43 -04:00
Zach Prezkuta	364f56e8bd	dont insert images larger than scale level 2	2012-09-16 19:07:12 -06:00
friendica	ee5ed6b963	Merge https://github.com/friendica/friendica into pull	2012-09-15 15:24:28 -07:00
friendica	669d2b890e	rev update - add cancel markup to editor	2012-09-15 15:23:15 -07:00
Zach Prezkuta	8a4dcc28c1	make size search less greedy	2012-09-14 18:33:07 -06:00
Zach Prezkuta	f445ed47df	fix permissions for uploaded images with size specified	2012-09-14 18:22:56 -06:00
friendica	39b296a87d	ostatus disabled typo	2012-09-14 06:04:25 -07:00
friendica	20938d07cd	typo on previous checkin - set max number of images for an inserted link, default 2.	2012-09-13 23:01:10 -07:00
friendica	32d4a359f1	reverse the default newuser privacy setting to public. Sites can over-ride.	2012-09-13 19:11:07 -07:00
Zach Prezkuta	e8acdb31bc	add mobile toggle to frost mobile	2012-09-12 21:35:51 -06:00
friendica	a8d12061ca	rev update + multiple profile photos	2012-09-11 18:56:38 -07:00
friendica	624fd44502	Merge https://github.com/friendica/friendica into pull	2012-09-08 18:34:32 -07:00
friendica	7bec5778ba	provide option to view photo albums in posted order (rather than blog order)	2012-09-08 18:33:28 -07:00
Zach Prezkuta	63d02d98c5	add settings sections and add contacts; other tweaks and fixes	2012-09-07 12:17:03 -06: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
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	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
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
fermionic	9ae5ae6df5	Merge pull request #448 from fermionic/limit-items-on-all-pages limit number of items on profile page too	2012-08-28 19:03:15 -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
Tobias Diekershoff	647802f92e	get "ago" information into the mail thread view	2012-08-27 19:46:35 +02:00
Tobias Diekershoff	1e9d35fb0e	pass "ago" information to the mail_list template	2012-08-27 19:31:41 +02:00
Zach Prezkuta	c681e69794	limit number of items on profile page too; add show more back to Frost mobile; some show more fixes	2012-08-26 15:21:26 -06:00
Zach Prezkuta	1ffd67f291	hey: you missed a spot	2012-08-25 15:07:39 -06:00
Zach Prezkuta	f062ccbb66	add documentation; add to admin panel; some tweaks and interface stuff	2012-08-25 15:03:16 -06:00
friendica	386b6d081b	moods	2012-08-22 21:36:55 -07:00
friendica	bcec1bddc0	put the real post time into the post	2012-08-19 14:39:43 -07:00
Zach Prezkuta	d00c98b8b8	template was loaded in the wrong place	2012-08-18 13:28:49 -06:00
friendica	1e3ebccb97	Merge https://github.com/friendica/friendica into pull	2012-08-15 17:16:24 -07: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
Thomas Willingham	c47e6dca30	Remove Facebook from newmember text.	2012-08-15 22:26:44 +01:00
Tobias Diekershoff	a09c200799	add selector for mobile theme to admin panel	2012-08-15 10:16:42 +02:00
friendica	962c357ebd	common_friends_visitor_widget warning	2012-08-12 15:54:38 -07:00
Zach Prezkuta	d9279da369	- Frost Mobile: redo CSS to adjust automatically to the screen width - Frost Mobile: various tweaks and fixes - Allow themes to limit number of items on the Network page	2012-08-10 08:34:00 -06:00
Domovoy	4b514ea989	Fallback so that we alway have a thr-parent	2012-08-07 10:04:47 +02:00
Domovoy	97285f4811	Preview was not working	2012-08-05 15:35:12 +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	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	621e737826	fix angle char storage and transmission, rev update	2012-08-03 18:33:11 -07:00
Domovoy	ea7db7b7a8	Threaded items in every page concerned. Some code cleanup.	2012-08-03 21:55:17 +02:00
Domovoy	cc6e6e53be	Threaded notes	2012-08-03 21:41:26 +02:00
Domovoy	985f16d992	Threaded item when in single post display	2012-08-03 21:34:29 +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	6d0f0e6273	parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.	2012-08-02 10:25:08 +02:00
friendica	70389c99ea	logic was reversed - should work now	2012-07-31 22:25:03 -07:00
friendica	764ee653ba	Provide backend ability to poke as a comment rather than top-level post	2012-07-31 20:59:51 -07:00
Zach Prezkuta	885bb50f0d	fix /display bug; oembed audio bug; other tweaks	2012-07-31 18:53:18 -06:00
Domovoy	07f87848b4	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-07-30 13:36:33 +02:00
friendica	efded40461	pass deleted flag to display	2012-07-30 00:49:48 -07:00
Zach Prezkuta	067865db9e	fix filer bug; some interface tweaks	2012-07-29 14:49:12 -06:00
Domovoy	56f0ee4915	Threaded items on profile page	2012-07-29 20:41:11 +02:00
Domovoy	2fc0fcdc18	Unlimited level threading is now a site option.	2012-07-29 19:53:04 +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	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	a77fdfa6aa	remove special case for /.well-known/host-meta and add module for /.well-known	2012-07-27 08:58:27 -04: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
Zach Prezkuta	5cb979f5e4	changes to support a mobile theme	2012-07-23 20:37:00 -06:00
friendica	0d631cc08c	hopefully better update handling - never update the current DB version or continue with other updates if there was a failure of any individual update.	2012-07-23 15:57:40 -07:00
Vasudev Kamath	d3baaadf23	Merge branch 'master' of git://github.com/friendica/friendica	2012-07-22 12:43:32 +05:30
Vasudev Kamath	863617013c	Access image part of siteinfo only if $siteinfo["images"] is actually set. The current code didn't check this so I was getting an error Warning: Invalid argument supplied for foreach() in /home/vasudev/Public/friendica/mod/parse_url.php on line 305 Implemented a check before accessing $siteinfo["images"] with this commit and now warning doesn't come when giving URL of a site which doesn't have image from link button of post area	2012-07-22 12:41:07 +05:30
friendica	5255a5c9a9	rev update	2012-07-21 16:44:15 -07:00
friendica	0ff93edeee	poke privacy	2012-07-20 04:03:32 -07:00
friendica	9c72b45f36	and the main photo menu	2012-07-19 21:27:22 -07:00
friendica	d1243c9ad7	allow to prefill - url/poke?f=&c=nn - nn is contact id	2012-07-19 20:54:23 -07:00
friendica	1a75507f78	check permission	2012-07-19 20:30:40 -07:00
friendica	a54278649f	poke notifications	2012-07-19 20:13:40 -07:00
friendica	2f641ecdc8	id mismatch	2012-07-19 18:50:33 -07:00
friendica	d442bbc482	have fun...	2012-07-19 18:17:16 -07:00
Michael Vogel	222635d15a	parse_url: Just added a comment for future elements that should be added as well.	2012-07-18 21:06:38 +02:00
Michael Vogel	7aa10d1935	Merge remote branch 'upstream/master'	2012-07-15 17:26:00 +02:00
friendica	8767eedaac	sql fix - this should work a bit better	2012-07-14 20:38:30 -07:00
friendica	79b5520e77	sql errors on profile page	2012-07-14 20:28:17 -07: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	72f430ae58	parse_url: Problem when resizing images	2012-07-14 13:59:42 +02:00
Michael Johnston	476b86e1a2	fix pagination on community page	2012-07-14 00:46:41 -04: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
Zach Prezkuta	88711deceb	allow live updates for unlikes and undislikes	2012-07-13 09:09:01 -06: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
Michael Vogel	09034ce0ee	parse_url: Fetch multiple pictures so that the user can decide what to take.	2012-07-12 08:20:27 +02:00
friendica	9a299920eb	language detection - result is stored in item['postopts']	2012-07-11 22:45:14 -07:00
Michael Vogel	48f67ead9b	parse_url: complete new code for fetching website information	2012-07-12 01:17:33 +02:00
Zach Prezkuta	fc6f7daf38	small cleanup	2012-07-10 19:28:38 -06:00
Thomas Willingham	6621de63d9	Better (well, different) reshares.	2012-07-09 19:07:33 +01:00
Zach Prezkuta	9fbe921051	auto-orient uploaded wall photos and profile photos also	2012-07-08 09:18:05 -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
Vasudev Kamath	1b3d84422e	orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1]. When trying to upload an screenshot with png type I was getting message as failed even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload [1] http://au2.php.net/manual/en/function.exif-read-data.php	2012-07-07 16:17:26 +05:30
friendica	a122fecf50	add additional page types to admin user report	2012-07-05 22:30:13 -07:00
friendica	f40b056e3b	some initial code and benchmarking for "red" content rendering engine	2012-07-04 20:37:15 -07:00
friendica	b550b1326b	Merge https://github.com/friendica/friendica into pull	2012-07-03 16:26:58 -07:00
friendica	7926a0d171	add link to shares	2012-07-03 16:26:14 -07:00
Zach Prezkuta	3fe5bdbd8d	add ability to set maximum pixel length of uploaded pictures	2012-07-02 20:01:23 -06: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	a9c65dfe27	"babel" diagnostic - convert bbcode to different formats and back again	2012-07-01 23:00:25 -07:00
friendica	e2a725ff98	pagination start off by one	2012-07-01 19:17:21 -07:00
Zvi ben Yaakov (a.k.a rdc)	2214cd74e5	Added more profile data and CSS styling to the /directory page	2012-07-01 14:46:03 +03:00
friendica	78e03abed8	convert ent_quotes for jquery calendar title/summary	2012-06-29 20:11:36 -07:00
friendica	0ecba60503	undefined fn	2012-06-28 21:15:43 -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	b02c733967	service class restrict the email connector	2012-06-26 18:30:20 -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
Zach Prezkuta	28526dbf21	remove possibly unnecessary checks for likes or comments created by Diaspora users	2012-06-25 19:03:03 -06:00
Zach Prezkuta	9e8573507e	store signature info for remote users too	2012-06-25 19:03:03 -06:00
Zach Prezkuta	f495ba2bcb	was passing the wrong arguments to the signature storage function	2012-06-25 19:03:03 -06:00
Zach Prezkuta	5773241537	add some debug logging	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	b044cd922d	typos in bbcode, add service class restrictions to jot uploads	2012-06-25 16:03:46 -07:00
Zach Prezkuta	fa7e803f73	fix check for parent of StatusNet API post	2012-06-25 08:26:12 -06:00
friendica	35a098e0dc	service limits for photo uploads	2012-06-25 01:37:44 -07:00
friendica	c464bc494c	add like/dislike to profiles	2012-06-24 21:16:55 -07:00
friendica	9528beac34	sidebar photo album list not visible to anybody if user['hidewall'] set	2012-06-24 16:51:39 -07:00
friendica	7f3813e9b0	service class basics	2012-06-24 00:56:27 -07:00
friendica	22ca358a8c	like comments	2012-06-23 05:46:15 -07:00
friendica	bf47bf5ba0	cleanup mod/share	2012-06-23 03:25:11 -07:00
friendica	181a17bd05	share RSS items	2012-06-22 15:27:06 -07:00
friendica	eeceecc9ba	unterminated sql string	2012-06-22 00:25:01 -07:00
friendica	788a6626ef	Merge https://github.com/friendica/friendica into pull	2012-06-20 21:11:00 -07:00
friendica	0a302e100d	try and eliminate the openssl warnings for forums trying to talk back to fans	2012-06-20 21:09:52 -07:00
Zach Prezkuta	54c76ca822	allow rotation either CW or CCW	2012-06-20 20:51:03 -06:00
friendica	f4e434cd46	sort out contact search oddities	2012-06-20 16:20:55 -07:00
friendica	03c05d8a28	missing paren	2012-06-20 16:07:41 -07:00
friendica	0f0e5be549	contact search oddities	2012-06-20 16:05:46 -07:00
Zvi ben Yaakov (a.k.a rdc)	a801888b15	Now using App::get_cached_avatar_image for /photos page	2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)	d4f4ed730c	Now using App::get_cached_avatar_image for /profile/{nickname} page	2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)	f8d9f15879	Now using App::get_cached_avatar_image for /directory page	2012-06-19 16:05:38 -07:00
friendica	777830745f	missing $submit	2012-06-19 00:50:24 -07:00
Zach Prezkuta	42fa47e8f7	rotate uploaded images if an EXIF rotation is present	2012-06-18 21:02:11 -06:00
friendica	83b9a8eb44	too many profiles	2012-06-17 19:40:16 -07:00
Zvi ben Yaakov (a.k.a rdc)	edc68f4876	Enabled Profile photo revisions to be displayed on /photos page	2012-06-17 23:59:29 +03:00
Zvi ben Yaakov (a.k.a rdc)	1ee22a749e	Enabled Profile photo revisions to be displayed on /profiles page	2012-06-17 23:24:47 +03:00
Zvi ben Yaakov (a.k.a rdc)	59e0b6a0e3	Enabled Profile photo revisions to be displayed on /directory page	2012-06-17 23:20:14 +03:00
fabrixxm	6416d09c71	the missing mod/network.php	2012-06-15 03:18:42 -04:00
friendica	ba0ea1e651	mod/network.php was lost	2012-06-14 17:46:58 -07:00
friendica	8c94fa23bf	Merge https://github.com/friendica/friendica into pull	2012-06-14 17:39:17 -07:00
friendica	be090cc851	better handling of dead contacts	2012-06-14 16:56:46 -07:00
fabrixxm	f66ae301b8	network: fix bug #453	2012-06-14 10:04:13 -04:00
friendica	f8314d6bea	one-click change for manage module	2012-06-12 22:05:35 -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	8eb81a99c6	fix default group for local follows	2012-06-12 01:13:09 -07:00
friendica	6f1efccf1c	bug #448	2012-06-12 01:01:35 -07:00
friendica	6c1914e6bc	date search backend to mod/network	2012-06-11 21:07:53 -07:00
friendica	30295926b9	make sure default timezone is set in external processes	2012-06-11 19:52:46 -07:00
friendica	24e85c95b6	date based profile wall filter - backend	2012-06-11 19:36:04 -07:00
fabrixxm	a21db51a58	network view: rembember last tab selected by user	2012-06-11 05:38:30 -04:00
friendica	ea4515aca9	more logging on pubsub callbacks	2012-06-08 01:15:53 -07:00
friendica	0820865265	provide ability to autofriend ostatus accounts	2012-06-07 20:20:13 -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	757037c3bf	events: fix select events query select events that starts before display start date and/or ends after display end date.	2012-06-07 08:28:10 -04:00
friendica	3b49035636	admin page untranslated strings, remove empty list element for update	2012-06-06 22:28:30 -07:00
friendica	6c3ab225f7	set minchars to 2 for PM lookups too	2012-06-05 20:49:56 -07:00
friendica	6f41594634	set minchars to 2 for contacts search	2012-06-05 20:47:26 -07:00
friendica	49732114d7	contacts search autocomplete	2012-06-05 20:33:11 -07: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	cde0de965f	first shot at getting like/unlike functions to work consistently	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
Tobias Diekershoff	6fbeafc843	prv messages: make submit translateable	2012-06-03 17:16:29 +02:00
friendica	ee42c3be94	cleanup	2012-06-02 23:17:49 -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	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	0165d5dd2c	registration issue after re-factor	2012-06-01 15:42:13 -07:00
root	1d1c50f6e3	install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().	2012-06-01 03:31:24 -04:00
root	bad66a1154	Merge remote branch 'friendica/master'	2012-06-01 03:10:57 -04:00
friendica	93bc29a711	turn registration code into a standalone function for re-use	2012-05-31 19:06:17 -07:00
friendica	1180919c89	some zero theming on settings page	2012-05-30 16:30:51 -07:00
friendica	bdcb8d27dd	transition to beta for private forums	2012-05-30 15:52:17 -07:00
friendica	069361f946	rev update	2012-05-30 15:50:30 -07:00
friendica	7d77cfef56	Create a "potential default group" called "Friends" on registration.	2012-05-30 04:20:01 -07:00
friendica	88a0d6a1d5	private group tests, cont.	2012-05-29 22:57:15 -07:00
friendica	b6fe837a64	hide private group if desired	2012-05-29 18:43:56 -07:00
friendica	52995e0b1f	private group fix	2012-05-29 18:14:21 -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
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	2dc7e53435	more theme cleanup	2012-05-28 19:17:06 -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
Michael	817fc37f41	Merge branch 'master' of github.com:annando/friendica Conflicts: mod/network.php	2012-05-26 12:06:19 +02:00
Michael Vogel	a5dc41ab13	Saved searches now can search for tags as well	2012-05-26 11:51:48 +02:00
friendica	f5290a5a10	missing entries on personal tab after sql text search optimise	2012-05-25 18:29:06 -07:00
Michael Vogel	4951210508	Speed optimisation by enabling the posibility of the MySQL fulltext engine	2012-05-26 03:21:07 +02:00
friendica	bb4712b171	bug #434 - default group placement not working after accepting dfrn friend request	2012-05-25 18:06:51 -07:00
friendica	0ef8ccf11b	fix wall_uploaded photo permissions on group post by member	2012-05-25 17:42:35 -07:00
friendica	27c903a8d0	improve location change notifications	2012-05-25 15:56:18 -07:00
friendica	fafd41f4bf	keep private FB stuff out of personal notes	2012-05-25 14:36:17 -07:00
Michael Vogel	a71e3134bf	Merge remote branch 'upstream/master'	2012-05-25 16:19:10 +02:00
friendica	d1345e5054	Merge https://github.com/friendica/friendica into pull	2012-05-25 00:43:09 -07:00
friendica	abb9fecf09	rev update	2012-05-25 00:42:38 -07:00
root	88d5d9684a	admin: remove update link in admin menu	2012-05-25 03:05:07 -04:00
root	a5b8339a75	install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect	2012-05-24 04:21:33 -04:00
root	325343a492	Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section	2012-05-23 07:38:31 -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	e70573f34c	if identity (uid) changes - reload any other open browser windows on next ping.	2012-05-22 16:01:07 -07:00
friendica	f29f861d25	add queue totals to admin summary page	2012-05-22 03:44:03 -07: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
friendica	f16a119940	search with leading @ performs directory search (# for tag search), nothing for text search	2012-05-19 21:53:27 -07:00
friendica	dd86f40f96	set comment permissions explicitly to parent permissions	2012-05-19 16:42:24 -07:00
Michael Vogel	8c80fe0bf5	Performance tests	2012-05-20 00:11:32 +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	4133df6223	profile change activity link bug	2012-05-18 17:55:11 -07:00
friendica	34b79b4f2b	theming for default group selector	2012-05-18 01:38:11 -07:00
friendica	5ecaeb8e5c	catch more places to apply default group	2012-05-18 01:03:46 -07:00
friendica	1d157fc747	make it difficult to setup a private forum with no privacy	2012-05-17 23:05:41 -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	8a5dcf64d8	fix PM replies after autocomplete changes	2012-05-10 20:01:13 -07:00
friendica	547007e199	add photos to PM autocomplete, improved appearance	2012-05-10 19:29:01 -07:00
friendica	774c51cc19	email autocomplete	2012-05-10 01:45:51 -07:00
friendica	70a07086ad	slight improvement in a couple of queries	2012-05-08 22:46:40 -07:00
friendica	c141909f33	wrap private message autocomplete in an ifdef to make it easier to test/develop	2012-05-08 01:14:24 -07:00
friendica	df35746639	make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation	2012-05-07 23:09:57 -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
friendica	b74a776162	I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.	2012-05-06 20:06:39 -07:00
friendica	851264161f	mail autcomplete testing	2012-05-06 19:55:39 -07:00
friendica	57920849c4	email recip autocomplete	2012-05-06 19:53:34 -07:00
friendica	49ccefd6c7	bad sql left after the mailbox in/out merge	2012-05-05 17:53:23 -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	2818cb28e9	use html symbols for double quotes	2012-05-03 17:19:53 -07:00
friendica	f3e18df55d	string update	2012-05-03 16:55:03 -07:00
friendica	e7ff35f27d	Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.	2012-05-02 22:33:51 -07:00
friendica	e7580b71e1	use cid rather than uid in perms	2012-05-02 21:00:39 -07:00
Zach Prezkuta	5d957c3803	Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.	2012-05-02 21:12:57 -06:00
friendica	06d6ab4812	delineate the new profile changes from the rest of the text	2012-05-02 01:07:23 -07:00
friendica	91085f0969	really fat fingers today - though none of this has gone further than my own site	2012-05-01 19:24:22 -07:00
friendica	8bd6e1aef9	first try common friends for visitors	2012-05-01 19:16:18 -07:00
friendica	d48cd0f9a3	hidden plugins (add .hidden file to dir)	2012-04-30 23:07:52 -07:00
friendica	3c0cf72716	make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages	2012-04-30 19:01:41 -07:00
friendica	05df5337dd	start adding tooltips to tab menus	2012-04-30 05:15:29 -07:00
friendica	5d10672fb8	fix join group notifications	2012-04-30 04:11:42 -07:00
friendica	3ff8fe53a2	provide "xxx joined yyy" notifications	2012-04-30 01:25:25 -07:00
friendica	928faf3b97	typo in profile_selectors, fix remote tagging	2012-04-29 22:34:05 -07:00
friendica	0153d86b7f	admin page to manage failed updates	2012-04-29 19:10:07 -07:00
friendica	def6f0b408	the heart should really be red.	2012-04-29 02:11:33 -07:00
friendica	735f518fd8	fix location change notification	2012-04-29 01:49:54 -07:00
friendica	a9dba2720b	enhanced profile reporting for single values	2012-04-29 01:42:48 -07:00
friendica	f163aed66d	break up poller into separate processes	2012-04-27 23:17:40 -07:00
friendica	39d0926d09	PRIVACY: if wall is blocked, don't provide public keywords in HTML meta	2012-04-27 19:39:19 -07:00
friendica	26c53580d1	implement contact archival	2012-04-27 17:17:58 -07:00
friendica	ecc4962bd1	pass zrl to dfrn_request as fallback	2012-04-27 16:23:25 -07:00
tommy tomson	77a0570162	add link "remove account" to /mod/settings.php	2012-04-26 17:21:27 +02:00
friendica	c9e5609cbf	bug #307 , explaining decentralised private photos is impossible.	2012-04-25 05:41:32 -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	f265863435	more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips	2012-04-23 18:28:33 -07:00
friendica	8f0f644295	protect jappixmini/proxy from typo check, more work on email2 connector	2012-04-23 05:16:57 -07:00
friendica	724e1d15d0	Merge https://github.com/friendica/friendica into pull	2012-04-22 16:25:02 -07:00
friendica	00cb7f9efb	don't allow non-existent themes as choices	2012-04-22 16:24:29 -07:00
friendica	c0dffa7442	Merge pull request #258 from unary/api api: add support for StatusNet-style media param to API	2012-04-22 15:43:24 -07:00
Michael Johnston	76aa9b3037	api: add support for StatusNet-style media param to API	2012-04-22 13:37:25 -04:00
Tobias Hößl	27c23229c4	Merge branch 'master' of git://github.com/friendica/friendica	2012-04-22 13:31:07 +00:00
Tobias Hößl	3116db1a74	Add a hook	2012-04-22 13:28:54 +00:00
Fabio Comuni	3bb785fdad	Merge remote-tracking branch 'CatoTH/master' into req245	2012-04-20 09:25:51 +02:00
Fabio Comuni	fddf21d983	filebrowser: fix style, show 10 recent photos if not in an album	2012-04-18 15:15:52 +02:00
Fabio Comuni	0630120455	filebrowser: more style, load min and max scale photos	2012-04-18 14:56:03 +02:00
Fabio Comuni	e2e6b56c44	tinymce: add filebrowser for photos and attached files	2012-04-18 13:23:42 +02:00
Tobias Hößl	b885fedee1	XSRF protection and PHPdoc for mod/admin.php	2012-04-18 07:36:48 +00:00
Tobias Hößl	d7e750ad74	XSRF protection and PHPdoc for mod/admin.php	2012-04-18 07:24:47 +00:00
friendica	8269d6aa19	Merge pull request #240 from CatoTH/master Some bugfixes / Notices	2012-04-17 06:50:09 -07:00
friendica	e6330e3b96	naked br appearing when attaching and textplain	2012-04-17 06:11:41 -07:00
Tobias Hößl	720c8324c7	Some Bugfixes, and variable checks	2012-04-17 11:33:50 +00:00
friendica	7ebca2b37d	rev update	2012-04-16 22:58:52 -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	0a3454c841	function name typo	2012-04-15 05:11:52 -07:00
friendica	0939029b74	track requested profile error msg	2012-04-14 14:45:09 -07:00
friendica	6af4183302	zrl on random profile	2012-04-14 05:07:00 -07:00
Michael Vogel	4e220ec391	Merge commit 'upstream/master'	2012-04-14 13:15:25 +02:00
friendica	0d869ceb65	pass zrl's to/through global directory	2012-04-14 03:51:41 -07:00
friendica	bfb821e918	well that was a silly mistake...	2012-04-13 16:12:06 -07:00
friendica	d1b57d6e74	setting wasn't being applied	2012-04-13 15:37:25 -07:00
Fabio Comuni	f6e1ddf7fb	Merge remote-tracking branch 'friendica/master'	2012-04-13 11:59:25 +02:00
Fabio Comuni	138a0e06b8	admin: change global theme settings	2012-04-13 11:20:05 +02:00
friendica	3c4e6d3461	bug #369 - show contacts who are not in any groups	2012-04-12 23:06:41 -07:00
friendica	af68d033e3	extended the "interesting" profile attributes	2012-04-12 21:58:15 -07:00
friendica	446e962bb8	send link directly to profile tab	2012-04-12 21:38:40 -07:00
friendica	2b339d5a6b	stray log statements	2012-04-12 21:21:35 -07:00
friendica	972c01edb3	profile change activities	2012-04-12 21:10:32 -07:00
friendica	32cd62ff0a	allow setting default new friend notify	2012-04-12 18:15:46 -07:00
friendica	7e2d4d4026	turn off new friend activity by default	2012-04-12 16:51:57 -07:00
Michael Vogel	572678fef9	Merge commit 'upstream/master' Conflicts: include/dba.php	2012-04-13 00:10:41 +02: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
Fabio Comuni	18ecac4e93	settings: remove call to profile_load()	2012-04-12 08:42:00 +02:00
Fabio Comuni	e992e29685	settings: move tabs to aside. add a new template "generic_links_widget.tpl"	2012-04-12 08:38:55 +02: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	967ed8e23f	Merge https://github.com/friendica/friendica into pull	2012-04-10 20:51:04 -07:00
friendica	b02a671494	visit "random profile" feature	2012-04-10 20:50:31 -07:00
Simon L'nu	75c7877986	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: profile redir - goto correct profile page even if contact blocked, you just can't do anything. * master:	2012-04-10 23:34:55 -04:00
Simon L'nu	2af41ee57b	[fix] absolute links in docs and newmember.php; breaks sub-dir installs Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-10 23:34:39 -04:00
friendica	0fa932853c	profile redir - goto correct profile page even if contact blocked, you just can't do anything.	2012-04-10 20:09:51 -07:00
friendica	19b636e7e8	more backend work on mail2 followers	2012-04-10 19:15:52 -07:00
friendica	ed608694ce	make editplain work everywhere	2012-04-10 18:08:06 -07:00
friendica	18e225b051	move all fix_mce to one function so it can easily be undone	2012-04-10 17:14:07 -07:00
friendica	ab46f95683	duplicate community posts	2012-04-10 16:59:30 -07:00
friendica	8f40e8546e	fix_mce_lf contact edit page	2012-04-10 16:32:38 -07:00

... 13 14 15 16 17 ...

3024 commits