Some more dirs left around

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge branch 'master' of https://github.com/elkarte/Elkarte

Conflicts:
	sources/Dispatcher.class.php
Add info on code reviews, an important intended part of the workflow.

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #114 from emanuele45/master

More dirs
Merge pull request #116 from norv/codereviews

Add info on code reviews, an important intended part of the workflow.
Removed trailing whitespaces and newlines.

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
Removed newlines at the end of PHP files.

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
Fix inline comments.

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
Whitespaces cleanup.

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
Cleanup inline comments

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
Replacement with elkarte.net.

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
MergeTopics controller, split out of SplitTopics.
(this PR is a reiteration of the original experiment on merge topics,
that wasn't pulled in)

Signed-off-by: Norv <a.w.norv@gmail.com>
Adapt controller functions names to naming patterns.
(keep split* and merge* to avoid conflicts, as long as they're functions
not methods)

Signed-off-by: Norv <a.w.norv@gmail.com>
Move merge subtemplates to MergeTopics template file.

Signed-off-by: Norv <a.w.norv@gmail.com>
Small doc update.

Signed-off-by: Norv <a.w.norv@gmail.com>
Add messageInfo() to subs. This looks like a duplicate though.

Signed-off-by: Norv <a.w.norv@gmail.com>
Refactor messages selection from a topic.

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #111 from norv/mergetopics

Merge topics
Merge branch 'master' into format_test

Conflicts:
	themes/default/SplitTopics.template.php

Signed-off-by: Engel Nyst <engel.nyst@gmail.com>
Merge pull request #117 from Engelnyst/formatting

Formatting