2381 commits

Author	SHA1	Message	Date
Michael Vogel	842ac46857	Scrape now contains the number of contacts as well.	2015-02-08 23:35:29 +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
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
Michael Vogel	04ab875a62	Added "about" to noscrape.	2015-01-27 19:52:54 +01:00
Michael Vogel	848c09935a	The contact list in mails now contains not only the name but also the address.	2015-01-27 08:04:24 +01:00
Michael Vogel	583c2ce13e	poco can now be used to query the global contacts.	2015-01-27 08:01:37 +01:00
Michael Vogel	e8bfa32b37	Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile	2015-01-26 01:07:15 +01:00
Michael Vogel	bc2c046446	poco: Only update the global contacts when there is a network value/Export your own contact as well	2015-01-25 16:40:20 +01:00
Michael Vogel	105d6a22a4	gender will be updated in the profiles as well.	2015-01-25 13:22:25 +01:00
Michael Vogel	2f400627c7	Support for keywords and gender in (global) contacts.	2015-01-25 13:19:37 +01:00
Michael Vogel	dff2384e82	Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts	2015-01-25 08:44:42 +01:00
Tobias Diekershoff	1c424a5425	Merge pull request #1315 from annando/1501-issue-1283 ... issue 1283 - Share-it button support for friendica	2015-01-25 08:24:21 +01:00
Michael Vogel	344210bd6d	Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.	2015-01-25 00:19:59 +01:00
Michael Vogel	58d814b793	issue 1283 - Share-it button support for friendica	2015-01-25 00:10:58 +01:00
Tobias Diekershoff	eaaed02ffd	use type email in users settings as well	2015-01-24 09:40:01 +01:00
Tobias Diekershoff	8b558eb7ea	type email for email field in add user form	2015-01-24 09:30:44 +01:00
Michael Vogel	1f23d691f3	Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus	2015-01-21 01:30:09 +01:00
Michael Vogel	ed037124b3	Merge pull request #1299 from fabrixxm/optional-text-only-email ... Optional text only email	2015-01-20 23:26:44 +01:00
Michael Vogel	184dcf75a7	Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.	2015-01-20 22:54:25 +01:00
fabrixxm	816d3f86e7	reword checkbox help text	2015-01-20 22:17:03 +01:00
fabrixxm	b2527039b7	add text-only email option ... add a checkbok to notification settings. if checked, html body is not added to email.	2015-01-20 19:19:58 +01:00
Tobias Diekershoff	3483cd35f8	use HTML5 attributes in the installer wizard	2015-01-16 19:32:31 +01:00
Johannes Schwab	9cb3a4188e	fix network tab urls	2015-01-16 02:25:17 +01:00
Michael Vogel	beaca70126	OStatus: Replies now arrive their target.	2015-01-12 00:14:51 +01:00
Michael Vogel	94fb0305f7	Poco now shows "about" and the location as well.	2015-01-10 00:34:08 +01:00
Michael Vogel	8f1cfac20a	The global contacts now contain the network name so that the suggestions can select between this.	2015-01-08 07:59:20 +01:00
Michael Vogel	46db8575a0	The table "unique_contacts" now has an "about" and "location" field as well.	2015-01-08 01:32:19 +01:00
Michael Vogel	044eaa778f	Markdown is now supported in the location field as well.	2015-01-08 00:13:43 +01:00
Michael Vogel	e7e3857f5c	The "about" section is now run through bbcode.	2015-01-07 18:06:32 +01:00
Michael Vogel	b36d799044	Fetching "location" and "about" from diaspora. Displaying them on the "display" page.	2015-01-07 01:46:13 +01:00
Michael Vogel	16e4e61cc5	Only show contacts from open networks	2015-01-05 22:44:55 +01:00
Michael Vogel	011f5b9cae	Bugfix: Postings disappeared due to a small variable ...	2015-01-05 14:28:17 +01:00