fix travis build status image src of stable branch
Merge pull request #1086 from marutosi/finn-travis-stable-img

fix travis build status image src of stable branch
Merge pull request #1085 from opf/fix/doc-typo-fixes

Fix typos, spelling in comments and docs
Semicolon fixes to placate JSHint

* Also removes some unnecessary semicolons.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Tell JSHint to ignore external libs

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Tell JSHint to unignore moved sources

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Fix syntax error (missing )) in Factory

Signed-off-by: Alex Coles <alex@alexbcoles.com>
fix miss fixing 'weigh'
Merge pull request #1087 from marutosi/finn-weigh

fix miss fixing 'weigh'
Merge pull request #1026 from opf/fix/members_double_escaping

Fix/members double escaping
update changelog - fix #1502
Merge pull request #1025 from opf/fix/timelines_page_titles

put timeline name into page title where possible
update changelog - fix #4007
Merge pull request #1028 from opf/fix/remove_symbols_from_journal_creation

Removes symbols from the creation process of journals ...
update changelog - fix #1865
Use strong_parameters for User, remove safe_attribtues
Fix Users controller test with strong parameters
Remove attr_protected on User now that we use strong_parameters
Allow plugins to add permitted attributes
Add spec for PermittedParams.add_permitted_attributes