iglocska 6895548877 Merge branch 'develop' into feature/discussion ... - Pivots, attributes, discussions hideable Conflicts: app/Controller/EventsController.php app/webroot/css/main.css		2013-09-10 16:51:56 +02:00
..
Attributes	Changes to the initial distribution settings	2013-08-08 12:16:03 +02:00
Elements	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
Emails	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
Errors	generateAllFor<FieldName>	2012-12-19 10:30:10 +00:00
Events	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
Helper	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
Layouts	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
Logs	Pivot threads and other changes	2013-08-02 11:53:17 +02:00
Pages	Upgrade script for 2.1.8	2013-08-21 11:33:30 +02:00
Posts	Discussion boards	2013-08-14 17:46:57 +02:00
Regexp	Pivot threads and other changes	2013-08-02 11:53:17 +02:00
Roles	Pivot threads and other changes	2013-08-02 11:53:17 +02:00
Scaffolds	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
Servers	Pivot threads and other changes	2013-08-02 11:53:17 +02:00
ShadowAttributes	Two files left off	2013-09-03 15:32:12 +02:00
Threads	AJAX upgrade to the discussion board	2013-08-19 17:26:06 +02:00
Users	Merge branch 'hotfix-2.1.12' into develop	2013-08-23 10:20:48 +02:00
Whitelists	Pivot threads and other changes	2013-08-02 11:53:17 +02:00