15764 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Vavti	b1f926ba89	merge redmatrix fixes	2015-07-10 20:46:46 +02:00
Mario Vavti	071a233fb8	css fixes	2015-07-10 13:44:23 +02:00
Mario Vavti	39d68bf7c7	do not change selected/active class color on hover	2015-07-10 13:34:36 +02:00
Mario Vavti	ebb07de788	re-enable selected/active class	2015-07-10 13:25:50 +02:00
Mario Vavti	fee607db56	more webpages - generic-content-wrapper fixes	2015-07-10 13:16:45 +02:00
Mario Vavti	1554b5a2ee	add generic content wrapper to post/webpage editor and make editpost render correctly	2015-07-10 12:46:20 +02:00
Mario Vavti	7eb614c8aa	schema focus: refine content width to be more in balance with the recent aside width	2015-07-10 11:15:05 +02:00
Mario Vavti	e1f64b6748	move section and aside padding from default.css to style.css	2015-07-10 10:09:54 +02:00
Mario Vavti	c7b55f7753	revert ... do not show status editor in /display - we most probably want to read the thread or comment.	2015-07-09 22:31:21 +02:00
Mario Vavti	2b9a480c2f	fix vcard title spacing	2015-07-09 22:23:24 +02:00
Mario Vavti	0bec45e570	do not show status editor in /display - we most probably want to read the thread or comment.	2015-07-09 21:03:10 +02:00
Mario Vavti	08996e5b9b	fix aside width for collapsed state	2015-07-09 20:54:13 +02:00
Mario Vavti	115c18353e	move profile image up and refine the aside width	2015-07-09 14:44:24 +02:00
Mario Vavti	59cddef032	remove padding	2015-07-09 14:05:35 +02:00
Mario Vavti	efa55437d4	increase width of the aside area and make default profile image size 300x300	2015-07-09 13:59:16 +02:00
redmatrix	43354ab385	inconsistent naming of block item types	2015-07-08 18:05:38 -07:00
Mario Vavti	e12d58a75c	fix typo to make directory safe mode default to on work again	2015-07-08 21:28:36 +02:00
Haakon Meland Eriksen	07e890a79a	Merge remote-tracking branch 'upstream/master'	2015-07-08 14:38:00 +02:00
redmatrix	6b41074396	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-07 16:50:25 -07:00
redmatrix	09e365c797	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-07 16:48:54 -07:00
redmatrix	78f0138270	version update	2015-07-07 16:48:36 -07:00
redmatrix	7db1bd23f0	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-07-07 16:07:53 -07:00
redmatrix	dad4ac6c89	incorrect value for hubloc_deleted in zot_get_hublocs() query	2015-07-07 16:06:34 -07:00
Mario Vavti	f6cf992aee	fix sorting of channel suggestions	2015-07-07 22:48:01 +02:00
Mario Vavti	f67d9d59af	rename function get_directory_settings => get_directory_setting and move sort options to directory title bar	2015-07-07 22:29:27 +02:00
redmatrix	75469a61bf	Merge pull request #4 from git-marijus/master ... abook_pending should probably be 1 in this place	2015-07-08 06:19:48 +10:00
Mario Vavti	9c577e0422	make public forums only setting sticky and simplify function to get directory settings	2015-07-07 21:41:37 +02:00
Haakon Meland Eriksen	3f9e39a9e3	Merge remote-tracking branch 'upstream/master'	2015-07-07 19:24:36 +02:00
Mario Vavti	cc7eaa0d05	code style correction	2015-07-07 14:52:06 +02:00
Mario Vavti	b50151d7bf	make directory suggest work with directory options	2015-07-07 14:46:47 +02:00
Mario Vavti	18798b1d12	schema focus: adjust width to match photo width in /photos	2015-07-07 12:23:19 +02:00
Mario Vavti	adfb4072e8	various css fixes	2015-07-07 12:13:15 +02:00
Mario Vavti	2d0d5876ba	more word wrap fixes	2015-07-07 10:23:39 +02:00
Mario Vavti	807471d2a5	move if clause outside of the div	2015-07-07 09:56:30 +02:00
Mario Vavti	3456e7ca67	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-07 09:42:00 +02:00
Mario Vavti	ee01e67fa7	use default style for default webpage	2015-07-07 09:41:27 +02:00
redmatrix	862bfbdd2b	incorrectly named doc file	2015-07-06 20:29:21 -07:00
redmatrix	7cfaae8d4f	ok that's wretchedly inefficient but provides a basic relevance search for strings in doc files.	2015-07-06 20:21:41 -07:00
redmatrix	1b3e046cd2	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-06 17:54:29 -07:00
redmatrix	f8898ba573	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-06 17:39:03 -07:00
redmatrix	48972d1e8a	version update	2015-07-06 17:38:50 -07:00
Mario Vavti	53f4b260cf	abook_pending should probably be 1 in this place	2015-07-06 22:48:12 +02:00
Mario Vavti	05b231b087	fix word wrapping in tagblock and dirtagblock and possibly other places	2015-07-06 10:36:57 +02:00
redmatrix	8fad0187ec	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-05 21:38:21 -07:00
redmatrix	49239c936a	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-05 21:37:30 -07:00
redmatrix	f7c562fd21	version update	2015-07-05 21:37:04 -07:00
redmatrix	4abb114474	very crude but working doc search	2015-07-05 21:09:04 -07:00
redmatrix	f20933e1e0	more work on db storage of doco	2015-07-05 19:52:41 -07:00
Haakon Meland Eriksen	b51bcba263	Added cron script to exexute poller every 5 minutes	2015-07-05 23:38:10 +02:00
Haakon Meland Eriksen	17d004d52b	Merge remote-tracking branch 'openshift/master'	2015-07-05 22:43:43 +02:00