3022 commits

Author	SHA1	Message	Date
Michael Vogel	01c2eacd46	Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total	2016-01-11 14:25:48 +01:00
Tobias Diekershoff	bfdbc0c818	don't mention FB in newhere tipps	2016-01-11 07:54:52 +01:00
Michael Vogel	6b85fa17bb	Added some documentation	2016-01-10 19:06:34 +01:00
Michael Vogel	b4631cebed	Fixed SQL problems	2016-01-10 17:10:56 +01:00
Michael Vogel	23731fc9aa	Bugfix: The display hadn't fetched the correct contact for the uid.	2016-01-10 15:44:23 +01:00
Michael Vogel	2f49e984bd	Updated database.sql file, further code cleanup	2016-01-10 14:12:05 +01:00
Michael Vogel	214f381e81	Code cleanup	2016-01-10 12:37:49 +01:00
Michael Vogel	885dc1df81	gcontact update script, rebuilt follow page, query speedup for community and network groups	2016-01-10 09:19:00 +01:00
Michael Vogel	6703ba468a	Profile data in gcontact overwrites profile data	2016-01-08 08:02:42 +01:00
Michael Vogel	358a9fd6fd	Notify and alias will be fetched via OStatus	2016-01-08 00:35:46 +01:00
Michael Vogel	9521cdc18f	notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed	2016-01-07 23:43:16 +01:00
Michael Vogel	fdb31abdfa	Use gcontact when adressing contacts in editor	2016-01-07 08:19:28 +01:00
Michael Vogel	5ab2786c00	Get rid of the table "unique_contacts"	2016-01-06 22:23:12 +01:00
Michael Vogel	2bad2cdd91	More fields in gcontact, contact search respects "hide" setting	2016-01-06 14:13:59 +01:00
Michael Vogel	75e2ec01fe	The gcontact will now be connected to the items	2016-01-05 15:34:27 +01:00
fabrixxm	fcf7a791f1	Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" ... This reverts commit 83e54f70d3, reversing changes made to ecf576bdd0.	2016-01-04 11:46:19 +01:00
fabrixxm	83e54f70d3	Merge pull request #2223 from rabuzarus/2912_photo_widget ... photo aside widget for profile page	2016-01-04 10:06:07 +01:00
Tobias Diekershoff	75ed2f830d	moved include Scape to top of the file	2016-01-03 19:15:13 +01:00
rabuzarus	29c671bb22	photos aside widget:permissions cleanup	2016-01-03 16:09:05 +01:00
rabuzarus	1ab022f4df	photos aside widget: move dependencies to the header	2016-01-03 15:45:02 +01:00
Michael Vogel	2ed3ae1aab	Bugfix: The request process from DFRN hadn't worked anymore since the last pull request	2016-01-01 17:49:07 +01:00
rabuzarus	20fbf670db	photo aside widget for profile page	2015-12-30 00:26:50 +01:00
Tobias Diekershoff	99861b9fa6	Merge pull request #2216 from fabrixxm/feature-api-like ... Works on API and a small refractor, updated docs	2015-12-28 18:39:21 +01:00
Tobias Diekershoff	03000beac6	Merge pull request #2219 from fabrixxm/quattro ... Fix video oembed appearance	2015-12-28 18:39:03 +01:00
fabrixxm	a1c1a6cae8	workaround for media.ccc.de oembed with size 0	2015-12-28 18:28:02 +01:00
Michael Vogel	2f13506180	Bugfix: The participants on the mail page were displayed wrong	2015-12-28 18:13:03 +01:00
fabrixxm	f579b2af55	Fix TOC links href, no TOC in home	2015-12-28 10:24:47 +01:00
fabrixxm	1776b19dbf	Add table of content in aside of help pages	2015-12-28 10:24:47 +01:00
fabrixxm	f27fad7b47	Move Like/Dislike/Attend add/remove code to include/like.php	2015-12-28 10:23:06 +01:00
fabrixxm	cf86162a08	Merge pull request #2214 from rabuzarus/2612_db_docu ... add db documentation to the help pages	2015-12-28 10:22:33 +01:00
Tobias Diekershoff	497175c56e	Merge pull request #2213 from annando/1512-dfrn-request ... Support for remote subscription in Diaspora	2015-12-28 05:25:50 +01:00
Tobias Diekershoff	b09fd2c39e	Merge pull request #2212 from annando/1512-xrd ... XRD now should react more like an OStatus server	2015-12-28 05:24:36 +01:00
rabuzarus	038611bcb4	add documentation	2015-12-28 03:17:55 +01:00
Michael Vogel	72f7ee7fd3	Support for remote subscription in Diaspora	2015-12-28 03:14:38 +01:00
Michael Vogel	8b25f51116	XRD now should react more like an OStatus server	2015-12-28 01:04:14 +01:00
Michael Vogel	435a29026d	Diaspora: The /p/ only should return top level posts - not comments	2015-12-27 21:12:53 +01:00
Tobias Diekershoff	bc9c3d80fa	typos in OStatus (re)subscribing	2015-12-27 08:44:23 +01:00
rabuzarus	7530c950e3	help - make use of subfolders	2015-12-26 16:06:38 +01:00
rabuzarus	3df5c17124	reformat todo according to doxygen style	2015-12-25 23:17:34 +01:00
rabuzarus	2cf1aaa791	add pager to common friends and allfriends	2015-12-15 14:31:24 +01:00
Michael Vogel	d077dbbcde	Bugfix: The bbcode conversion of the profile was inconsistent	2015-12-14 23:53:35 +01:00
rabuzarus	e61d6e030e	fix account_type	2015-12-14 14:12:56 +01:00
Tobias Diekershoff	c0c0d62a2e	Merge pull request #2173 from annando/1512-optimize-fragmentation ... There is now a fragmentation level for the table optimization	2015-12-13 08:32:03 +01:00
Michael Vogel	5a1041578c	Bugfix: The subscribe process took the own contact by random ...	2015-12-12 17:55:57 +01:00
Michael Vogel	ec9b1b7afd	There is now a fragmentation level for the table optimisation	2015-12-12 17:46:24 +01:00
Michael Vogel	0869cce45f	Code cleaning, real changes will follow	2015-12-12 17:41:25 +01:00
rabuzarus	f513b25f6f	fix directory search	2015-12-12 01:27:31 +01:00
Michael Vogel	300007a0cf	Bugfix: Posts weren't always shown for feeds that start with "www."	2015-12-10 22:47:58 +01:00
Johannes Schwab	2f866fecf9	fix path for photo and proxy	2015-12-08 11:31:50 +01:00
Tobias Diekershoff	d944b65253	Merge pull request #2151 from annando/1512-misconfigured-friendica ... Workaround for misconfigured Friendica servers with probe_url	2015-12-07 06:37:37 +01:00
Michael Vogel	bcf7e673c9	Issue 1924: New configuration value for permitting crawler access	2015-12-06 22:01:20 +01:00
Michael Vogel	f880bdd33b	Workaround for misconfigured Friendica servers	2015-12-06 18:52:19 +01:00
Tobias Diekershoff	6a05112d98	Merge pull request #2149 from annando/issue-1921 ... Issue 1921: Disable the auto update	2015-12-06 07:31:13 +01:00
Michael Vogel	f406e5ddbd	Issue 1921: Disable the auto update	2015-12-06 00:18:59 +01:00
Michael Vogel	01c9d13927	Issue 1871: Show an information if a group is empty	2015-12-05 23:29:42 +01:00
fabrixxm	f44846555a	quattro: hide acl button in edit post ... fix #1780	2015-12-04 19:29:13 +01:00
Tobias Diekershoff	eaf975faae	Merge pull request #2130 from annando/1512-contact-rework ... Some more contact rework	2015-12-04 06:53:29 +01:00
rabuzarus	4b7f080c46	ping: further work	2015-12-03 22:42:53 +01:00
rabuzarus	c0406918ec	ping: cleanup	2015-12-03 17:15:49 +01:00
Michael Vogel	1a170c8743	Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework ... Conflicts: mod/contacts.php mod/crepair.php	2015-12-03 14:38:04 +01:00
Michael Vogel	1f9644bded	Merge pull request #2131 from rabuzarus/3011_hcard_vcard ... unify hcard and vcard	2015-12-03 14:16:52 +01:00
rabuzarus	d963cdfe48	photos-albms widget: add some classes	2015-12-02 20:01:22 +01:00
Michael Vogel	4286225f37	Added/Changed accesskeys for the new tab actions	2015-12-02 07:56:10 +01:00
Michael Vogel	7ed73a06ab	Solved a problem with author links that are different from what is provided in the contact	2015-12-01 23:51:34 +01:00
rabuzarus	1d6d9d3d24	photos-albms widget: add some classes	2015-12-01 21:07:05 +01:00
rabuzarus	cd7ec72b20	unify hcard and vcard: make $pdesc available in hcard&vcard	2015-12-01 19:47:23 +01:00
Michael Vogel	c45b16d2a1	Unifying the texts.	2015-12-01 19:02:03 +01:00
rabuzarus	39b37281a7	Merge develop into 3011_hcard_vcard	2015-12-01 18:34:13 +01:00
rabuzarus	89c5989cfb	unify hcard and vcard	2015-12-01 18:31:08 +01:00
Michael Vogel	06a4b0dc5e	Header removed in the contact area	2015-12-01 18:21:05 +01:00
Michael Vogel	1c93729c46	Tab is added to "all friends" and "common friends"	2015-12-01 08:12:05 +01:00
Michael Vogel	712b3c7593	Merge pull request #2121 from rabuzarus/3011_viewcontactstitle ... make viewcontacts part of the profile tab	2015-11-30 23:29:35 +01:00
Michael Vogel	0278e60664	Merge pull request #2104 from rabuzarus/2611_contacts_directory ... display contact information in contact and directory according to the…	2015-11-30 18:07:35 +01:00
fabrixxm	2753e62483	Merge pull request #2119 from annando/1511-contact-evolution ... Refurbished contact settings/contact posts	2015-11-30 14:45:23 +01:00
fabrixxm	a60b702df1	Merge pull request #2113 from annando/1511-manage-notifications ... The manage page now shows the notifications	2015-11-30 12:04:53 +01:00
Michael Vogel	4efb6c6f79	Merge pull request #2120 from rabuzarus/2911_network_header ... 2911 network header	2015-11-30 08:30:34 +01:00
Michael Vogel	8c35304013	Some SQL improvements	2015-11-30 08:25:11 +01:00
rabuzarus	45c2a4868e	make viewcontacts part of the profile tab	2015-11-30 03:25:23 +01:00
rabuzarus	a6aac8f950	networkheader: do css work the other supported themes	2015-11-30 01:24:22 +01:00
Michael Vogel	a638417ab5	Show contact comments in the post	2015-11-29 23:46:10 +01:00
Michael Vogel	91011b7190	Removing of useless code	2015-11-29 23:36:19 +01:00
Michael Vogel	a7ea6ef096	Use the template for the header.	2015-11-29 23:33:32 +01:00
Michael Vogel	42d903dd68	Redesign of the contact pages, new tab for contact statuses	2015-11-29 23:22:05 +01:00
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