kikito
f471503f35
Adds geozone to verification::residence
2016-02-19 18:29:14 +01:00
kikito
c8096efa73
adds geozone reference to users
2016-02-19 18:29:13 +01:00
rgarcia
a4ff3c6a6d
displays categories and districts correctly capitalized
2016-02-19 18:21:45 +01:00
rgarcia
6fde504e67
displays summary for districts
2016-02-19 18:15:18 +01:00
rgarcia
bbeb02e9a9
orders summary groups alphabetically
2016-02-19 17:55:49 +01:00
Raimond Garcia
a276bea528
Merge pull request #907 from consul/valuators
...
Valuators
2016-02-18 21:16:14 +01:00
Juanjo Bazán
11d6d0b6d6
adds spending proposal show for valuator and admin
2016-02-18 19:00:24 +01:00
rgarcia
5837c3ac94
uses standard search to create proposal summaries
2016-02-18 17:11:48 +01:00
rgarcia
9409190db1
uses tag ids instead of tag names
2016-02-17 20:53:25 +01:00
rgarcia
9a767caa27
avoids duplicate categories
2016-02-17 20:07:28 +01:00
Juanjo Bazán
009733a43b
adds Valuator
2016-02-17 17:46:59 +01:00
Enrique García
3eb53332ae
Merge pull request #899 from consul/report-info-for-spending-proposals
...
Dossier info for spending proposals
2016-02-16 17:33:43 +01:00
Juanjo Bazán
d48f9168c7
notting hill
2016-02-16 17:01:34 +01:00
rgarcia
72b8c24470
moves category_names method to Tag class
2016-02-16 16:23:20 +01:00
rgarcia
fccd5e9e2f
cleans up
2016-02-16 16:09:07 +01:00
rgarcia
cfb48ef937
cleans up
2016-02-16 15:30:04 +01:00
Juanjo Bazán
7408b7d5af
adds dossier info humanize methods
2016-02-16 14:25:20 +01:00
rgarcia
42fdc52329
adds specs for proposal summary
2016-02-16 13:53:39 +01:00
rgarcia
0432151e6b
displays only proposals from last week ordered by votes
2016-02-16 12:22:20 +01:00
rgarcia
6540092bcd
displays the top 3 proposals for every category
2016-02-16 12:17:37 +01:00
Juanjo Bazán
c4055d1c28
adds searching by proposal code
...
Closes #844
2016-02-12 13:54:57 +01:00
kikito
7393f4dd93
fixes error when editing a debate link
2016-02-08 17:06:03 +01:00
kikito
2a55c2d94d
refactors debate_links using an attr_accessor
...
refactors debate_links using an attr_accessor
2016-02-08 15:31:36 +01:00
palomahnhp
2ee90ac76e
share links to debate
2016-02-08 10:32:57 +01:00
rgarcia
af6bfdbb46
moves search logic to a searchable module
2016-02-05 14:10:02 +01:00
Juanjo Bazán
e4df5ce933
Merge pull request #880 from consul/debates-search
...
Debates search
2016-02-05 09:47:14 +01:00
kikito
d452dcda5b
Replaces old search by new pg_search-based method in debates
2016-02-04 20:06:30 +01:00
kikito
014852665d
refactors the way debate searches are done
2016-02-04 17:26:49 +01:00
rgarcia
3faadacc15
differentiates between level 2 and level 3 users
2016-02-04 13:38:56 +01:00
kikito
b1534c1f56
moves html escaping to search_cache
2016-02-03 18:39:07 +01:00
kikito
986919503a
refactors proposals search
2016-02-03 18:26:48 +01:00
Raimond Garcia
f1672180a8
Merge pull request #860 from MaiteHdezRivas/suggest_before_creating
...
Suggest before creating
2016-02-01 18:41:21 +01:00
kikito
4bac9e6ea1
updates oauth code to handle faulty facebook responses better
2016-01-27 18:36:22 +01:00
rgarcia
5bea145d71
scopes tags only for Proposals
2016-01-27 15:11:59 +01:00
rgarcia
209b6407d3
increases tag limit to 10
2016-01-27 14:17:32 +01:00
rgarcia
5d4b6fae92
scopes tags by category or geozone
2016-01-27 14:15:12 +01:00
rgarcia
0175cd2c68
does not display category tags nor geozone names
2016-01-27 13:52:11 +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
rgarcia
e7e5c531a0
moves tag_cloud logic to a model
2016-01-27 13:02:18 +01:00
MaiteHdezRivas
7406904c51
adding suggest with coffescript
2016-01-27 12:32:44 +01:00
kikito
a796dade7a
extracts methods into user.rb
2016-01-26 19:48:01 +01:00
kikito
1e8d46d83a
fixes failing email specs
...
Conflicts:
app/models/user.rb
fixes missing i18n entry
fixes badly done merge
fixes i18n issues
force build to start
2016-01-26 18:15:43 +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
55216ba431
allows creating email duplicates while registering with omniauth
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
248bff712c
fixes failing i18n specs
...
Eliminates registering_with_oauth attr_accessor
ELIMINATE
Conflicts:
app/views/users/registrations/finish_signup.html.erb
improves devise confirmation message
improves devise omniauth confirmation message
improves devise omniauth confirmation message
do not use nils on finish_signup fields
Fixes auth specs after changing the i18n
2016-01-26 18:15:36 +01:00
kikito
1a7ca43569
Simplifies username assignation when creating a new oauth user
2016-01-26 18:11:46 +01:00
kikito
8dcb5d2cac
Refactors self.first_or_initialize_for_oauth
2016-01-26 18:11:11 +01:00
kikito
f74028e3b5
Replaces the OMNIAUTH_REGEX logic with a boolean
2016-01-26 18:11:04 +01:00
kikito
d1741a2b28
Refactor first_or_create_for_auth & its usage
...
Conflicts:
app/controllers/users/omniauth_callbacks_controller.rb
Refactors first_or_initialize_for_oauth
2016-01-26 18:10:57 +01:00
