2939 commits

Author	SHA1	Message	Date
Tobias Diekershoff	f45a8f1a03	Merge pull request #2106 from annando/1511-ostatus-bookmark-design ... Small OStatus changes	2015-11-29 23:19:12 +01:00
Tobias Diekershoff	93fd6dce84	Merge pull request #2111 from annando/issue-1925 ... Issue 1925 - display nickname@hostname.com	2015-11-29 19:48:08 +01:00
Michael Vogel	ca47c1c4df	Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution	2015-11-29 17:05:40 +01:00
Michael Vogel	5649e9e193	The contact page now contains more data	2015-11-29 17:04:48 +01:00
Michael Vogel	8b23e77171	Only show supported networks in sidebar and contact list	2015-11-29 13:37:24 +01:00
Michael Vogel	583a2f709b	Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design	2015-11-29 10:25:44 +01:00
Michael Vogel	c77ef0c493	Viewcontacts now only shows native contacts (no more connector contacts)	2015-11-29 09:56:34 +01:00
Tobias Diekershoff	a770be3cb6	Merge pull request #2107 from annando/1511-duplicated-keywords ... Duplicated tags shouldn't happen anymore when parsing a webpage.	2015-11-29 08:43:19 +01:00
Tobias Diekershoff	be40fb8186	Merge pull request #2110 from annando/1511-subscribe-feed ... Issue 1779: Atom feed link under the connect link on the profile page	2015-11-29 08:40:39 +01:00
rabuzarus	1a0cb99d56	redesign the network page header when cid selected	2015-11-29 04:57:42 +01:00
rabuzarus	73dbd73990	directory - little change in the sql query	2015-11-29 00:09:09 +01:00
rabuzarus	f5597da059	forumlist - mark selected forum as selected	2015-11-28 23:52:12 +01:00
Michael Vogel	68916689de	Introductions are now added as well	2015-11-28 23:35:02 +01:00
Michael Vogel	3067663909	The manage page now shows the unread notifications	2015-11-28 22:56:48 +01:00
Michael Vogel	6e957c6c91	Merge pull request #2112 from rabuzarus/2811_group_side ... group_side - unify look with forumlist	2015-11-28 21:12:56 +01:00
rabuzarus	aa047e16d7	directory - reduce the number of queries	2015-11-28 21:12:44 +01:00
rabuzarus	a3059d02d4	group_side - unify look with forumlist	2015-11-28 20:09:28 +01:00
Michael Vogel	25c0c5d4ad	Issue 1925 - display nickname@hostname.com	2015-11-28 18:49:37 +01:00
Michael Vogel	388847e1f3	Issue 1779: There is now an atom feed link under the connect link on the profile page	2015-11-28 18:11:34 +01:00
Michael Vogel	b53a2c3122	Changed documentation	2015-11-28 17:43:52 +01:00
Michael Vogel	679ce3243e	Admin settings for table optimisation	2015-11-28 16:35:16 +01:00
Michael Vogel	20befee9ed	Dupilcated tags shouldn't happen anymore when parsing a webpage.	2015-11-28 13:15:00 +01:00
rabuzarus	226bda9f58	add missing info about if contact is forum to contact related pages	2015-11-28 03:50:45 +01:00
rabuzarus	9189971cb8	display contact information in contact and directory according to the other contact related pages	2015-11-28 02:56:36 +01:00
Michael Vogel	9c37fc320e	Merge pull request #2095 from rabuzarus/unread_forums ... count unread forum items for forumlist widget (ping.php)	2015-11-27 16:28:21 +01:00
Michael Vogel	602821279a	scrape_dfrn now scrapes the address as well.	2015-11-25 18:46:02 +01:00
rabuzarus	ddf3589fc5	count unread forum items for forumlist widget (ping.php)	2015-11-24 22:14:26 +01:00
Sandro Santilli	573a441d83	Do not notify own posts, closes #1032	2015-11-22 12:28:39 +01:00
fabrixxm	d1319d97a2	Merge pull request #2081 from annando/1511-avatar-fix ... The own avatar was (sometimes?) changed back when it was changed	2015-11-17 09:13:08 +01:00
Michael Vogel	e43c7a4447	Merge pull request #2061 from rabuzarus/0711_forumlist ... move forumlist addon to core	2015-11-17 08:46:15 +01:00
Michael Vogel	b53ae0d42a	Bugfix: The own avatar was (sometimes?) changed back when it was changed.	2015-11-17 08:39:09 +01:00
Michael Vogel	47d6e43642	Sort the plugin configuration on the admin page by name	2015-11-14 09:27:24 +01:00
Michael Vogel	830870c58e	Fix for issue 2060: When password is provided during the register process now the user is redirected correctly.	2015-11-14 08:07:09 +01:00
Tobias Diekershoff	009b3364e5	Merge pull request #2074 from fabrixxm/issue_2071 ... Use static css in install procedure	2015-11-13 12:50:41 +01:00
Fabrixxm	0a9e017d34	Installer use static css, fix #2071	2015-11-13 10:56:06 +01:00
Michael Vogel	ab1edca0be	Profile photos are now having an extension	2015-11-13 10:15:30 +01:00
Michael Vogel	6ddf62bdf7	Merge remote-tracking branch 'upstream/develop' into 1511-avatar	2015-11-13 09:48:34 +01:00
Michael Vogel	11905c0bec	The avatar picture wasn't updated at the contact table	2015-11-13 08:45:14 +01:00
Michael Vogel	5a8d66e2d4	Just removed blanks with tabs	2015-11-12 23:34:33 +01:00
rabuzarus	862ccb95d2	forumlist: doxygen corrections	2015-11-11 22:41:44 +01:00
rabuzarus	988d0327ae	forumlist: forgot some required_once for plugin_enabled()	2015-11-11 21:37:16 +01:00
rabuzarus	215205d376	forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()	2015-11-11 21:31:26 +01:00
rabuzarus	dac6f39f41	forumlist: use a more unique identifier	2015-11-11 01:29:31 +01:00
rabuzarus	96b764425e	move forumlist addon to core	2015-11-09 15:56:20 +01:00
Tobias Diekershoff	69076b9a01	Merge pull request #2053 from annando/1511-only-supported-themes ... Only show supported themes on the admin site.	2015-11-08 18:39:07 +01:00
Michael Vogel	e803e56eea	Only show supported themes on the admin site.	2015-11-08 18:35:39 +01:00
Tobias Diekershoff	686ba3fcb0	Merge pull request #2052 from fabrixxm/issue_1718 ... duepuntozero, vier: add unread messages per group	2015-11-08 18:29:15 +01:00
fabrixxm	c700a6fb37	duepuntozero, vier: add unread messages per group	2015-11-08 18:02:04 +01:00
Tobias Diekershoff	e6202defd1	Merge pull request #2049 from annando/1511-only-valid-contacts ... Only show valid contacts on the group page	2015-11-08 16:46:45 +01:00
Michael Vogel	1c5eaa646c	Only show valid contacts on the group side	2015-11-08 16:41:00 +01:00
Tobias Diekershoff	631afe5810	Merge pull request #2035 from FlxAlbroscheit/develop ... Preview the last 5 conversations in message-sidebar	2015-11-08 16:03:04 +01:00
fabrixxm	e6a8a7c8a9	Merge pull request #2048 from strk/group_post ... Include per-group count of unseen items in /ping output	2015-11-08 16:01:19 +01:00
Sandro Santilli	d31c372376	Revert the rename of <groups>	2015-11-08 15:56:43 +01:00
Sandro Santilli	e28072f548	Fix bugs and rename <groups> to <group_posts>	2015-11-08 15:56:08 +01:00
FlxAlbroscheit	613cf41fd6	Preview last five conversations in message-sidebar	2015-11-08 15:45:42 +01:00
Sandro Santilli	ba158dfeb1	Include per-group count of unseen items in /ping output ... See #1718 Unfinished work	2015-11-08 15:33:12 +01:00
Tobias Diekershoff	c0e87b2bea	Merge pull request #2045 from annando/1511-dirfind-addr ... You can now discover previously unknown users via the dirsearch	2015-11-08 15:19:11 +01:00
Michael Vogel	c2beab0d56	Fixed an undefined variable	2015-11-08 15:17:08 +01:00
Michael Vogel	7de6f23f4a	Now it is possible to search for @http://profile...	2015-11-08 15:00:52 +01:00
Michael Vogel	e12b0d27bb	You can now search for @username@domain.tld in dirfind and the search will resolve that.	2015-11-08 14:48:47 +01:00
fabrixxm	ae9c9829fa	Remove language selectors from themes ... This is now a user setting	2015-11-08 14:42:54 +01:00
fabrixxm	fb3ac68cc0	Add user language in settings, use that field as language for UI	2015-11-08 14:23:49 +01:00
fabrixxm	24d807221b	Image filebrowser dialog links images to image page ... fix #1991	2015-11-08 12:05:23 +01:00
fabrixxm	28a8c2369a	Not current theme settings in admin page ... fix #2022	2015-11-07 21:22:55 +01:00
FlxAlbroscheit	14dff6b0e0	Preview last five conversations in message-sidebar	2015-11-07 18:53:32 +01:00
Tobias Diekershoff	83c45d8d4b	Merge pull request #2029 from tugelbend/develop ... changed syntax to work with PHP 5.3 #2027	2015-11-07 16:34:13 +01:00
hauke	f3eebda4fa	changed syntax to work with PHP 5.3 #2027	2015-11-07 16:24:59 +01:00
Michael Vogel	3ccff0c77f	Merge pull request #2023 from tobiasd/20151107-registertext ... Following n4rky to resolve #1898	2015-11-07 16:02:26 +01:00
Tobias Diekershoff	9a1c57f1bc	Following n4rky to resolve #1898	2015-11-07 13:19:55 +01:00
Tobias Diekershoff	bb5f7c4db7	Merge pull request #2020 from fabrixxm/install_checks ... Install checks	2015-11-07 11:12:37 +01:00
fabrixxm	6befca288f	Check for mcrypt_create_iv() for RINO2, update link to cron documentation	2015-11-07 11:03:08 +01:00
Tobias Diekershoff	4e7bf0028c	Merge pull request #2019 from rabuzarus/0611_directory ... simple photo_menu for directory	2015-11-07 06:54:16 +01:00
fabrixxm	16123f5ad5	Check for ImageMagick and for GIF support	2015-11-07 00:22:26 +01:00
rabuzarus	df36ea0d03	simple photo_menu for directory	2015-11-07 00:08:35 +01:00
fabrixxm	5f6ea6357d	Add 'Reload active themes' to admin ... It will call 'uninstall()' and 'install()' on every active themes	2015-11-06 23:53:10 +01:00
Michael Vogel	0f41f35041	The contact template now displays the address if available	2015-11-06 00:47:54 +01:00
rabuzarus	a0ae6eb905	template-rework:little cleanup	2015-11-03 14:33:17 +01:00
rabuzarus	e785759a8b	template-rework:make use of get_contact_details_by_url()	2015-11-03 14:31:15 +01:00
rabuzarus	f196389580	Merge develop into allfriends	2015-11-02 14:31:20 +01:00
Michael Vogel	709aac0652	Only offer the choice to activate Diaspora and OStatus if the system is ready for it	2015-11-01 13:55:49 +01:00
Michael Vogel	2f47d63a29	Merge pull request #2000 from tobiasd/20151027-credits ... a credits page	2015-10-31 22:34:30 +01:00
Tobias Diekershoff	cfc9d2b88f	Merge pull request #1998 from annando/1510-network-profile2 ... New function for fetching contact data	2015-10-31 19:02:01 +01:00
Tobias Diekershoff	7d0ea70cc1	Merge pull request #2001 from annando/1510-empty-poco ... Bugfix: /poco was always empty	2015-10-31 12:48:30 +01:00
Michael Vogel	7cf4468353	Bugfix: /poco was always empty	2015-10-31 10:32:01 +01:00
Michael Vogel	09ff2f0dd5	Renamed the function	2015-10-31 00:01:33 +01:00
Tobias Diekershoff	c00847a79d	use section_title.tpl for page title	2015-10-30 18:05:45 +01:00
rabuzarus	fc37f49f23	network.php: add a descriptive comment	2015-10-30 12:47:48 +01:00
rabuzarus	56c9f23e99	prvgroup mentioning in status_editor	2015-10-30 01:59:17 +01:00
Michael Vogel	f3ce812a9e	New function for fetching contact data	2015-10-30 01:30:42 +01:00
Tobias Diekershoff	a48156aab6	display names listed in credits.txt from /credits	2015-10-29 08:48:41 +01:00
fabrixxm	fb4adc83dc	Merge pull request #1995 from rabuzarus/2810_fbrowser ... fbrowser: exclude Contact Photos	2015-10-29 08:41:21 +01:00
Tobias Diekershoff	6f601bf47d	Merge pull request #1996 from annando/1510-profile-network-page ... Show the profile in the network view when viewing single contacts	2015-10-29 08:39:56 +01:00
Michael Vogel	2e316b5cf2	Show the profile in the network view when viewing single contacts	2015-10-29 08:10:39 +01:00
rabuzarus	e88d9153a1	fbrowser: exclude Contact Photos	2015-10-28 23:22:42 +01:00
Tobias Diekershoff	8eda86d8bf	lower number of postings displayed per page for not logged in users	2015-10-28 19:01:45 +01:00
Michael Vogel	aee4522ad4	The contact page now shows the connection status.	2015-10-27 23:10:52 +01:00
rabuzarus	299c8b83ac	template-rework: let common friends and allfriends use viewcontact_template.tpl	2015-10-27 15:27:26 +01:00
Tobias Diekershoff	367699f785	Merge pull request #1987 from annando/1510-manage-enhancements ... Some small optical and structural changes to the manage template	2015-10-27 09:01:35 +01:00
Tobias Diekershoff	4079084492	Merge pull request #1975 from rabuzarus/template_rework ... Template rework for contact related pages	2015-10-27 08:59:03 +01:00
Michael Vogel	99ee45e627	The username is now a link	2015-10-26 23:11:42 +01:00
rabuzarus	7b1a957474	template-rework: try to fix double entries at match.php	2015-10-26 16:15:08 +01:00
rabuzarus	9d720f69aa	template-rework: don't show the findpeople_widget on contact edit page	2015-10-26 13:36:01 +01:00
rabuzarus	fdda4be452	manage-selector: use an easier sql querry	2015-10-26 00:19:55 +01:00
rabuzarus	87c559d605	manage-selector: sql - check for same baseurl	2015-10-25 18:04:20 +01:00
rabuzarus	4c263aa4ac	Merge develop into manage ... Conflicts: view/global.css	2015-10-25 16:57:04 +01:00
Tobias Diekershoff	03ff349a94	Merge pull request #1982 from annando/1510-reduced-profile ... Profile data are now reduced to only the most important fields	2015-10-25 16:54:24 +01:00
Tobias Diekershoff	12d9c46ec5	Merge pull request #1979 from annando/1510-gnusocial ... Statusnet is now GNU Social	2015-10-25 16:52:38 +01:00
rabuzarus	bac61cf596	manage-selector: some cleanup and css work	2015-10-25 16:49:45 +01:00
Michael Vogel	78a8db55c6	Merge pull request #1981 from rabuzarus/poke ... some work on poke template	2015-10-25 14:59:39 +01:00
rabuzarus	e0e6762ed8	some inital work to have profile pics on manage page	2015-10-25 14:00:08 +01:00
Michael Vogel	65403973c1	Merge pull request #1977 from rabuzarus/crepair ... move html from crepair.php to template	2015-10-25 09:44:12 +01:00
Michael Vogel	4631c13d08	Profile data are now reduced to only the most important fields	2015-10-25 09:15:36 +01:00
Michael Vogel	a11833e248	Statusnet is now GNU Social	2015-10-24 20:44:18 +02:00
rabuzarus	8f92b6eea4	some work on poke template	2015-10-24 19:51:58 +02:00
rabuzarus	ea2b3b2f76	move html from crepair.php to template	2015-10-24 15:57:46 +02:00
rabuzarus	87ecd8f658	tabs have now an ID	2015-10-24 15:04:27 +02:00
rabuzarus	eaf5d05030	template rework: display more infos for match and dirfind	2015-10-23 16:48:32 +02:00
rabuzarus	0c3979720f	template rework: rearrange sidebar widgets for contact related pages	2015-10-23 00:12:00 +02:00
rabuzarus	2aad62190f	template rework: use viewcontact_template.tpl also for directory	2015-10-22 22:48:49 +02:00
rabuzarus	f9c0c1d696	template rework: use viewcontact_template.tpl for contact dealing pages	2015-10-18 17:12:48 +02:00
rabuzarus	452a3011f7	Merge suggest into template_rework	2015-10-17 22:22:52 +02:00
rabuzarus	dbf1f9efcd	Merge dirfind into template_rework	2015-10-17 22:22:35 +02:00
rabuzarus	e55f9f8f07	Merge dir into template_rework	2015-10-17 22:22:20 +02:00
rabuzarus	4b8ca578d1	dirfind: move pagination into template	2015-10-17 22:09:19 +02:00
rabuzarus	b9d9bf8ecd	directory: move pagination into template	2015-10-17 21:45:55 +02:00
rabuzarus	9176e739a4	sugest.php: themeable as whole page	2015-10-17 21:25:21 +02:00
rabuzarus	72896b0f6b	unify directory page	2015-10-17 19:45:57 +02:00
Michael Vogel	2070c96dd1	Changing the acl does not work when editing posts - so it is disabled for events.	2015-10-17 08:46:45 +02:00
Michael Vogel	316276cb6d	Editing an item with an event is now opeing the event edit form.	2015-10-17 08:27:33 +02:00
rabuzarus	67f699403a	match.php: restructure acdording to the change of match.tpl	2015-10-17 00:39:50 +02:00
rabuzarus	20bb16859f	dirfind.php: move html to templates	2015-10-17 00:19:01 +02:00
rabuzarus	6ebb21a935	directory.php: move html to templates	2015-10-16 21:44:10 +02:00
fabrixxm	5299f25920	default value for firstDay in events page	2015-10-12 20:23:09 +02:00
rabuzarus	649578ae33	Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php	2015-10-11 19:39:55 +02:00
Michael Vogel	48309a25ec	Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu ... Conflicts: include/conversation.php	2015-10-11 05:11:46 +02:00
Tobias Diekershoff	27fa20ab22	Merge pull request #1947 from annando/1510-diaspora-follower ... Reworked contact relations between Diaspora and Friendica	2015-10-10 18:50:20 +02:00
Michael Vogel	bb0dff2c75	Improved contact menu	2015-10-10 16:23:20 +02:00
Michael Vogel	efbdb57f92	Reworked contact relations between Friendica and Diaspora	2015-10-10 11:06:18 +02:00
Michael Vogel	ab0fbc3a65	Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers	2015-10-10 04:56:40 +02:00
rabuzarus	0eae67ea48	update attendance state on profile wall	2015-10-09 14:20:01 +02:00
rabuzarus	d85d215bb8	attendance update in network stream	2015-10-09 13:46:08 +02:00
Michael Vogel	16da708e07	Contact names with ">" and "<" are a problem ...	2015-10-09 07:39:38 +02:00
rabuzarus	6a9ec14878	small bugfix in like.php	2015-10-08 20:26:11 +02:00
Michael Vogel	61c3ce7a21	Bugfix: The contact names had to be escaped	2015-10-08 00:25:55 +02:00
Michael Vogel	1f0b759e2f	Added resize possibility to proxy function	2015-10-07 08:25:10 +02:00
Michael Vogel	14e17b944f	Reworked fetching of contact data on "display" page	2015-10-06 18:31:08 +02:00
Michael Vogel	eefedc019b	Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy	2015-10-06 07:41:09 +02:00
Michael Vogel	901b95e935	Hide some profile data if not connected.	2015-10-06 06:56:31 +02:00
Michael Vogel	7ed61b2edc	Removed "proxy_parse_html" since it is now done in the bbcode function.	2015-10-05 22:25:14 +02:00
Michael Vogel	d3ac3f8490	Added the contact menu to the search as well.	2015-10-05 08:08:59 +02:00