16191 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	90a5ba01a3	make fullscreen mode available for other modules and some cleanup	2016-03-31 23:13:40 +02:00
Mario Vavti	6c2673ae2a	various fixes regarding mod chat	2016-03-31 22:42:28 +02:00
redmatrix	256c228efd	initial conversion to static app class	2016-03-31 13:00:04 -07:00
Mario Vavti	3fdd110e07	mod chat rework continued	2016-03-31 13:21:48 +02:00
redmatrix	1cd3b41825	deprecate $a->get_baseurl()	2016-03-30 22:13:24 -07:00
redmatrix	4148211086	change primary directory	2016-03-30 18:37:37 -07:00
redmatrix	4ba9a5ef75	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-30 16:39:08 -07:00
redmatrix	6a6dbec033	issue #319 - NOTE: this does not fix the issue, it only reports it and continues. We need to examine any logger statements that contain 'stack:' as a result of reporting this issue and find and fix the original problem - which is that set_pconfig is being called without a valid $uid. I'm worried that since we will now continue on without throwing a PHP error that nobody will ever notice or find the problem that is causing this.	2016-03-30 16:33:23 -07:00
Mario Vavti	df891f4ad2	more work on mod chat	2016-03-31 00:37:40 +02:00
Mario Vavti	08461c7049	more on mod chat	2016-03-30 14:44:03 +02:00
Mario Vavti	5462453bf2	some work on mod chat	2016-03-30 14:31:55 +02:00
redmatrix	e4f3605054	add page title to the html title	2016-03-29 14:14:17 -07:00
redmatrix	f65ede9c38	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-28 16:08:31 -07:00
redmatrix	a6ad37c691	revup	2016-03-28 16:08:11 -07:00
Mario Vavti	ba0812c447	highlight table row on hover	2016-03-27 22:37:07 +02:00
jeroenpraat	dbde9a0940	Update es_es+n. Switch the feeds as requested by Mike.	2016-03-27 14:03:02 +02:00
redmatrix	d3f38c9f43	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-26 14:34:19 -07:00
redmatrix	971e7321c6	issue #319 part 2	2016-03-26 14:33:36 -07:00
jeroenpraat	eeb1c463e3	Small, but I think useful hack. Added a top posts only atom feed, so people can choose directly from their browser which feed they need.	2016-03-26 22:32:46 +01:00
Mario Vavti	97eef2b88c	removed link to connected apps by accident	2016-03-26 19:34:38 +01:00
Mario Vavti	f714e97d63	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-26 18:46:07 +01:00
Mario Vavti	a507063174	move link to /locs to settings menu if we have more than one location and some template work on locs	2016-03-26 18:43:38 +01:00
git-marijus	3caf51b075	Merge pull request #333 from phellmes/de20160324 ... Update DE translation strings	2016-03-25 10:26:12 +01:00
redmatrix	92ec46b62e	revup	2016-03-24 19:18:25 -07:00
phellmes	9b06d952a2	Update DE translation strings	2016-03-24 09:08:12 +01:00
redmatrix	531710142c	add hook to allow plugins to perform a follow activity from an activityfeed	2016-03-23 20:04:09 -07:00
redmatrix	f200dd4395	atom specifies a uri or iri for the id. message_id isn't suitable here.	2016-03-23 16:36:27 -07:00
redmatrix	a8ac0ed549	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-22 19:59:47 -07:00
redmatrix	6f2ba0c619	rewrite the webfinger discovery logic	2016-03-22 19:58:59 -07:00
Wave	0a14ac1f60	Merge pull request #332 from wave72/master ... Updated Italian strings	2016-03-22 11:53:57 +01:00
Paolo Tacconi	02140b2f76	Updated Italian strings	2016-03-22 11:49:03 +01:00
Mario Vavti	c6b89b99b9	Add a link to /locs to channel manager	2016-03-22 10:29:17 +01:00
redmatrix	51a840f46a	update network_to_name (reserve DFRN for future use)	2016-03-21 22:02:18 -07:00
redmatrix	b081c3e94b	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-21 21:32:35 -07:00
redmatrix	ec99e3ed62	attempting to work with braindead lighttpd gnusocial servers	2016-03-21 21:31:28 -07:00
Mario Vavti	97e1a6dfde	whip mod manage into shape	2016-03-22 02:06:19 +01:00
redmatrix	28599fe652	more federation work	2016-03-20 21:41:19 -07:00
redmatrix	d3e7ef70e8	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-20 19:56:36 -07:00
redmatrix	fea532af4d	rework salmon - important, update addons also if you have enabled gnusoc addon	2016-03-20 19:55:53 -07:00
Mario Vavti	f5b22dfd5b	erge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-21 00:41:09 +01:00
redmatrix	48e62bb50a	Merge pull request #329 from git-marijus/master ... fix #328 by using a seperate query instead of group_concat	2016-03-21 10:22:30 +11:00
Mario Vavti	513078e1f7	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-20 23:52:55 +01:00
redmatrix	23151100de	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-20 15:32:09 -07:00
redmatrix	eb68b66c58	issue #330 - permit archived connections in ACLs. If they are to be blocked for delivery (or some other purpose) this should probably happen in the delivery mechanism (or other related sub-system) rather than the permissions mechanism, although currently we still attempt direct delivery to archived connections. Technically "archived" means merely that we won't 'poll' the connection according to the current definition.	2016-03-20 15:27:26 -07:00
Mario Vavti	1ddb43b0d3	an attempt to visualize the supremacy of dont show over show in the acl selector	2016-03-20 23:07:39 +01:00
Mario Vavti	9fcd470aca	fix #328 by using a seperate query instead of group_concat	2016-03-20 20:26:55 +01:00
jeroenpraat	23419e4c26	Update NL + es_ES strings.	2016-03-20 14:39:22 +01:00
Mario Vavti	34b42566b6	add fixme	2016-03-20 02:25:59 +01:00
Mario Vavti	f7ff48f806	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-03-20 01:46:13 +01:00
Mario Vavti	30cf56bdb5	make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected	2016-03-20 01:45:56 +01:00