Commit Graph

261 Commits

Author SHA1 Message Date
Bertocq
f18a1778ff Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul 2016-04-04 20:56:29 +02:00
Juanjo Bazán
6649b0fbdd adds default value for cached_votes_up 2016-03-30 11:47:40 +02:00
Juanjo Bazán
cb681883f8 adds pg_search to spending proposals 2016-03-30 10:59:27 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
rgarcia
467c06c3ca allows unfeasible emails only to be send out once 2016-03-28 18:06:43 +02:00
Juanjo Bazán
57fba7c0df adds description to valuators 2016-03-15 15:30:19 +01:00
kikito
f4f491748f adds tags to spending proposals in dev_seeds 2016-03-14 18:23:09 +01:00
Juanjo Bazán
0a0eb00f97 changes price fields type to bigint 2016-03-08 20:07:00 +01:00
Juanjo Bazán
6e28ae790c changes price columns type: float to integer 2016-03-08 11:46:16 +01:00
Juanjo Bazán
0e0ebc71d0 adds time scope to spending proposals 2016-03-07 16:09:03 +01:00
Juanjo Bazán
6929b7863d adds price_first_year to spending proposals 2016-03-05 12:46:16 +01:00
palomahnhp
d786f9edea adds the maximum length of the comments to settings 2016-03-03 15:20:29 +01:00
Juanjo Bazán
96e5be60a3 adds counter cache for assignments 2016-02-25 18:23:17 +01:00
Juanjo Bazán
310217d65f adds valuator and assignments to dev_seeds 2016-02-24 19:53:48 +01:00
Juanjo Bazán
34239d8478 creates new fields and assignments for spending_ps 2016-02-24 18:52:15 +01:00
kikito
49dec60615 adds a redeemable code to users. It can be filled up when signing up from /cuentasegura 2016-02-22 17:41:08 +01:00
rgarcia
d68ed5228c adds association name to spending proposals 2016-02-20 19:21:30 +01:00
rgarcia
d4cb89689d removes duplicate foreign_key 2016-02-19 19:20:58 +01:00
rgarcia
f82a590e1e reverts debate links 2016-02-19 19:08:35 +01:00
kikito
a8def9d010 Adds two codes to residence & failed_census_call 2016-02-19 18:29:13 +01:00
kikito
c8096efa73 adds geozone reference to users 2016-02-19 18:29:13 +01:00
Juanjo Bazán
11d6d0b6d6 adds spending proposal show for valuator and admin 2016-02-18 19:00:24 +01:00
Juanjo Bazán
009733a43b adds Valuator 2016-02-17 17:46:59 +01:00
Juanjo Bazán
cbad816795 adds reporting info to spending proposals 2016-02-16 13:24:32 +01:00
Enrique García
be8f6da9ea Merge pull request #892 from consul/public-stats
Public stats
2016-02-15 13:34:00 +01:00
Juanjo Bazán
0d6e5eebcb flags public stats as a default feature 2016-02-08 14:13:15 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +01:00
kikito
014852665d refactors the way debate searches are done 2016-02-04 17:26:49 +01:00
Maite
8f1431ec3f corrections about coding style 2016-02-01 17:11:29 +01:00
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
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
kikito
a606c7aa8d Renames confirmed_oauth_email to oauth_email
Refactors the way oauth_email is used to cover more cases (fixes pending specs)
2016-01-26 18:15:40 +01:00
kikito
d5eab64568 adds feature flags for omniauth login buttons/controls
Conflicts:
	app/controllers/users/omniauth_callbacks_controller.rb
	app/views/devise/_omniauth_form.html.erb
2016-01-26 18:15:39 +01:00
kikito
98f99954e7 Corrects the logic dealing with confirmations of users via oauth 2016-01-26 18:15:39 +01:00
kikito
c6c01fc9f2 Adds 'registering_with_oauth' boolean to users
Conflicts:
	db/schema.rb

Changes title in finish_signup page

Conflicts:
	config/locales/en.yml
	config/locales/es.yml
2016-01-26 18:11:04 +01:00
rgarcia
bac19ffebd makes seeds generic 2016-01-26 12:29:19 +01:00
rgarcia
dbc19090ed cleans up 2016-01-26 12:13:29 +01:00
rgarcia
328f5b4472 updates seeds 2016-01-25 22:28:46 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 2016-01-25 22:28:46 +01:00
Perisso
7d1d4cea4a filter by districts and categories 2016-01-25 22:28:17 +01:00
rgarcia
0505be08e8 fixes conflicts 2016-01-25 22:24:58 +01:00
Josep Jaume Rey Peroy
cf00f12ec7 Store locale in a user's field and switch locale on mailers 2016-01-22 18:10:28 +01:00
Juanjo Bazán
0772150426 adds values for new settings to dev_seeds 2016-01-20 13:16:21 +01:00
nachogomez
d16f1ccd08 merge with master two 2016-01-19 11:09:47 +01:00
Josep Jaume Rey Peroy
57f5296e49 Feature flag spending proposals 2016-01-18 13:05:00 +01:00
Josep Jaume Rey Peroy
2d45828cad Feature-flag debates 2016-01-18 13:05:00 +01:00
Josep Jaume Rey Peroy
ba74542c3d Parameterize social links 2016-01-18 12:43:36 +01:00
Josep Jaume Rey Peroy
5de3d700e4 Simplify Settings API 2016-01-18 12:43:34 +01:00
Antonio Tapiador del Dujo
9610a6a933 Adds Tolk gem for i18n web interface
Closes #793
2016-01-14 14:57:06 +01:00
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +01:00