2557 commits

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