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

..

event_edit.js

update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover

2016-10-16 16:04:53 +02:00

filebrowser.js

Merge develop into 20170321_-_frio-fbbrowser

2017-04-03 00:51:34 +02:00

hovercard.js

Turn all the action <a> tags into buttons

2017-03-14 23:47:02 -04:00

mod_display.js

Strip @hubzilla.server part from guid for autoscrolling purpuses

2017-03-03 21:45:36 -05:00

mod_events.js

frio: better handling of event location in event hover cards

2016-10-17 22:58:30 +02:00

modal.js

Remove the AjaxUpload element when jot modal is closed

2017-03-25 21:10:57 +01:00

textedit.js

Fix wrong deferred function name

2017-03-15 14:42:34 -04:00

theme.js

Merge develop into 20170321_-_frio-fbbrowser

2017-04-03 00:51:34 +02:00