11957 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	247f866655	There were undecoded entities in the title	2016-05-15 10:36:56 +02:00
Michael Vogel	1b2f67906b	Bugfix for shares in the plaintext function	2016-05-13 22:23:46 +02:00
Tobias Diekershoff	d6a124ee2b	Merge pull request #2511 from rabuzarus/1205_photo_live_update ... 1205 photo live update	2016-05-13 07:57:13 +02:00
rabuzarus	255405c8f3	photos view: fix js error - forgot to delete this testing stuff	2016-05-13 01:34:56 +02:00
rabuzarus	6944d67dbc	photos view: fix js error with undefined variable	2016-05-13 01:26:07 +02:00
Tobias Diekershoff	6a0a30ab75	Merge pull request #2510 from rabuzarus/1005_js_pageload ... infinite_scroll: move js from index.php to main.js	2016-05-12 07:47:26 +02:00
rabuzarus	d454905d3c	infinite_scroll: move js from index.php to main.js	2016-05-11 01:52:05 +02:00
Tobias Diekershoff	0b4565a72c	Merge pull request #2507 from annando/1605-hidewall ... Better implementation of "hidewall" with feeds	2016-05-06 19:28:55 +02:00
Michael Vogel	4d105111a7	Added documentation	2016-05-06 18:30:34 +02:00
Michael Vogel	b7c14803b2	The feed header is now displayed even with "hidewall" activated	2016-05-06 18:27:19 +02:00
Michael Vogel	6f72bc8d3a	Better implementation of "hidewall"	2016-05-06 11:04:21 +02:00
Tobias Diekershoff	a1d06cc45e	Merge pull request #2505 from annando/1605-diaspora-reshare ... Diaspora: Reshares of non native reshares now look better	2016-05-06 09:45:49 +02:00
Michael Vogel	ea78f63eac	Diaspora: Reshares of non native reshares now look better	2016-05-06 08:22:27 +02:00
Tobias Diekershoff	480c35fb86	Merge pull request #2503 from annando/1605-hide-profile ... Better handling of hidden profiles	2016-05-06 07:45:44 +02:00
Tobias Diekershoff	c2a648adb2	Merge pull request #2504 from annando/1605-share2 ... Avoid warning messages at "strstr"	2016-05-06 07:42:35 +02:00
Michael Vogel	1aa3aa21b3	Avoid warning messages at "strstr"	2016-05-05 20:36:23 +02:00
Michael Vogel	bd1030b246	Update the global contact entries for local users on a regular base	2016-05-05 15:38:28 +02:00
Michael Vogel	de431e185e	New function to update the global contact for the user id.	2016-05-05 15:08:05 +02:00
Michael Vogel	3df235e5bd	The global contact for server users is now stored directly	2016-05-05 12:02:51 +02:00
Michael Vogel	90155da59a	The "hide" element is included in the feed as well.	2016-05-05 06:46:23 +02:00
Michael Vogel	683cdcc19e	Changed check for searchability	2016-05-05 00:29:54 +02:00
Michael Vogel	ed485b9d61	Set "hide" in noscrape	2016-05-04 23:50:31 +02:00
Michael Vogel	fbc5404522	DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus.	2016-05-04 23:21:30 +02:00
Michael Vogel	8992577bb6	Better handling of hidden profiles	2016-05-04 09:30:55 +02:00
Tobias Diekershoff	167a8998d6	Merge pull request #2502 from annando/1605-diaspora-share ... Shared links to Diaspora should look better now	2016-05-04 07:20:22 +02:00
Tobias Diekershoff	e29c748b25	Merge pull request #2501 from annando/1604-insert ... Avoid SQL errors because of existing entries	2016-05-04 07:19:58 +02:00
Michael Vogel	bed4799728	Some more beautification.	2016-05-03 21:57:08 +02:00
Michael Vogel	a7aaf7cc98	Shared links to Diaspora should look better now	2016-05-03 20:12:13 +02:00
Michael Vogel	26e1c4d458	Avoid SQL errors because of existing entries	2016-05-03 19:20:58 +02:00
Tobias Diekershoff	3a819e3630	Merge pull request #2500 from fabrixxm/feature_mobile_notification_menu ... style notification menu to be more mobile-friendly	2016-05-02 15:20:56 +02:00
Michael Vogel	1bf67c2048	Merge pull request #2499 from fabrixxm/issue_mobile_iframe_embed ... small fix to embed iframes on mobile	2016-05-02 14:56:00 +02:00
Fabrixxm	343c7faba4	style notification menu to be more mobile-friendly	2016-05-02 14:55:57 +02:00
Fabrixxm	9a6cfcfd88	small fix to embed iframes on mobile	2016-05-02 14:17:55 +02:00
Tobias Diekershoff	3d3cde2aed	Merge pull request #2497 from annando/1604-local-copy ... Copy an item to the local user if it's only available as public copy	2016-05-02 06:07:50 +02:00
Tobias Diekershoff	7418e5256e	Merge pull request #2495 from annando/1604-messagelist ... Bugfix: The message list always showed "x and you"	2016-05-02 06:06:47 +02:00
Tobias Diekershoff	d13460362d	Merge pull request #2498 from rabuzarus/0105_autocomplete_webbie ... autocomplete: use webbie on click for nav global contact search	2016-05-01 15:48:23 +02:00
rabuzarus	03e1c3b775	autocomplete:remove commited file by accident	2016-05-01 11:27:43 +02:00
Michael Vogel	b677f63e85	Added some more explanation/now copy the whole thread	2016-05-01 09:48:05 +02:00
rabuzarus	367869ed81	autocomplete: use webbie on click for nav global contact search	2016-05-01 08:45:11 +02:00
Michael Vogel	5fc1eebdab	Copy an item to the local user if it's only available as public copy	2016-05-01 00:19:24 +02:00
Michael Vogel	8e0b3b28da	Bugfix: The message list always showed "x and you"	2016-04-30 14:13:43 +02:00
Michael Vogel	9288c57bea	Merge pull request #2494 from rabuzarus/2904_autocomplete ... autocomplete: Use stopImmidiatePropagation() only if we are in a list to not interf…	2016-04-29 15:55:45 +02:00
Michael Vogel	51a9cb8a2d	Merge pull request #2493 from rabuzarus/2904_textcomplete_update ... jquery.textcomplete update to v1.3.4	2016-04-29 15:55:07 +02:00
rabuzarus	47e395be88	Use stopImmidiatePropagation() only if we are in a list to not interfere with other keypress listeners	2016-04-29 14:42:12 +02:00
rabuzarus	dd2a8fd852	jquery.textcomplete update to v1.3.4	2016-04-29 14:31:09 +02:00
Michael Vogel	6a739b5ba2	Merge pull request #2491 from rabuzarus/2804_acl_hook ... add a hook call to acl_lookup()	2016-04-29 14:03:02 +02:00
rabuzarus	a61361f351	add some hook docu	2016-04-28 23:18:38 +02:00
rabuzarus	3dad86f0e0	add a hook call to acl_lookup()	2016-04-28 22:15:55 +02:00
Tobias Diekershoff	853b13252a	Merge pull request #2490 from annando/1604-bugfix-xml ... Bugfix for XML function	2016-04-28 08:43:54 +02:00
Michael Vogel	af22007481	Bugfix for XML function	2016-04-28 08:30:15 +02:00