This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Haakon Meland Eriksen 17907f11a3 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	include/datetime.php
	include/text.php
	mod/events.php
	version.inc
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
	view/tpl/event_head.tpl
	view/tpl/events-js.tpl
	view/tpl/jot.tpl

2015-11-28 16:26:24 +01:00

..

css

Merge remote-tracking branch 'upstream/master'

2015-11-28 16:26:24 +01:00

img

update theme screenshot

2015-03-05 17:39:15 +01:00

js

fix aside width for collapsed state

2015-07-09 20:54:13 +02:00

php

Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them.

2015-09-17 22:39:48 +02:00

schema

Some bits

2015-11-20 00:39:47 +01:00

tpl

some conv-item restructuring to allow full width elements

2015-10-11 22:32:06 +02:00