Alberto Miedes Garcés 5d9054d284 Merge branch 'master' into api-dev-PRs ...

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb

2017-05-11 21:59:42 +02:00

..

.keep

initial commit

2015-07-15 13:32:13 +02:00

conflictable.rb

refactors conflictable behaviour

2015-09-28 13:38:48 +02:00

filterable.rb

moves search by author name to full text searches

2016-01-16 22:10:17 +01:00

flaggable.rb

Time.now -> Time.current

2016-11-23 19:19:19 +01:00

graphqlable.rb

Improved API docs autogeneration

2017-01-27 12:39:44 +01:00

has_public_author.rb

Move public_author into module

2017-01-01 20:46:08 +01:00

measurable.rb

Fixes error initializing database

2016-11-30 13:38:13 +01:00

sanitizable.rb

Includes description in Sanitizable

2016-05-20 12:41:26 +02:00

search_cache.rb

moves html escaping to search_cache

2016-02-03 18:39:07 +01:00

searchable.rb

adds search and filter for poll questions

2016-11-29 11:46:30 +01:00

taggable.rb

allows updates of cached_votes

2015-10-12 22:38:18 +02:00

verification.rb

Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others

2016-04-20 11:28:06 +02:00