3414 commits

Author	SHA1	Message	Date
Fabrixxm	880dda4257	Merge branch 'master' back into develop	2015-09-29 10:00:13 +02:00
Michael Vogel	c33957a6e9	Internationalisation of events/Move events to the navigation bar	2015-09-27 14:00:15 +02:00
fabrixxm	af5da5bece	Merge pull request #1903 from annando/1509-bbcode-notifications ... The "about" field in the introductions should be send through bbcode	2015-09-25 18:24:48 +02:00
Michael Vogel	c7b80b532a	Bugfix: The "about" field in the introductions should be send through bbcode	2015-09-25 17:47:37 +02:00
Sandro Santilli	2a2dd6a1b9	Remove duplicated calls to language detection ... Also avoids overriding existing "lang" specification in an item	2015-09-23 10:47:34 +02:00
Tobias Diekershoff	53719d4ecc	Merge pull request #1897 from annando/3.4.2 ... Bugfix: Following mail accounts is now possible again	2015-09-23 06:20:49 +02:00
Michael Vogel	7c8c8b821a	Bugfix: Following mail accounts is now possible again	2015-09-22 22:31:22 +02:00
Fabrixxm	554948c22a	Adds checks for mcrypt module for RINO2 ... - check for module on install - check for module when RINO2 is enabled in admin - check for module when RINO2 is used in communications	2015-09-22 09:50:24 +02:00
Michael Vogel	5ac38b7f99	There is now only one central parameter for the global directory.	2015-09-15 22:29:02 +02:00
Michael Vogel	d20dbedddd	Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import	2015-09-06 09:15:23 +02:00
Tobias Diekershoff	c67fbc89c4	Merge pull request #1879 from annando/1509-fixing-ostatus ... Improvements to OStatus subscriptions	2015-09-06 09:03:28 +02:00
Tobias Diekershoff	8504cf4f05	Merge pull request #1880 from annando/1509-performance ... Some settings to control the system load	2015-09-06 09:02:27 +02:00
Michael Vogel	f918109351	We forgot to include the title ...	2015-09-06 08:18:55 +02:00
Michael Vogel	6aac9dfc9c	Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import	2015-09-05 12:13:38 +02:00
Michael Vogel	c6d9b2da23	New setting for requery days	2015-09-05 10:54:39 +02:00
Michael Vogel	cecbc58729	Mass-subscribing to OStatus contacts is enabled again	2015-09-05 10:32:10 +02:00
Michael Vogel	3cccb5ecb1	The repair option is added to the settings	2015-09-05 04:54:48 +02:00
Michael Vogel	30e7ce2e2a	The links for nodeinfo in "well-known" need to be an array of objects.	2015-09-05 04:33:18 +02:00
Michael Vogel	d9f23dbb20	New switch that restricts the search only for registered users	2015-09-05 04:29:37 +02:00
Michael Vogel	635e92249a	Bugfix: The first contact was never repaired	2015-09-03 22:24:57 +02:00
Michael Vogel	fd239ebf7b	Try to repair OStatus subscriptions	2015-09-03 22:18:25 +02:00
Tobias Diekershoff	658c99dcf3	Merge pull request #1874 from annando/1509-pubsub ... Bugfix: pubsub tend to unsubscribe subscriptions in the past	2015-09-01 07:07:22 +02:00
Michael Vogel	389738b1c1	Bugfix: pubsub tend to unsubscribe subscriptions in the past	2015-09-01 00:12:15 +02:00
Michael Vogel	3614df650f	Some admin settings hadn't been made translatable.	2015-08-31 19:32:01 +02:00
Michael Vogel	d1e3ea7b46	Soapbox-Improvements	2015-08-30 19:07:30 +02:00
Michael Vogel	3246352ba8	More detailled log entries	2015-08-29 16:55:25 +02:00
Michael Vogel	38c8431527	Rino Bugfix: A variable was used that never was fetched	2015-08-29 11:38:40 +02:00
Tobias Diekershoff	5b78353fff	Merge pull request #1861 from annando/1508-deactivated-ostatus-contacts ... There seems to be a problem with the function to add all friends of a GNU Social account.	2015-08-26 22:51:55 +02:00
Michael Vogel	86f2eb005f	There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now.	2015-08-26 22:46:59 +02:00
fabrixxm	b988aa7cb4	fix warning in /dfrn_request	2015-08-26 19:17:41 +02:00
Michael Vogel	6942b16ef5	See issue 1855. OOhembed is removed.	2015-08-25 19:50:23 +02:00
Michael Vogel	5c084b754a	Don't show the alternate url syntax in searches	2015-08-25 05:31:21 +02:00
Michael Vogel	b52bc71c6c	Now you can define the duration of the cache entries.	2015-08-24 17:24:14 +02:00
Tobias Diekershoff	26c5c7991a	Merge pull request #1849 from fabrixxm/issue-1841 ... filebrowser: link image to original picture, show error messages	2015-08-24 14:26:09 +02:00
fabrixxm	cbabac298d	filebrowser: link image to original picture, show error messages	2015-08-24 13:54:41 +02:00
Michael Vogel	3bca2db11b	Don't show search options in side bar.	2015-08-24 12:12:14 +02:00
Michael Vogel	3ff196f00d	Now you can set search options so that searching for contacts or forums isn't occult science anymore.	2015-08-24 11:55:29 +02:00
Michael Vogel	cf5fce855e	Bugfix: Don't show "appnet" in "inbound" when only "buffer" is enabled.	2015-08-24 08:18:17 +02:00
Michael Vogel	3e08024839	Moved the rss/atom part to the protocols.	2015-08-24 08:15:34 +02:00
Michael Vogel	157c64cac2	The rss/atom feed is added to the inofficial "services" section.	2015-08-24 08:02:46 +02:00
Michael Vogel	2a676ee312	The nodeinfo is changed to the new specifications	2015-08-24 07:47:42 +02:00
Michael Vogel	b0ddde22c0	By entering a GNU Social account name, the friends of this contact will be added to the friendica account	2015-08-23 22:21:15 +02:00
Tobias Diekershoff	37ab7ee052	Merge pull request #1842 from annando/1508-directory-configurable ... Make the hardcoded path to dir.friendica.com configurable	2015-08-23 15:10:34 +02:00
Michael Vogel	123ad84689	Make the hardcoded path to dir.friendica.com configurable	2015-08-23 11:05:10 +02:00
fabrixxm	81d1dfc006	add 'reload active plugins' button in admin/plugins	2015-08-20 15:01:15 +02:00
Tobias Diekershoff	033f89c6fa	Merge pull request #1831 from annando/1508-twidere-crash ... New versions of Twidere crashed during posting.	2015-08-18 07:17:30 +02:00
Michael Vogel	57ebb00a1f	New versions of Twidere crashed during posting.	2015-08-17 22:38:05 +02:00
Tobias Diekershoff	86f6532c61	adding the subdir	2015-08-17 08:20:19 +02:00
Tobias Diekershoff	03e81b06d5	we dont need the or anymore	2015-08-17 07:24:48 +02:00
Tobias Diekershoff	621dec1606	reconstruct the description for more flexible translations	2015-08-17 07:20:50 +02:00
Tobias Diekershoff	eea258f74c	add the profile url to the settings pages as alternative to the webfinger. See issue 1621	2015-08-16 22:39:08 +02:00
Tobias Diekershoff	0f505b92f6	Merge pull request #1827 from annando/1508-only-real-contacts ... In the contact search only suppress the "follow" link if you really d…	2015-08-16 22:25:32 +02:00
Michael Vogel	32e080933f	Improved the settings description	2015-08-16 22:17:36 +02:00
Michael Vogel	c2a1cf958d	The addon "statistics_json" becomes the system setting "nodeinfo"	2015-08-16 21:45:51 +02:00
Michael Vogel	46ec2638fa	In the contact search only suppress the "follow" link if you really don't follow the contact	2015-08-16 15:48:26 +02:00
Michael Vogel	bacd71e1c6	Replace random strings with guids where appropriate.	2015-08-14 07:48:28 +02:00
Michael Vogel	43fda0d626	Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid	2015-08-14 07:19:11 +02:00
Michael Vogel	a2d742ec91	For unique values we should use our guid function - not the random function	2015-08-14 00:40:36 +02:00
Michael Vogel	0e9b2c132a	Bugfix: There are some problems with Friendica installed in subdirectories	2015-08-14 00:13:23 +02:00
Tobias Diekershoff	5013e5daf1	use to link to queue inspector	2015-08-12 19:58:53 +02:00
Tobias Diekershoff	f439ac47c4	admin panel: inspect queue	2015-08-12 15:44:59 +02:00
Tobias Diekershoff	9d0786531d	Merge pull request #1810 from annando/issue-1739 ... Contact requests now contain more information.	2015-08-12 08:17:27 +02:00
Michael Vogel	a0f69dc92c	Contact requests now contain more information.	2015-08-12 08:07:21 +02:00
Michael Vogel	d5f2d9b39a	Bugfix ...	2015-08-11 23:50:31 +02:00
Michael Vogel	bf9ab389a2	Just some removed blanks	2015-08-11 20:16:53 +02:00
Michael Vogel	c18c598baf	Nodeinfo: Include the sitename	2015-08-11 10:23:33 +02:00
Michael Vogel	986eee48ac	Some corrections in the addon names	2015-08-11 00:37:27 +02:00
Michael Vogel	e60456fb66	Metadata should be an object.	2015-08-10 23:11:07 +02:00
Michael Vogel	6aeb4c0ad7	Corrected the output	2015-08-10 21:54:57 +02:00
Michael Vogel	820ded2c2d	Support for the new nodeinfo protocol that will replace statistics.json	2015-08-10 21:33:57 +02:00
Michael Vogel	c8e0685788	Merge remote-tracking branch 'upstream/develop' into 1508-public-relay	2015-08-10 10:52:54 +02:00
Tobias Diekershoff	6cfe7b698e	Merge pull request #1803 from annando/1508-accessibility ... Improved accessibility	2015-08-10 08:48:48 +02:00
Michael Vogel	b24453f8da	Messages are now sent to the relay server - and the options are configurable	2015-08-09 20:39:11 +02:00
Michael Vogel	8974c147e0	First steps for a public relay for posts.	2015-08-09 08:31:42 +02:00
Michael Vogel	b4d09777b9	Added many accesskeys ...	2015-08-08 17:33:43 +02:00
fabrixxm	e94e6d7500	escape user data to sql	2015-08-06 16:08:14 +02:00
Tobias Diekershoff	cd8be48ca7	Merge pull request #1791 from annando/1507-new-poco ... Improved Local Directory	2015-08-02 10:31:34 +02:00
Michael Vogel	2f147451f7	Just some more improved setting descriptions.	2015-08-02 10:08:08 +02:00
Michael Vogel	ebae45babc	Clarified the settings.	2015-08-02 10:05:50 +02:00
Michael Vogel	0a998f99df	Added community search mode	2015-07-30 23:27:50 +02:00
Fabrixxm	f5657e283c	fix folder links in filebrowser dialog	2015-07-29 11:55:26 +02:00
Fabrixxm	70b7de39a7	Upload/Browse popup for files and images ... Jot buttons to upload images and files show a popup, where the user can select a previously uploaded item o upload a new one	2015-07-28 17:20:40 +02:00
Michael Vogel	dcfcd6f906	Poco: added caching	2015-07-25 12:05:27 +02:00
Michael Vogel	68e318e316	Don't export contacts with empty network	2015-07-25 10:50:00 +02:00
Michael Vogel	e3e9de2e74	Export all federation contacts through poco	2015-07-24 07:23:57 +02:00
Michael Vogel	880f486044	Check not only for the last contact but also for the last update for the sanity check.	2015-07-23 22:21:22 +02:00
Michael Vogel	cbd2fc1572	"last_contact" is now set automatically if it is lower than the update value.	2015-07-23 20:57:08 +02:00
Michael Vogel	9717fa82fe	New field "created" in gcontacts. New option for timeframe when polling global contacts	2015-07-21 00:05:44 +02:00
Michael Vogel	f3c83fb514	Automatically updating the searched contacts while searching it.	2015-07-19 18:02:24 +02:00
Michael Vogel	0bede65a6b	Use local search	2015-07-19 13:23:01 +02:00
Michael Vogel	93e93f58bd	Query Redmatrix contacts for their contacts as well.	2015-07-19 10:40:33 +02:00
Michael Vogel	2a5fb7b175	Option to discover contacts from remote users (fallback option)	2015-07-19 09:41:36 +02:00
Michael Vogel	a0734ceede	Merge remote-tracking branch 'upstream/develop' into 1507-new-poco	2015-07-18 22:37:39 +02:00
Michael Vogel	cf3214c904	Query other servers periodically for their known contacts	2015-07-18 22:26:06 +02:00
Tobias Diekershoff	9bb805f3dc	show profile url in contact-edit overview listing	2015-07-18 10:57:31 +02:00
Michael Vogel	f1e7369283	Poco: Option to activate and deactivate detection of last activity.	2015-07-18 00:48:42 +02:00
root	54a5a80b24	Poco: New fields for last contact and last failure of a contact.	2015-07-17 01:08:28 +02:00
Michael Vogel	fca8aecc9b	Show "Redmatrix" as network name.	2015-07-16 10:09:59 +02:00
Michael Vogel	6800b07fc5	Update the name in the "self" contact when it is changed.	2015-07-14 22:24:43 +02:00
Michael Vogel	0de1926113	removed logger entry	2015-07-14 08:52:54 +02:00
Michael Vogel	2b3ebb9c3e	Follow/Unfollow now works from OStatus.	2015-07-13 23:50:33 +02:00
Michael Vogel	3457f85833	Salmon: Don't store contact data before the message was authenticated.	2015-07-13 14:34:28 +02:00
Michael Vogel	0398bb67be	Reworked salmon import	2015-07-13 08:06:51 +02:00
Michael Vogel	5f89cb0923	The autofollow option is moved from the addons to the core.	2015-07-12 21:37:49 +02:00
rabuzarus	e5809dce79	add jotnets for sharing posts	2015-07-12 17:52:25 +02:00
Tobias Diekershoff	179201d2bf	Merge pull request #1750 from annando/1507-contact-update ... Automatic contact update	2015-07-12 15:32:29 +02:00
Michael Vogel	fe137a92ef	Automatically update contact data.	2015-07-11 14:36:04 +02:00
Tobias Diekershoff	a22581e86c	typo	2015-07-08 13:15:14 +02:00
Fabrixxm	95945ecae6	Merge branch 'master' into develop	2015-07-06 16:56:49 +02:00
fabrixxm	75998b62de	Merge pull request #1726 from rabuzarus/acl-var ... fix for #1725	2015-07-02 12:13:14 +02:00
rabuzarus	b827c2e805	inlude jotnets for bookmark acl	2015-07-02 12:09:40 +02:00
Tobias Diekershoff	3349bba665	Merge pull request #1722 from annando/1506-password-on-install ... Ability to enter a password when the first user is created	2015-07-01 07:53:25 +02:00
Michael Vogel	836058c477	Added help text	2015-07-01 00:41:04 +02:00
Michael Vogel	055ee962c9	Ability to enter a password when the first user is created	2015-06-30 23:37:31 +02:00
rabuzarus	cf2a90dfa2	system settings is now a variable in settings_display.tpl	2015-06-30 14:51:14 +02:00
fabrixxm	5a23bd400c	Merge pull request #1715 from rabuzarus/theme_uid ... use local theme settings for visitors	2015-06-30 08:41:07 +02:00
Michael Vogel	836432bb9a	Removed Google Maps	2015-06-30 07:42:59 +02:00
fabrixxm	28f0e9a2de	Merge pull request #1696 from rabuzarus/acl-var ... move jotnets to populate_acl	2015-06-29 13:53:37 +02:00
fabrixxm	1a1c2d74f6	Merge pull request #1698 from rabuzarus/identity ... move some identity related functions to identity.php	2015-06-29 13:52:07 +02:00
fabrixxm	17514e0d68	Merge pull request #1703 from rabuzarus/readable_bytes ... show maximagesize warning in a human readable format	2015-06-29 13:50:55 +02:00
rabuzarus	a982320ba9	show maximagesize warning in a human readable format	2015-06-29 02:39:08 +02:00
Michael Vogel	b795bf2935	Merge pull request #1683 from fabrixxm/issue-1655 ... Deprecate RINO1 function, implements RINO2, remove unused crypro functions	2015-06-27 17:39:00 +02:00
rabuzarus	8cca849c2e	Merge acl-var into develop ... Conflicts: mod/settings.php	2015-06-27 15:23:19 +02:00
rabuzarus	373bb0822b	get the themes settings of foreign profiles	2015-06-27 14:10:43 +02:00
rabuzarus	787604026f	move some identity based functions to identity.php	2015-06-26 18:57:20 +02:00
rabuzarus	5ce125d6e0	cleanup of some unused code	2015-06-26 15:13:52 +02:00
rabuzarus	65286f79ed	respect hidewall	2015-06-25 20:29:09 +02:00
rabuzarus	94b21245bc	some more work to get acl data into populate_acl	2015-06-25 18:57:42 +02:00
rabuzarus	bfebf9636b	acl for events and photos	2015-06-25 12:38:09 +02:00
Fabrixxm	6fc864c947	rework mod/ping and desktop notification logic ... `mod/ping.php` returns all notifications ordered by date mixing system notifications, private messages, intros, registrations remove 'notify_full' mode remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0" new note attribute 'timestamp' desktop notification logic use timestamp to check which notification show to the user notification html template use timestamp to show full date to user in tooltip `relative_date()` don't append full date on dates older than 24 hours	2015-06-25 10:02:26 +02:00
Fabrixxm	e29d05ce4a	notifications order, unseen css class ... ping return notfications ordered by notification id notifications list get seen/unseen class from ping xml global.css define 'notify-unseen'	2015-06-24 16:10:06 +02:00
Fabrixxm	4036ad2554	Fix desktop notification ... use on/off field for enable/disable desktop notification show only new notifications after enable use localstorage to save enabled/disalbed and last notification id hide settings on browsers without desktop notification	2015-06-24 09:49:53 +02:00
Fabrixxm	17e8c29768	fix spelling	2015-06-24 08:23:56 +02:00
Fabrixxm	511c2d2c91	rino: settings in admin, choose lowest common on notify	2015-06-23 17:36:26 +02:00
Fabrixxm	6fbb02fb93	RINO 2 based on php-encryption ... reenable RINO 1 functions, add a deprecation note. use by default RINO 2 , with crypto from php-encryption fallback to RINO 1 for old nodes.	2015-06-23 16:13:09 +02:00
Fabrixxm	d06beb1431	install: load htconfig template from templates/	2015-06-23 12:35:51 +02:00
Fabrixxm	7d83a19fd4	Disable RINO ... Comment out functions for RINO crypt and disable RINO request and response.	2015-06-23 12:02:35 +02:00
Tobias Diekershoff	5549dd1dbe	Merge pull request #1682 from fabrixxm/issue-1625 ... admin: allow deletion of any users but yourself	2015-06-23 11:05:16 +02:00
Fabrixxm	3168b44317	admin: allow deletion of any users but yourself ... fix #1625	2015-06-23 10:39:28 +02:00
Fabrixxm	53e6dd6637	Add contact detail to contact drop confirm ... fix #1629	2015-06-23 10:09:27 +02:00
Tobias Diekershoff	24c91a4fed	Merge pull request #1679 from fabrixxm/smallfixestothemes ... use fields template in photo edit form	2015-06-23 09:12:25 +02:00
Michael Vogel	a7cf3639f0	Just some more fixing for issue 1642	2015-06-22 23:47:08 +02:00
fabrixxm	35e9fc3b02	use fields template in photo edit form	2015-06-22 20:07:19 +02:00
Michael Vogel	df7b907bc4	Display: Look for the network name when fetching the contact (important because of the statusnet connector)	2015-06-21 01:34:57 +02:00
Tobias Diekershoff	78321c2a43	Merge pull request #1670 from annando/setup-rewrite-check ... The installation prozess has a problem with self signed certificates	2015-06-15 13:25:54 +02:00
Michael Vogel	7feda0120f	This is working fix for issue 1642	2015-06-15 01:20:04 +02:00
Michael Vogel	0e157b1288	Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check	2015-06-15 00:55:05 +02:00
fabrixxm	42f4f3fce9	Merge pull request #1668 from annando/issue-1642 ... Better detection for the mobile client to avoid "{0}" in notifications	2015-06-14 15:58:52 +02:00
Michael Vogel	abc84f96ab	The installation prozess has a problem with self signed certificates.	2015-06-13 21:58:40 +02:00
Michael Vogel	c89c0916e2	Better detection for the mobile client to avoid "{0}" in notifications.	2015-06-13 20:23:26 +02:00
Michael Vogel	66058c6cf4	Remote subscribe from a GNU Social site is now possible	2015-06-13 19:51:45 +02:00
Tobias Diekershoff	e02546880f	Merge pull request #1662 from annando/issue-1628 ... The values for "sitename" and "register_text" was nedlessly encoded	2015-06-11 06:33:38 +02:00
Michael Vogel	5907c62851	The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities"	2015-06-11 00:12:16 +02:00
Michael Vogel	df3b38679f	This fixes issue 1657	2015-06-10 22:54:41 +02:00
Michael Vogel	cb0351dba0	Send a salmon notification to every mentioned person.	2015-06-09 08:27:04 +02:00
Michael Vogel	419a3ab2d3	Better behaviour when contact wasn't found.	2015-06-08 01:19:40 +02:00
Michael Vogel	a3c497190d	Complete new OStatus import.	2015-06-07 23:18:02 +02:00
Michael Vogel	ba36910343	Removed bad plink detection.	2015-06-03 21:03:46 +02:00
Michael Vogel	c416ce4893	Improved tagging	2015-06-03 11:27:56 +02:00
Michael Vogel	b60677ef1b	OStatus: New fields in OStatus export/ Auto-tagging of replyed authors.	2015-06-03 01:26:46 +02:00
Michael Vogel	39d4856abb	Merge remote-tracking branch 'upstream/develop' into 1506-tag-users	2015-06-02 23:19:00 +02:00
Tobias Diekershoff	7305a27392	Merge pull request #1647 from annando/1506-performance ... Performance improvements when searching for existing GUIDs	2015-06-02 22:46:07 +02:00
Michael Vogel	b5129a3e11	Store the GUID from here as well.	2015-06-02 22:10:28 +02:00
Michael Vogel	1a26d464dd	Always add the addressed contacts in a post to the tags.	2015-06-02 20:36:10 +02:00
fabrixxm	a36014fb0f	Merge pull request #1619 from rabuzarus/block-local-dir ... block local directory for public access	2015-06-02 17:53:19 +02:00
fabrixxm	46052740be	Merge pull request #1632 from annando/1505-ostatus2 ... Send a hubsub notification for every comment	2015-06-01 09:00:17 +02:00
fabrixxm	c12a647f13	Merge pull request #1639 from rabuzarus/albums_widget ... fix photo_albums upload	2015-06-01 08:34:18 +02:00
rabuzarus	8257e7e1e5	block poco if block_local_dir is true	2015-06-01 01:50:27 +02:00
rabuzarus	a674e782b2	fix Issue #1638	2015-06-01 01:36:37 +02:00
Michael Vogel	fae3592c79	Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector.	2015-05-31 13:28:16 +02:00
fabrixxm	18e44001e5	Merge pull request #1630 from annando/1505-ostatus ... OStatus communication improvements	2015-05-31 10:08:24 +02:00
fabrixxm	1cf3e778e8	Merge pull request #1622 from rabuzarus/albums_widget ... move html to photo_albums.tpl	2015-05-31 10:07:43 +02:00
Michael Vogel	d732d9d1a8	OStatus replies should now work even if the thread starter isn't in the mentions.	2015-05-31 00:26:11 +02:00
Michael Vogel	788d3cf1ab	Ostatus: The automatical adding of @-replies now uses the correct contact.	2015-05-30 21:45:43 +02:00
rabuzarus	74267310d6	html to section_title.tpl	2015-05-30 02:21:30 +02:00
rabuzarus	b61e39a1cb	cleaning after local merge	2015-05-29 16:30:42 +02:00
rabuzarus	553a152345	Merge photo-template into develop	2015-05-29 16:24:58 +02:00
rabuzarus	a7d417abb2	remove whitespace	2015-05-29 16:18:30 +02:00
rabuzarus	5cbb5b140c	css work	2015-05-29 16:08:17 +02:00
Tobias Diekershoff	9a22b4818e	Merge pull request #1618 from rabuzarus/vcard ... remove html and make use of vcard-widget.tpl	2015-05-29 08:52:27 +02:00
rabuzarus	3e0635992f	change the conditions	2015-05-29 04:05:41 +02:00
rabuzarus	a2a8afa583	block local directory for public access	2015-05-28 19:54:23 +02:00
rabuzarus	5990d62b06	use z_root	2015-05-28 16:15:48 +02:00
rabuzarus	415a606a59	better solution to exclude Contact Photos and include count of Photos	2015-05-28 15:54:53 +02:00
rabuzarus	1067718018	little revision	2015-05-27 12:44:40 +02:00
fabrixxm	b3992e1c65	Merge pull request #1599 from fabrixxm/issue-1574 ... Issue #1574	2015-05-27 11:07:30 +02:00
fabrixxm	50b3e49b5d	Merge pull request #1601 from rabuzarus/event-warning ... event can not end before it has started warning	2015-05-27 11:06:47 +02:00
rabuzarus	15499ff1aa	first step to get html code from photos.php removed	2015-05-27 03:35:29 +02:00
rabuzarus	46338f5e87	using sprintf	2015-05-26 14:49:53 +02:00
rabuzarus	f309f3a681	remove html and use vcard-widget.tpl	2015-05-26 14:32:40 +02:00
rabuzarus	3ad674fa67	better space handling	2015-05-25 16:49:57 +02:00
rabuzarus	e040b60f67	make the heading of the search result translatable	2015-05-24 20:46:40 +02:00
rabuzarus	b754a79968	event can not end before it has started.	2015-05-24 13:33:07 +02:00
Michael Vogel	c6e605992b	Events: Query improvement	2015-05-24 11:46:20 +02:00
fabrixxm	b29b01fad4	Merge branch 'develop' into issue-1574	2015-05-24 10:26:21 +02:00
fabrixxm	3a71978b0d	Merge pull request #1598 from rabuzarus/datepicker ... new datetimepicker for event creation	2015-05-24 10:16:29 +02:00
fabrixxm	83697cf3e5	Delete attachments on item deletion ... Delete video from videos page	2015-05-23 22:35:02 +02:00
Michael Vogel	ab67788b4e	SQL speed increase for query and search.	2015-05-23 01:23:31 +02:00
rabuzarus	2ad8fdc40b	port of red matrix datepicker implementation	2015-05-22 18:53:18 +02:00
Tobias Diekershoff	72e3ffbb4d	Merge pull request #1563 from annando/1505-no-intelligent-shortening ... Disable intelligent shortening - issue 1540	2015-05-16 12:04:28 +02:00
Michael Vogel	472a6f1380	Added explanation for shortening.	2015-05-15 21:09:00 +02:00
Michael Vogel	d995fc3994	The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled.	2015-05-15 20:56:05 +02:00
rabuzarus	de197405d0	port of red's event editing preview	2015-05-14 13:20:58 +02:00
Tobias Diekershoff	9244e8727d	dbesc and normalise_link	2015-05-10 09:10:27 +02:00
Tobias Diekershoff	0b8b1fdef3	add procy_url around the profile images	2015-05-06 16:14:27 +02:00
Tobias Diekershoff	fd8c9a9dac	avoid some contacts from profile match listing	2015-05-06 13:02:02 +02:00
Michael Vogel	237b5a6e40	New page setting for the maximum frontend load value.	2015-05-02 22:05:04 +02:00
Michael Vogel	100f6343ad	Highlighting of user names should now work in every case	2015-04-30 06:11:05 +02:00
Michael Vogel	5368fbba82	Bugfix: The android app will have readable notifications again.	2015-04-26 13:25:04 +02:00
Michael Vogel	c348f27e84	Show unread notifications in a different order than read notifications	2015-04-23 08:59:30 +02:00
Michael Vogel	7254f42333	Show unread mails and introductions as well.	2015-04-23 08:37:31 +02:00
Michael Vogel	04cda104ca	New function that will prevent notifications from deleted posts	2015-04-22 08:39:27 +02:00
Michael Vogel	e2827c0af7	The ID field will be stored with notifications as well.	2015-04-21 10:14:20 +02:00
Michael Vogel	261cd441c7	Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications	2015-04-21 10:13:28 +02:00
Michael Vogel	7a1db2e083	Only show one notification per parent	2015-04-16 06:47:09 +02:00
Tobias Diekershoff	8367cadeef	dont normalise OpenID URLs and fallback to https if no protocol is specified	2015-04-14 12:27:36 +02:00
Michael Vogel	2285b3b7a7	Storing the parent with every notification	2015-04-14 06:54:41 +02:00
Michael Vogel	64e343ed4b	Some refinement to the contact update	2015-04-12 10:32:02 +02:00
Michael Vogel	1058d055d1	Merge remote-tracking branch 'upstream/develop' into 1504-contact-update ... Conflicts: mod/contacts.php	2015-04-12 09:59:28 +02:00
fabrixxm	8b2742dc7d	Merge pull request #1505 from annando/1504-unified-follow ... The behaviour when following a new contact is now unified	2015-04-12 08:48:36 +02:00
Michael Vogel	2c3e2908b2	There is now a new possibility to update contact data.	2015-04-11 23:51:47 +02:00
Michael Vogel	0e895e24f7	Code reworks: replaced hardcoded network text with the corresponding constants.	2015-04-11 22:14:56 +02:00
Michael Vogel	190b7d6070	Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow	2015-04-10 11:34:21 +02:00
Tobias Diekershoff	dea1b067bd	Merge pull request #1479 from annando/1504-parse_url ... The order for the page parsing is changed	2015-04-10 10:13:13 +02:00
Michael Vogel	489af0d55d	Just added some forgotten escaping.	2015-04-10 00:54:42 +02:00
Michael Vogel	662fd84891	Automention of communities when a single contact is selected on the network page.	2015-04-10 00:42:03 +02:00
Michael Vogel	e81f9c91fa	Merge remote-tracking branch 'upstream/develop' into 1504-parse_url	2015-04-09 19:49:33 +02:00
Michael Vogel	ccbac6874b	The "connect" link ar the display page now directs to the new "follow" page as well.	2015-04-09 07:45:48 +02:00
Michael Vogel	f6ea872986	The behaviour when following a new contact is now unified.	2015-04-09 00:10:21 +02:00
Michael Vogel	539a93b3f1	The timestamp was at the wrong place	2015-04-06 13:49:57 +02:00
Michael Vogel	3cbd72d907	API: New picture upload function (Enhanced Twidere support)	2015-04-06 03:19:12 +02:00
Tobias Diekershoff	8ae90035f4	Merge pull request #1480 from annando/1504-diaspora-enhancement ... Diaspora uses this to fetch single public items	2015-04-05 21:24:21 +02:00
Michael Vogel	32206cd681	Diaspora uses this to fetch single public items.	2015-04-05 20:50:15 +02:00
Michael Vogel	57528cb987	New function for building the "share" header	2015-04-05 20:43:06 +02:00
Michael Vogel	aea83f0bec	The order for the page parsing is changed.	2015-04-05 20:40:31 +02:00
Tobias Diekershoff	106b0b5d23	Merge pull request #1460 from FlxAlbroscheit/develop ... Issue 1163: Feature allowing desktop-notifications	2015-04-05 11:37:05 +02:00
fabrixxm	2d3437daa3	different help text for different network	2015-04-04 18:02:26 +02:00
Silke Meyer	c05f95b54e	Improved help text, issue 1349.	2015-04-01 10:10:00 +02:00
fabrixxm	0226258e7b	Block settings page for unauthorized users ... fixes issue #1459	2015-03-31 10:24:23 +02:00
FlxAlbroscheit	001e940c6c	Feature for desktop-notifications ... see issue #1163	2015-03-31 02:06:07 +02:00
Michael Vogel	f1c6d6f1ba	Merge pull request #1442 from fabrixxm/issue-1362 ... Add scheme if missing to url inserted by user in 'insert link' jot button	2015-03-24 12:34:31 +01:00
fabrixxm	250b466ed3	Fix blank reponse if no siteinfo are fetched	2015-03-22 11:03:46 +01:00
fabrixxm	1cc9e7db0f	Add scheme if missing to url inserted by user in 'insert link' jot ... button	2015-03-22 10:59:00 +01:00
fabrixxm	05d1aaf0ed	Use correct class name to send post to email recipients. Fix #1437	2015-03-22 10:12:16 +01:00
fabrixxm	c18ace5517	Merge pull request #1436 from annando/1503-global-copy-comments ... The global copy now copies comments as well	2015-03-22 09:49:49 +01:00
Michael Vogel	81b199cfdc	The global copy now copies comments as well. This is important for the search.	2015-03-21 20:23:47 +01:00
fabrixxm	9bdd41b774	Merge pull request #1435 from FlxAlbroscheit/develop ... Access a contact directly from the contact-manager-page [UPDATED]	2015-03-20 15:13:17 +01:00
FlxAlbroscheit	1e15cba631	Access a contact directly from the contact-manager-page ... Improved my former commit (see: https://github.com/friendica/friendica/pull/1428)	2015-03-20 15:10:55 +01:00
Tobias Diekershoff	dd21750d90	Merge pull request #1428 from FlxAlbroscheit/develop ... Access a contact directly from the contact-manager-page	2015-03-12 07:13:31 +01:00
FlxAlbroscheit	21237ddba6	Give access to contact's profile-URL	2015-03-10 22:44:57 +01:00
Michael Vogel	ea06a1ec45	There is now a "global" field in the item table that tells if this item is present as global copy as well.	2015-03-09 00:45:53 +01:00
Michael Vogel	b080eddf8d	Improved logging for the search.	2015-03-08 03:24:54 +01:00
Michael Vogel	dbe8275ae5	Added some more timestamp measuring	2015-03-07 23:14:26 +01:00
Michael Vogel	1cf3cb493f	removed unneeded code.	2015-03-07 21:39:28 +01:00
Michael Vogel	7c4a1a059d	New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode.	2015-03-07 21:24:39 +01:00
Michael Vogel	027b11ebb5	Small bugfix for likes	2015-03-02 23:34:59 +01:00
Michael Vogel	3f1d186106	Remove the old hashtag functions, change it to the new functionality.	2015-03-01 20:40:38 +01:00
Tobias Diekershoff	20208acb23	Merge pull request #1417 from annando/1502-improved-markdown ... Updated libraries for Markdown and mobile detection	2015-02-28 08:17:22 +01:00
Michael Vogel	25eb323d69	Removed the last traces of the old Markdown library	2015-02-23 23:56:44 +01:00
Michael Vogel	440e2d82b1	Global setting for the behaviour of likes.	2015-02-23 12:44:50 +01:00
Michael Vogel	6504568f2e	Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented	2015-02-23 12:35:22 +01:00
fabrixxm	d4b092cec6	Merge pull request #1356 from silke/develop ... Added help text as requested in #1349.	2015-02-23 08:51:02 +01:00
Michael Vogel	9eeff0d891	Received "likes" and "dislikes" don't update the "commented" value anymore.	2015-02-22 17:34:04 +01:00
Michael Vogel	f3cc065e66	Show the profile visibility only for Friendica contacts.	2015-02-21 20:03:02 +01:00
Michael Vogel	8179f2f65e	Only show the relation on native networks.	2015-02-20 23:56:41 +01:00
Michael Vogel	1dc961713d	Bugfix: If "all" is selected then no contacts were shown.	2015-02-20 23:33:21 +01:00
Michael Vogel	a8a37a35db	Only show the options that fit to the current network.	2015-02-20 23:12:04 +01:00
Michael Vogel	4a1105ede6	scrape/noscrape now contains the date the profile was last updated or the last message was sent.	2015-02-18 23:40:46 +01:00
Michael Vogel	219932f692	Removed Statusnet from the counting of contacts for scrape/noscrape	2015-02-17 19:27:13 +01:00
Michael Vogel	a26d04574d	Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape	2015-02-17 19:18:17 +01:00
Michael Vogel	2dafc9eac1	Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter	2015-02-15 10:54:41 +01:00
Michael Vogel	d1d794f1ab	The global contacts now contain a "generation" value that defines how we know this contact	2015-02-15 10:52:45 +01:00
Tobias Diekershoff	d39612ac25	Merge pull request #1393 from annando/1502-cleaned-item-storage-code ... Additional check for notifications	2015-02-14 15:40:35 +01:00
Johannes Schwab	12d7ca9b84	improved infinite scrollling	2015-02-13 00:40:59 +01:00
Michael Vogel	1a75503b1c	Relocated the cache code.	2015-02-10 08:22:21 +01:00
Michael Vogel	21c63e8b65	Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape	2015-02-09 10:16:48 +01:00
Michael Vogel	e7b2c5dbf3	Bugfix: The value for "global community" wasn't read.	2015-02-09 08:25:12 +01:00
Michael Vogel	c0411ae25a	Enhanced SQL query so that the search is faster.	2015-02-08 23:50:45 +01:00
Michael Vogel	842ac46857	Scrape now contains the number of contacts as well.	2015-02-08 23:35:29 +01:00
Michael Vogel	2a02e1cb9c	Just cleaning up the code.	2015-02-08 20:55:48 +01:00
Michael Vogel	7e9ae24511	Moved several settings from .htconfig.php to the admin settings page.	2015-02-08 20:35:40 +01:00
Michael Vogel	a97d4383a1	Searching for items now always searches public entries from the central item storage with uid=0.	2015-02-08 15:59:22 +01:00
Michael Vogel	8871591a98	Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default ... Conflicts: mod/admin.php	2015-02-08 13:26:28 +01:00
Michael Vogel	f931eba7f2	Noscrape is now enabled all the time.	2015-02-08 12:07:35 +01:00
Michael Vogel	1d48ab0191	"altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version.	2015-02-08 11:54:42 +01:00
Michael Vogel	89f260eb6c	The title in the bookmarklet had several asterisk in the title. This had no use for friendica.	2015-02-06 21:10:49 +01:00
Tobias Diekershoff	be40d9d265	Merge pull request #1359 from annando/1502-more-detailled-location ... More details in the location field for poco	2015-02-05 08:31:15 +01:00
Silke Meyer	cdd3089444	Help text sounded too complicated	2015-02-04 16:43:31 +01:00
Silke Meyer	6bccf0be79	Added help text as requested in #1349.	2015-02-04 16:13:07 +01:00
Tobias Diekershoff	ed280df383	typo in side panel link	2015-02-04 11:27:54 +01:00
Michael Vogel	29f732e811	More details in the location field for poco.	2015-02-04 10:43:30 +01:00
Michael Vogel	8490bedefe	Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage	2015-02-02 22:15:39 +01:00
Tobias Diekershoff	677f46c076	Merge pull request #1338 from annando/1501-global-contacts ... Added "about" to noscrape	2015-02-02 21:52:09 +01:00
Michael Vogel	9c0dc86eea	Merge pull request #1342 from tobiasd/20150202_admin ... added diagnostics tools to the admin side panel	2015-02-02 21:14:41 +01:00
Tobias Diekershoff	e5766a4793	make strings translate able	2015-02-02 20:37:05 +01:00
Tobias Diekershoff	8a17c3d348	added diagnostics tools to the admin side panel	2015-02-02 18:26:38 +01:00
Silke Meyer	57a80c3867	Let the browser check if it's a valid email address	2015-02-01 16:25:49 +01:00
Michael Vogel	e02b982f77	Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage	2015-02-01 13:28:32 +01:00
Michael Vogel	e3da549ab5	Reshared diaspora items that aren't on this server are now stored with uid=0	2015-02-01 10:26:35 +01:00
Silke Meyer	8991319d9d	Added a description to the help field	2015-01-31 16:09:59 +01:00
Silke Meyer	c90e47556a	added setting for server's sender email address	2015-01-31 15:54:12 +01:00
Silke Meyer	89946b8660	fixed a typo	2015-01-31 15:23:36 +01:00
Michael Vogel	036ccf84de	And yet another two places where pictures have to be sent through the proxy.	2015-01-28 23:34:46 +01:00
Michael Vogel	b309187e3d	Just two more places where pictures have to be send through the proxy function.	2015-01-28 10:09:16 +01:00
Michael Vogel	04ab875a62	Added "about" to noscrape.	2015-01-27 19:52:54 +01:00
Michael Vogel	848c09935a	The contact list in mails now contains not only the name but also the address.	2015-01-27 08:04:24 +01:00
Michael Vogel	583c2ce13e	poco can now be used to query the global contacts.	2015-01-27 08:01:37 +01:00
Michael Vogel	e8bfa32b37	Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile	2015-01-26 01:07:15 +01:00
Michael Vogel	bc2c046446	poco: Only update the global contacts when there is a network value/Export your own contact as well	2015-01-25 16:40:20 +01:00
Michael Vogel	105d6a22a4	gender will be updated in the profiles as well.	2015-01-25 13:22:25 +01:00
Michael Vogel	2f400627c7	Support for keywords and gender in (global) contacts.	2015-01-25 13:19:37 +01:00
Michael Vogel	dff2384e82	Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts	2015-01-25 08:44:42 +01:00
Tobias Diekershoff	1c424a5425	Merge pull request #1315 from annando/1501-issue-1283 ... issue 1283 - Share-it button support for friendica	2015-01-25 08:24:21 +01:00
Michael Vogel	344210bd6d	Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.	2015-01-25 00:19:59 +01:00
Michael Vogel	58d814b793	issue 1283 - Share-it button support for friendica	2015-01-25 00:10:58 +01:00
Tobias Diekershoff	eaaed02ffd	use type email in users settings as well	2015-01-24 09:40:01 +01:00
Tobias Diekershoff	8b558eb7ea	type email for email field in add user form	2015-01-24 09:30:44 +01:00
Michael Vogel	1f23d691f3	Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus	2015-01-21 01:30:09 +01:00
Michael Vogel	ed037124b3	Merge pull request #1299 from fabrixxm/optional-text-only-email ... Optional text only email	2015-01-20 23:26:44 +01:00
Michael Vogel	184dcf75a7	Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.	2015-01-20 22:54:25 +01:00
fabrixxm	816d3f86e7	reword checkbox help text	2015-01-20 22:17:03 +01:00
fabrixxm	b2527039b7	add text-only email option ... add a checkbok to notification settings. if checked, html body is not added to email.	2015-01-20 19:19:58 +01:00
Tobias Diekershoff	3483cd35f8	use HTML5 attributes in the installer wizard	2015-01-16 19:32:31 +01:00
Johannes Schwab	9cb3a4188e	fix network tab urls	2015-01-16 02:25:17 +01:00
Michael Vogel	beaca70126	OStatus: Replies now arrive their target.	2015-01-12 00:14:51 +01:00
Michael Vogel	94fb0305f7	Poco now shows "about" and the location as well.	2015-01-10 00:34:08 +01:00
Michael Vogel	8f1cfac20a	The global contacts now contain the network name so that the suggestions can select between this.	2015-01-08 07:59:20 +01:00
Michael Vogel	46db8575a0	The table "unique_contacts" now has an "about" and "location" field as well.	2015-01-08 01:32:19 +01:00
Michael Vogel	044eaa778f	Markdown is now supported in the location field as well.	2015-01-08 00:13:43 +01:00
Michael Vogel	e7e3857f5c	The "about" section is now run through bbcode.	2015-01-07 18:06:32 +01:00
Michael Vogel	b36d799044	Fetching "location" and "about" from diaspora. Displaying them on the "display" page.	2015-01-07 01:46:13 +01:00
Michael Vogel	16e4e61cc5	Only show contacts from open networks	2015-01-05 22:44:55 +01:00
Michael Vogel	011f5b9cae	Bugfix: Postings disappeared due to a small variable ...	2015-01-05 14:28:17 +01:00
Michael Vogel	47560fc6c7	Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco	2015-01-04 21:07:45 +01:00
Michael Vogel	47129c01f8	Check for filesize before trying to fetch site infos.	2015-01-04 20:04:59 +01:00
Michael Vogel	11c82816b3	Poco now returns the last update date as well. This date will be stored in the gcontact table.	2015-01-04 19:19:47 +01:00
fabrixxm	ecc76c6090	Merge pull request #1254 from annando/1409-shadow-items ... Global Community	2014-12-31 18:13:58 +01:00
Rabuzarus	5939a8cea5	revert last commit f59e574, remove some html code	2014-12-26 14:44:48 +01:00
Rabuzarus	f59e574068	removed Pagination	2014-12-26 12:54:23 +01:00
Rabuzarus	cb47fdfcb9	minor change: rel should not be part of the PHP	2014-12-26 03:32:21 +01:00
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