2886 commits

Author	SHA1	Message	Date
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	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