diff --git a/TODO b/TODO
index a60decb..2b897a7 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,29 @@
-PDF header fix
-News
- sticky
+* book creation
-User
- FavouriteForumTopics
+* event creation
+
+* "sticky" news flag
+
+* news editor for administrators
+
+* PDF header fix
+
+* draft flag for Document and Article: only writer and administrators see it
+ from the Document/Article list, in preview mode
+
+* full Document/Article list for administrators
+
+* polls
+
+* chat
+
+* Users' favourite forum topics
+
+* article categories
+
+* blog
+
+* site-based theme for ckeditor (both ui and the editor)
Poll
id
@@ -29,8 +49,6 @@ PollAnswer
poll (back-reference to Poll)
text
-Article check if public
-
UserForumViewed
User
ForumTopic
@@ -79,3 +97,9 @@ GroupChatMessage
from user
to group
timestamp
+
+PublicChatMessage
+ id
+ from user
+ to channel (ChatChannel class with id and name fields)
+ timestamp
diff --git a/app/DoctrineMigrations/Version20120815091637.php b/app/DoctrineMigrations/Version20120815091637.php
new file mode 100644
index 0000000..a35708a
--- /dev/null
+++ b/app/DoctrineMigrations/Version20120815091637.php
@@ -0,0 +1,32 @@
+abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
+
+ $this->addSql("CREATE TABLE role_hierarchy (parent_role_id INT NOT NULL, child_role_id INT NOT NULL, INDEX IDX_AB8EFB72A44B56EA (parent_role_id), INDEX IDX_AB8EFB72B4B76AB7 (child_role_id), PRIMARY KEY(parent_role_id, child_role_id)) ENGINE = InnoDB");
+ $this->addSql("ALTER TABLE role_hierarchy ADD CONSTRAINT FK_AB8EFB72A44B56EA FOREIGN KEY (parent_role_id) REFERENCES roles (id)");
+ $this->addSql("ALTER TABLE role_hierarchy ADD CONSTRAINT FK_AB8EFB72B4B76AB7 FOREIGN KEY (child_role_id) REFERENCES roles (id)");
+ $this->addSql("ALTER TABLE roles DROP admin, DROP superAdmin");
+ }
+
+ public function down(Schema $schema)
+ {
+ // this down() migration is autogenerated, please modify it to your needs
+ $this->abortIf($this->connection->getDatabasePlatform()->getName() != "mysql");
+
+ $this->addSql("DROP TABLE role_hierarchy");
+ $this->addSql("ALTER TABLE roles ADD admin TINYINT(1) NOT NULL, ADD superAdmin TINYINT(1) NOT NULL");
+ }
+}
diff --git a/app/Resources/views/Box/Events.html.twig b/app/Resources/views/Box/Events.html.twig
index b611451..419b41f 100644
--- a/app/Resources/views/Box/Events.html.twig
+++ b/app/Resources/views/Box/Events.html.twig
@@ -1,7 +1,7 @@
{# vim: ft=htmljinja
#}