Marc Alexander cf79e948c3 Merge branch 'develop-2.1.x' of github.com:board3/Board3-Portal into feature/controller ...

Conflicts:
	root/portal/modules/portal_user_menu.php

2013-02-25 11:47:49 +01:00

..

adm

[cleanup/whitespace] Get rid of unnecessary whitespace

2013-01-08 22:33:23 +01:00

config

[feature/controller] Add routing and services files

2013-01-09 18:22:44 +01:00

controller

[feature/controller] Fix missing issues that prevented portal from working

2013-02-25 11:41:57 +01:00

includes

[cleanup/whitespace] Get rid of unnecessary whitespace

2013-01-08 22:33:23 +01:00

install

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00

language

Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs

2013-01-04 16:59:37 +01:00

portal

Merge branch 'develop-2.1.x' of github.com:board3/Board3-Portal into feature/controller

2013-02-25 11:47:49 +01:00

styles

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00

umil

Updated UMIL to version 1.0.4;

2010-12-21 14:03:38 +00:00

composer.json

Add basic files for being an extension

2012-10-05 15:33:02 +02:00

ext.php

Add basic files for being an extension

2012-10-05 15:33:02 +02:00

portal.php

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00