6837 commits

Author	SHA1	Message	Date
zotlabs	b38625aef6	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev	2018-09-05 21:23:49 -07:00
zotlabs	44ca674937	Merge branch 'red' into dev	2018-09-05 21:18:14 -07:00
Mario Vavti	4f82428a20	hide cover photo by default and show it only if conditions are met	2018-09-05 14:31:34 +02:00
Mario Vavti	e494a76b33	revert "Add bottom margin on aside elements and main to allow for viewport footer." ... This reverts commit 1d7d604016.	2018-09-05 12:34:30 +02:00
Mario Vavti	1753e40466	Revert "Fix jumpy sidebars" ... This reverts commit 79eb6d3942.	2018-09-05 12:32:53 +02:00
Mario Vavti	a821682c8c	instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid.	2018-09-05 12:17:32 +02:00
zotlabs	d155ded7c3	Merge branch 'zap'	2018-09-04 19:16:42 -07:00
zotlabs	2b472cf7eb	reshare theme changes	2018-09-04 19:15:13 -07:00
zotlabs	27a982249b	Merge branch 'zap'	2018-09-04 18:48:48 -07:00
zotlabs	bd1fa5c360	stream order widget	2018-09-04 18:44:02 -07:00
zotlabs	cf2604d104	Merge branch 'zap'	2018-09-02 20:46:40 -07:00
zotlabs	ed00b9957b	indicate repeated posts	2018-09-02 20:44:15 -07:00
zotlabs	143241a45e	Merge branch 'zap'	2018-09-02 20:17:52 -07:00
zotlabs	931e0b5445	changes to sharing	2018-09-02 20:16:04 -07:00
zotlabs	9282a6a40b	Merge branch 'zap'	2018-08-30 21:30:46 -07:00
zotlabs	d00648f3e1	Merge branch 'red'	2018-08-30 21:27:20 -07:00
zotlabs	89d1be0343	better format of like/dislike text, grab object['id'] if inreplyto missing for these activities	2018-08-29 20:02:27 -07:00
Mario	4c1944a08d	Merge branch 'extend-convitems-dropdown' into 'dev' ... Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265	2018-08-27 10:02:58 +02:00
M.Dent	a0c2bbac9d	Add hook to extend conv_item cog dropdown menu	2018-08-26 23:26:10 -04:00
Max Kostikov	f5f6ec3d71	Update wiki.tpl	2018-08-25 21:34:58 +02:00
Max Kostikov	44f639f371	Revert "Update wiki.tpl" ... This reverts commit c16fda1cb6	2018-08-25 21:31:47 +02:00
Max Kostikov	6767ff5434	Revert "Update wiki.tpl" ... This reverts commit ff1a0d217f	2018-08-25 21:30:58 +02:00
Max Kostikov	ff1a0d217f	Update wiki.tpl	2018-08-25 21:29:25 +02:00
Max Kostikov	732ce25d7f	Update nwiki_page_history.tpl	2018-08-25 21:17:25 +02:00
Max Kostikov	c16fda1cb6	Update wiki.tpl	2018-08-25 21:16:05 +02:00
Mario Vavti	f036c25dca	Merge remote-tracking branch 'mike/master' into dev	2018-08-24 14:44:45 +02:00
zotlabs	29f809f078	clean up the admin summary page	2018-08-23 17:31:41 -07:00
zotlabs	6ecd31a715	tweak archive widget for articles	2018-08-22 13:30:16 -07:00
Max Kostikov	456bc2ef86	Update hstrings.php	2018-08-22 15:13:01 +02:00
Max Kostikov	e071cd4635	Update hmessages.po	2018-08-22 15:12:09 +02:00
Mario Vavti	cc03e1ceef	Merge remote-tracking branch 'mike/master' into dev	2018-08-22 10:47:40 +02:00
Mario	e4d08fc5d7	Merge branch 'redbasic-addroomforfooter' into 'dev' ... Fix jumpy sidebars See merge request hubzilla/core!1261	2018-08-22 10:46:02 +02:00
zotlabs	decd86fc08	fix profile like images and remove export button	2018-08-21 23:42:51 -07:00
zotlabs	b25192332b	profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class	2018-08-21 23:39:49 -07:00
M.Dent	79eb6d3942	Fix jumpy sidebars	2018-08-21 13:18:42 -04:00
Mario	218029ee57	Merge branch 'redbasic-addroomforfooter' into 'dev' ... Add bottom margin on aside elements and main to allow for viewport footer. See merge request hubzilla/core!1259	2018-08-21 13:17:14 +02:00
fadelkon	af31bbeba1	Update catalan translations for sstrings up to 18th July 2018	2018-08-20 22:50:46 +02:00
M.Dent	1d7d604016	Add bottom margin on aside elements and main to allow for viewport footer.	2018-08-20 00:15:34 -04:00
zotlabs	c4328b9090	osada updates	2018-08-19 20:39:23 -07:00
zotlabs	57e75d9332	add affinity app and start some serious refactoring of mod_photos	2018-08-16 23:01:31 -07:00
zotlabs	64196dd2a7	article summaries and some other stuff	2018-08-15 18:56:18 -07:00
zotlabs	f230c07ba5	possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar	2018-08-15 17:00:37 -07:00
zotlabs	248d20c347	Merge branch 'red'	2018-08-13 20:36:40 -07:00
Mario Vavti	759a18685b	Merge remote-tracking branch 'mike/master' into dev	2018-08-12 14:07:16 +02:00
Mario	e07ab65d73	Merge branch 'oauth2-ui-pr' into 'dev' ... Oauth2 ui pr See merge request hubzilla/core!1255	2018-08-12 14:06:24 +02:00
zotlabs	5afe779ffc	prevent json-ld bombing, turn off browser autocomplete on channel sources creation	2018-08-11 16:16:54 -07:00
M.Dent	af042ccf07	OAuth2 UI and settings updates	2018-08-10 13:54:26 -04:00
zotlabs	4b6fa91bb3	directory packets need to be signed	2018-07-31 19:09:42 -07:00
zotlabs	88f3ce6736	cleanup unnecessary functions	2018-07-31 17:27:50 -07:00
zotlabs	a9c3af298b	prep work for converting mail	2018-07-30 23:55:09 -07:00