MaiteHdezRivas 5dd4633d6a Merge branch 'suggest_before_creating' ...

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb

2016-01-27 13:11:23 +01:00

..

abilities

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

ahoy

Add a helper for build c3.js chart compatible data

2015-08-17 19:13:56 +02:00

concerns

Use model table name instead of hardcoding it

2016-01-19 12:44:15 +01:00

verification

checks letter verification code as integers

2015-10-27 19:15:01 +01:00

.keep

initial commit

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

ability.rb

Splits ability.rb and specs into several smaller files

2015-09-28 13:51:42 +02:00

activity.rb

añadir track_activity para mostrar futuras notificaciones a los usuarios

2016-01-05 17:42:10 +01:00

administrator.rb

touches comments and debates after changes

2015-09-05 22:02:51 +02:00

annotation.rb

hides the admin checkboxes in annotator when editing an existing annotation

2015-12-18 16:31:30 +01:00

campaign.rb

tracks visits from different email templates

2015-10-22 12:23:15 +02:00

comment_notifier.rb

refactors account's email config

2015-09-14 14:09:24 +02:00

comment.rb

removes unused method

2016-01-08 13:06:00 +01:00

debate.rb

uses geozones instead of district tags

2016-01-25 22:28:46 +01:00

failed_census_call.rb

adds incomplete verification scope [#500]

2015-09-24 17:21:09 +02:00

flag.rb

expires debate cache after a new flag

2015-09-07 17:24:53 +02:00

geozone.rb

removes default scope from Geozone

2016-01-13 13:06:20 +01:00

identity.rb

Rename Identity method

2016-01-26 18:10:47 +01:00

legislation.rb

adds legislations

2015-12-16 11:45:46 +01:00

lock.rb

refactors lock tries [#279]

2015-09-10 20:26:49 +02:00

moderator.rb

touches comments and debates after changes

2015-09-05 22:02:51 +02:00

notification.rb

adds counter cache for user's notifications

2016-01-08 14:39:34 +01:00

organization.rb

adds responsible_name to organizations

2015-09-12 18:16:14 +02:00

proposal.rb

uses geozones instead of district tags

2016-01-25 22:28:46 +01:00

setting.rb

adds #enabled? to Setting

2016-01-25 14:07:07 +01:00

spending_proposal.rb

adds resolution query methods

2016-01-11 12:53:05 +01:00

user.rb

extracts methods into user.rb

2016-01-26 19:48:01 +01:00

verified_user.rb

removes document type from verified users query

2015-09-05 22:57:54 +02:00

visit.rb

Add model visit

2015-08-08 12:56:41 +02:00

vote.rb

adds votes feature specs [#9]

2015-07-18 18:10:36 +02:00