18746 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	b6cad08273	update changelog	2017-02-27 11:41:58 +01:00
Mario Vavti	7f423016f0	whitespace	2017-02-27 11:11:53 +01:00
Mario Vavti	a41603ed85	missing clear	2017-02-27 10:54:43 +01:00
Mario Vavti	f93431b43e	do not mess up schemas	2017-02-27 10:44:50 +01:00
Mario Vavti	f5a03102d8	lower version requirement to 2.2RC	2017-02-27 10:19:01 +01:00
Mario Vavti	e0e30ead58	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-02-27 10:13:29 +01:00
Mario Vavti	0f208fb36b	set minversion and maxversion for themes in view/theme/themename/php/theme.php instead of separate file.	2017-02-27 10:13:08 +01:00
zotlabs	94fdcabac9	Merge pull request #687 from mjfriaza/dev ... Updated the Spanish translation	2017-02-27 13:36:09 +11:00
Mario Vavti	4f07abe655	add a minversion to the theme and fallback to default if requirement is not met. mark incompatible themes in the theme selector	2017-02-26 21:01:20 +01:00
Manuel Jiménez Friaza	bc01b6b4ad	Updated the Spanish translation	2017-02-26 08:02:17 +01:00
zotlabs	8783ccfd72	move admin permission decision out of the router - it is already provided in the module and the higher level check is causing some oembed redirect issues.	2017-02-25 16:22:09 -08:00
zotlabs	92615247ac	send sync packet on profile photo permissions change	2017-02-25 15:04:17 -08:00
zotlabs	78ed01f3ef	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-25 13:58:07 -08:00
zotlabs	232862ae08	escape tags on viewsrc output in case it is not text/bbcode.	2017-02-25 13:54:39 -08:00
Mario Vavti	285e04c77e	bump version	2017-02-25 21:33:32 +01:00
zotlabs	70f8840fbd	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-24 13:55:57 -08:00
zotlabs	8d0d2015d7	We've passed the deadline for allowing unsigned zot finger tokens. It is now a protocol requirement.	2017-02-24 13:53:49 -08:00
Mario Vavti	cf11a89457	use chanlink_url() in directory since the xchan might not yet be available on our server	2017-02-24 10:08:09 +01:00
zotlabs	732dfa63c7	deleting profile vcard entries was pretty well borked	2017-02-23 20:27:12 -08:00
zotlabs	b1ff5367e7	more work on profile vcards - still a lot of work to go	2017-02-23 19:07:01 -08:00
zotlabs	96fdb88690	nativewiki: only apply markdown filter to markdown input	2017-02-23 15:15:19 -08:00
zotlabs	3e992604c7	move some functions to more appropriate places	2017-02-23 14:52:36 -08:00
zotlabs	c866c48252	minor edits	2017-02-23 11:26:22 -08:00
zotlabs	7b4d0168c0	parse bbcode events which use the "new" vcalendar format. work in progress.	2017-02-23 11:09:02 -08:00
Mario Vavti	3e2e60fb86	update changelog	2017-02-23 14:51:09 +01:00
Mario Vavti	9bab858fd1	move collapsed login and register buttons to the left	2017-02-23 12:32:27 +01:00
Mario Vavti	3d0c6700db	yet one more place to use chanlink_hash() instead of chanlink_url()	2017-02-23 12:24:42 +01:00
Mario Vavti	5012baba15	one more place to use chanlink_hash() instead of chanlink_url()	2017-02-23 11:41:03 +01:00
Mario Vavti	41c67fa345	more places to use chanlink_hash() instead of chanlink_url() for profile_link	2017-02-23 10:36:00 +01:00
Mario Vavti	c75852455b	use chanlink_hash() instead of chanlink_url() for $profile_link	2017-02-23 09:53:24 +01:00
zotlabs	27fa15e95d	Merge pull request #685 from phellmes/dev ... Update DE translation strings	2017-02-23 12:11:09 +11:00
phellmes	175e222927	Update DE translation strings	2017-02-22 14:50:28 +01:00
Mario Vavti	55924f5c5b	apps improvements	2017-02-22 11:22:43 +01:00
zotlabs	956f0043fc	change text back to 'add apps'	2017-02-21 23:16:05 -08:00
zotlabs	70cdbe4816	Merge pull request #684 from anaqreon/dev ... Change Add Apps to Manage Apps and support translation.	2017-02-22 18:14:30 +11:00
zotlabs	6644dc4861	use head_add_link() for feed discovery	2017-02-21 18:58:51 -08:00
Andrew Manning	3e144baacd	Change Add Apps to Manage Apps and support translation.	2017-02-21 20:32:13 -05:00
zotlabs	bbacfbdd6a	display page not updating after comment	2017-02-21 15:24:39 -08:00
Mario Vavti	cbc0e5b934	do not lock out channels with only read perms from all post actions. we check read/write permissions for each command later in the process	2017-02-21 14:52:42 +01:00
Mario Vavti	81d556d32e	wrong permission	2017-02-21 10:34:40 +01:00
zotlabs	5ad5a0fa07	detect no acl	2017-02-20 23:13:27 -08:00
zotlabs	e54ba7ecbc	fix find_folder_hash_by_path() which was not safe against multiple attach structures with the same filename but in different directories	2017-02-20 23:03:48 -08:00
zotlabs	1c1d1f1185	update fr translation	2017-02-20 18:46:51 -08:00
zotlabs	bc1812840a	don't search on empty filename - we shouldn't find it. The reason why this change is being made is because we actually did find it due to a development glitch	2017-02-20 15:06:17 -08:00
zotlabs	74def75ca3	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-20 14:14:26 -08:00
Mario Vavti	924b353e5a	width must be 100% here	2017-02-20 23:09:21 +01:00
zotlabs	31618a4310	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2017-02-20 14:07:42 -08:00
zotlabs	21e3481810	wiki page permissions issue	2017-02-20 14:07:22 -08:00
Mario Vavti	d7ba2c7168	if we slide to left aside make the overlay darker and leave aside as is	2017-02-20 14:02:39 +01:00
zotlabs	6f811fd7f9	bug in adding main.js as a js source	2017-02-19 17:04:37 -08:00