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 |
|
rgarcia
|
027e8b2398
|
Merge branch 'microweb10-registration_username_ajax_validation'
|
2016-01-21 18:02:42 +01:00 |
|
rgarcia
|
cade157acd
|
fixes conflicts with master
|
2016-01-21 17:27:02 +01:00 |
|
Juanjo Bazán
|
9c6ab40623
|
fixes gendered translations
|
2016-01-21 17:09:32 +01:00 |
|
nachogomez
|
8d54e51413
|
change test in debates and proposals for district Select geozone.name
|
2016-01-21 09:55:15 +01:00 |
|
Juanjo Bazán
|
2d4d057b48
|
returns empty 404 instead of raising exception
for the catch-all route
|
2016-01-20 16:20:43 +01:00 |
|
Juanjo Bazán
|
34456320e1
|
adds spending proposals to Management
|
2016-01-20 13:08:54 +01:00 |
|
Juanjo Bazán
|
14e0d3a23f
|
removes unneeded tags from spending proposals
|
2016-01-19 13:38:00 +01:00 |
|
nachogomez
|
d16f1ccd08
|
merge with master two
|
2016-01-19 11:09:47 +01:00 |
|
Juanjo Bazán
|
393388de71
|
Merge pull request #830 from AjuntamentdeBarcelona/feature_flags
Feature flags
|
2016-01-18 15:19:09 +01:00 |
|
Juanjo Bazán
|
09b53a3d0a
|
Merge pull request #822 from consul/advanced-search
Advanced search
|
2016-01-18 15:17:17 +01:00 |
|
rgarcia
|
8d7984dcb3
|
uses case statement instead of eval
|
2016-01-18 15:02:18 +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
|
5de3d700e4
|
Simplify Settings API
|
2016-01-18 12:43:34 +01:00 |
|
Alberto Garcia Cabeza
|
8ef74f1e11
|
Merges master branch
|
2016-01-18 11:33:49 +01:00 |
|
rgarcia
|
44769d96f4
|
adds comprehensive specs for author type and date range searches
|
2016-01-16 21:45:59 +01:00 |
|
Juanjo Bazán
|
0c6e21aa59
|
Merge branch 'five_last_week' of https://github.com/pardoam/participacion into pardoam-five_last_week
|
2016-01-15 10:55:24 +01:00 |
|
nachogomez
|
326dd04ae7
|
merge with master
|
2016-01-14 13:03:48 +01:00 |
|
rgarcia
|
c68c2b9f1d
|
maintains search criteria
|
2016-01-13 19:25:49 +01:00 |
|
rgarcia
|
33cfd92b09
|
adds naming consistency
|
2016-01-13 19:25:48 +01:00 |
|