rgarcia
|
6f1830b4d1
|
fixes specs
|
2016-02-21 18:58:12 +01:00 |
|
rgarcia
|
17d6b55fb3
|
adds notice with html after spending proposal creation
|
2016-02-21 18:04:11 +01:00 |
|
rgarcia
|
7699b99655
|
allows authors and admins to view their spending proposals in my activity
|
2016-02-21 18:02:55 +01:00 |
|
rgarcia
|
2291caa3fd
|
users can view their own spending proposals
|
2016-02-21 14:28:48 +01:00 |
|
rgarcia
|
d68ed5228c
|
adds association name to spending proposals
|
2016-02-20 19:21:30 +01:00 |
|
rgarcia
|
f82a590e1e
|
reverts debate links
|
2016-02-19 19:08:35 +01:00 |
|
Juanjo Bazán
|
11d6d0b6d6
|
adds spending proposal show for valuator and admin
|
2016-02-18 19:00:24 +01:00 |
|
Enrique García
|
27abd65f46
|
Merge pull request #898 from consul/proposals-summary
Proposals summary
|
2016-02-16 16:55:24 +01:00 |
|
rgarcia
|
cfb48ef937
|
cleans up
|
2016-02-16 15:30:04 +01:00 |
|
rgarcia
|
14ddeaaa2e
|
displays sidebar in proposal summary page
|
2016-02-16 13:58:58 +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 |
|
Enrique García
|
6820467db9
|
Merge pull request #890 from inobCR/iss655
Ordenar admin/organizaciones por orden de llegada
|
2016-02-16 11:26:29 +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
|
2dafc74505
|
cacheizes all public stats
|
2016-02-08 18:40:01 +01:00 |
|
kikito
|
785939b2df
|
requires the user to be logged in, add missing module to controller
adds missing modules to debate_links
adds missing modules to debate_links
|
2016-02-08 16:21:25 +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 |
|
Juanjo Bazán
|
16db3f8537
|
adds minimal public stats
|
2016-02-08 14:12:37 +01:00 |
|
inobcr
|
04bf7e7476
|
Ordenar admin/organizaciones por orden de llegada
|
2016-02-08 14:03:59 +01:00 |
|
palomahnhp
|
2ee90ac76e
|
share links to debate
|
2016-02-08 10:32:57 +01:00 |
|
rgarcia
|
e4a49f802e
|
removes duplication between debate and proposal suggestions
|
2016-02-03 19:57:37 +01:00 |
|
rgarcia
|
5b1b6de6cc
|
sorts suggested proposals by default order(relevance)
|
2016-02-03 16:12:02 +01:00 |
|
kikito
|
6ba1db1a02
|
includes a "cancel" option when logging in via omniauth
restores missing proposal in common_actions
|
2016-02-03 11:59:19 +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 |
|
Maite
|
8f1431ec3f
|
corrections about coding style
|
2016-02-01 17:11:29 +01:00 |
|
Juanjo Bazán
|
73aea8f127
|
rescues ahoy error stoping user verifications
|
2016-01-29 11:41:16 +01:00 |
|
rgarcia
|
48b5aba1c5
|
removes unused helper
|
2016-01-27 14:55:42 +01:00 |
|
rgarcia
|
5d4b6fae92
|
scopes tags by category or geozone
|
2016-01-27 14:15:12 +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
|
957e07489a
|
remove unuseful comment
|
2016-01-26 19:59:20 +01:00 |
|
kikito
|
a796dade7a
|
extracts methods into user.rb
|
2016-01-26 19:48:01 +01:00 |
|
kikito
|
646ca8a686
|
Splits omniauth_callbacks_controller#login_with method in two smaller ones
Uses new hash syntax in specs
|
2016-01-26 18:15:45 +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
|
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
|
7615dc066b
|
Uses registering_with_oauth persistent attribute to deactivate checks in certain occasions
|
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
|
981e82fb4d
|
Refactors ensure_signup_complete action
|
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 |
|
rgarcia
|
dbc19090ed
|
cleans up
|
2016-01-26 12:13:29 +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 |
|
Juanjo Bazán
|
7931ae914b
|
adds specific treatment for feature flags in admin
|
2016-01-25 14:52:57 +01:00 |
|
Josep Jaume Rey Peroy
|
f9b6284df6
|
Explicitly check for different locale before updating
|
2016-01-22 18:26:08 +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 |
|