4367 commits

Author	SHA1	Message	Date
rabuzarus	036c18be7b	use height: 0 instead of display: none to hide jot sections	2017-04-03 13:38:07 +02:00
rabuzarus	68659c7740	add missing overflow to css	2017-04-03 12:55:06 +02:00
rabuzarus	4dfdbeba54	fix max-height for screens bigger than 768px	2017-04-03 12:46:31 +02:00
rabuzarus	80f5a026be	re-enabel browser for small screens	2017-04-03 02:04:13 +02:00
rabuzarus	ee293f2ce2	Merge develop into 20170321_-_frio-fbbrowser ... Conflicts: view/theme/frio/js/filebrowser.js view/theme/frio/js/theme.js view/theme/frio/templates/filebrowser.tpl view/theme/frio/templates/jot.tpl	2017-04-03 00:51:34 +02:00
rabuzarus	1ce5cc1b49	Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons ... Frio: Turn action links into buttons	2017-04-02 23:15:57 +02:00
Michael Vogel	d9451ef969	Merge pull request #3279 from Hypolite/improvement/add-composer ... Add Composer	2017-04-02 14:57:37 +02:00
Hypolite Petovan	7606ac5e32	frio: Fix help pages inline code display	2017-04-01 17:58:35 -04:00
Michael	f6d7ee2781	Issue 3142: mcrypt is no more (as well as phpseclib)	2017-04-01 08:28:42 +00:00
Hypolite Petovan	109f851795	Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons	2017-03-28 03:14:03 -04:00
Tobias Diekershoff	4720778edc	ES translation THX Albert	2017-03-27 22:06:56 +02:00
Hypolite Petovan	909439e59f	Fix contacts "View" link color ... - Fixed whitespaces in `event.tpl`	2017-03-26 19:22:19 -04:00
rabuzarus	5e54fb3a5f	css: border for images, min-with for folders list	2017-03-26 14:00:00 +02:00
Hypolite Petovan	9375438216	Restore separator margins	2017-03-25 22:58:17 -04:00
Hypolite Petovan	8db4437ed7	Restores bold text for text dropdown button	2017-03-25 21:33:34 -04:00
Hypolite Petovan	fa9ce4721a	Fix superfluous comment box top margin	2017-03-25 21:29:13 -04:00
Hypolite Petovan	c01c7ad746	Fix .btn-link hover/focus color	2017-03-25 21:28:53 -04:00
Hypolite Petovan	5b7c8d8631	Fix indent in search_item.tpl	2017-03-25 20:45:03 -04:00
Hypolite Petovan	359c246ef9	Various fixes ... - Removed superfluous CSS rule - Fixed whitespace - Restored separators in search_item.tpl	2017-03-25 20:43:33 -04:00
Hypolite Petovan	d7f80bf7e7	Merge branch 'develop' into improvement/frio-action-links-to-buttons ... # Conflicts: # view/theme/frio/js/filebrowser.js # view/theme/frio/templates/filebrowser.tpl	2017-03-25 20:27:26 -04:00
rabuzarus	aeb999c4d9	enable fbrowser for mobile view	2017-03-25 23:33:53 +01:00
Hypolite Petovan	632d77cfb1	Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser ... Bugfix: fbrowser did insert 2 Pictures instead of only 1	2017-03-25 16:13:31 -04:00
rabuzarus	8bbf43b9dd	Remove the AjaxUpload element when jot modal is closed	2017-03-25 21:10:57 +01:00
Hypolite Petovan	d78acd5408	Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons	2017-03-25 16:09:46 -04:00
Michael	18a2b48d1d	Remove unneeded linefeeds	2017-03-25 19:31:32 +00:00
rabuzarus	a2ad013830	some work on code standards compliance	2017-03-25 19:12:16 +01:00
Michael	0d49143a63	"no_utf" wasn't in use anymore - it is now removed completely	2017-03-25 10:51:00 +00:00
Hypolite Petovan	29fb28de43	Remove Embedly integration ... - Remove admin setting input	2017-03-25 01:57:19 -04:00
Hypolite Petovan	b9f4a6e4f0	Code cleanup + standards	2017-03-25 01:54:16 -04:00
Hypolite Petovan	85144908fa	Improve display feedback on like actions ... - Move rotator in sight - Preventively change display class before next item update	2017-03-23 22:47:56 -04:00
Hypolite Petovan	87bf6d39dd	More display fixes ... See https://github.com/friendica/friendica/pull/3204#issuecomment-288908490	2017-03-23 22:45:40 -04:00
Hypolite Petovan	991b62784a	Remove spaces confusing jSmart in contact_template ... - Fix two missing button closing tags	2017-03-21 22:39:29 -04:00
rabuzarus	835e54dfc3	upload images to the selected album	2017-03-21 23:08:37 +01:00
rabuzarus	2633e820ab	remove upload file from jot because it's now in the browser included	2017-03-21 21:18:27 +01:00
rabuzarus	9acfbae6ea	add justified-gallery to fbrowser	2017-03-21 20:39:31 +01:00
Hypolite Petovan	7b352f3f74	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
rabuzarus	af8bd4b45f	frio: gui work for fbrowser + switch between image and file mode	2017-03-21 03:35:25 +01:00
rabuzarus	c8a427804e	Bugfix: fbrowser did insert 2 Pictures instead of only 1	2017-03-20 22:45:24 +01:00
Roland Haeder	09851331a9	Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-20 20:51:32 +01:00
Hypolite Petovan	8a0b057dc7	Merge branch 'develop' into improvement/frio-action-links-to-buttons	2017-03-20 14:43:37 -04:00
rabuzarus	0060e2449e	Merge develop into 20170316_-_fix_event_edit ... Conflicts: mod/events.php	2017-03-20 16:46:36 +01:00
Hypolite Petovan	46c5b3b419	Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons	2017-03-19 21:12:20 -04:00
Michael	8dd732a896	Issue 3242: Define a maintenance reason	2017-03-19 13:24:07 +00:00
Roland Häder	fef61a28cc	fixed chmod ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	d9c22c7f3e	Continued a bit: ... - converted some else if to elseif (only PHP) - converted some space -> tab (intending) Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:02 +01:00
Roland Häder	c2d8738285	added spaces (coding convention) ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:51:54 +01:00
Hypolite Petovan	8d6d008d28	Fix frio style.css indentation	2017-03-17 20:46:31 -04:00
Hypolite Petovan	20406aacec	All-around CSS display fixes	2017-03-17 20:28:31 -04:00
Hypolite Petovan	2e17885eb3	Fix jot display	2017-03-17 20:28:09 -04:00
Hypolite Petovan	80510ef4ca	Fix group_side display	2017-03-17 20:28:00 -04:00