2570 commits

Author	SHA1	Message	Date
zotlabs	8e4f5007b4	button to add conversation mentions in comments	2018-09-19 22:00:29 -07:00
zotlabs	0bc76e85e4	Merge branch 'zap' into dev	2018-09-19 16:26:36 -07:00
zotlabs	d3b28b718c	Merge branch 'red' into dev	2018-09-18 20:51:38 -07:00
Mario Vavti	a9853e6033	seperate settings for mod network	2018-09-17 11:36:11 +02:00
Mario Vavti	f9d43479f2	css issues	2018-09-13 15:14:46 +02:00
Mario Vavti	4bb16b18ed	cover photo: mior issue and more cleanup	2018-09-10 12:12:05 +02:00
Mario Vavti	4cc413cdaf	cover photo: some code cleanup and fix height issue when photo was not cached	2018-09-10 11:12:15 +02:00
Mario Vavti	677ad71b96	fix some issues with latest notification improvements	2018-09-09 19:44:27 +02:00
Mario Vavti	bb42ec2bfc	apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps	2018-09-07 10:39:15 +02:00
Mario Vavti	d31251c54e	overflow should be auto not visible	2018-09-07 10:07:29 +02:00
Mario Vavti	6a338e28b2	-1 has issues in some browsers	2018-09-06 14:27:56 +02:00
Mario Vavti	5135f236c2	improve cover-photo handling	2018-09-06 11:30:50 +02:00
Mario Vavti	78c847ef7d	improve notification handling on small screens	2018-09-06 11:14:08 +02:00
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	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	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
zotlabs	29f809f078	clean up the admin summary page	2018-08-23 17:31:41 -07: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
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	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
zotlabs	dd899418c1	app fixes ... Merge branch 'red'	2018-07-27 15:31:19 -07:00
Mario Vavti	f6de91bf0f	prevent double file uploads when dropping files into jot	2018-07-20 16:44:43 +02:00