2410 commits

Author	SHA1	Message	Date
FlxAlbroscheit	001e940c6c	Feature for desktop-notifications ... see issue #1163	2015-03-31 02:06:07 +02: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
FlxAlbroscheit	21237ddba6	Give access to contact's profile-URL	2015-03-10 22:44:57 +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