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
Juanjo Bazán
543d760069
Merge pull request #867 from palomahnhp/improve_statistics
...
improved display of statistics
2016-02-02 09:56:47 +01:00
palomahnhp
f84265e7d8
improved display of statistics
2016-02-02 09:31:52 +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
75f03499bc
fixes social media meta tags
2016-01-28 13:09:13 +01:00
rgarcia
48b5aba1c5
removes unused helper
2016-01-27 14:55:42 +01:00
rgarcia
5a3dc42dea
removes tag count
2016-01-27 14:18:40 +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
MaiteHdezRivas
7406904c51
adding suggest with coffescript
2016-01-27 12:32:44 +01:00
Juanjo Bazán
4b1430c9d6
Merge pull request #848 from consul/omniauth2
...
Omniauth2
2016-01-27 10:04:26 +01:00
Alberto Garcia Cabeza
fc857ea603
Adds styles for geozone on proposal show
2016-01-26 18:42:28 +01:00
rgarcia
4e7e0e3a7a
makes geozone clickable in proposal show
2016-01-26 18:27:47 +01:00
kikito
9e0494a82d
Activates omniauth functionality
2016-01-26 18:15:45 +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
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
a87669840c
Hides fields without errors in finish_signup.html.erb
...
Conflicts:
app/views/users/registrations/finish_signup.html.erb
2016-01-26 18:11:11 +01:00
kikito
b71dd5767b
Adds username to the finish_signup form
...
Conflicts:
app/views/users/registrations/finish_signup.html.erb
2016-01-26 18:11:04 +01:00
Juanjo Bazán
dc23bf19b3
Merge pull request #855 from consul/districts-and-categories
...
Categories and Geozones
2016-01-26 13:55:06 +01:00
Alberto Garcia Cabeza
e3ad813b4f
Improves styles for districts map page
2016-01-26 13:28:33 +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
822d28a4a1
sets sanitize to false for already sanitized text
...
The new version of the rails-html-sanitizer (used by simple_format) strips by default all attributes. We want rel='nofollow' and target='_blank' here and the text has just been sanitized in text_with_links.
2016-01-25 21:52:59 +01:00
Juanjo Bazán
7931ae914b
adds specific treatment for feature flags in admin
2016-01-25 14:52:57 +01:00
Juanjo Bazán
23fe85db32
adds feature flag for spending_proposals in admin
2016-01-24 19:23:56 +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
9c7e2b83dd
Merge pull request #843 from consul/search-dates
...
Advanced search - datepicker
2016-01-20 17:01:28 +01:00
Alberto Garcia Cabeza
4d533c3ee3
Adds tabindex on users sign_in form
2016-01-20 16:28:42 +01:00
Alberto Garcia Cabeza
ffbbdb3358
Adds custom styles for date picker
2016-01-20 15:57:14 +01:00
Juanjo Bazán
ca1f020454
adds link to managers' menu
2016-01-20 13:09:23 +01:00
Juanjo Bazán
34456320e1
adds spending proposals to Management
2016-01-20 13:08:54 +01:00
Juanjo Bazán
b451c76846
adds simple show view for spending proposals
2016-01-20 12:57:16 +01:00
rgarcia
6905d07638
uses jquery datepicker instead of html5 date field
2016-01-20 12:25:47 +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
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
Alberto Garcia Cabeza
f135bae082
Improves styles for search results page
2016-01-18 12:31:51 +01:00
Alberto Garcia Cabeza
4737f2be1b
Improves styles for advanced search
2016-01-18 12:13:38 +01:00
Alberto Garcia Cabeza
8ef74f1e11
Merges master branch
2016-01-18 11:33:49 +01:00
rgarcia
82f9a656ad
moves search by author name to full text searches
2016-01-16 22:10:17 +01:00
rgarcia
73bab1aad3
converts advanced search text to a js link
2016-01-16 20:40:47 +01:00
rgarcia
cf2dac91ad
renames html ids that have js behaviour
2016-01-16 20:15:14 +01:00
Juanjo Bazán
d175f11f13
Merge pull request #826 from consul/design_spending_proposals
...
Design spending proposals
2016-01-15 11:25:27 +01:00
Alberto Garcia Cabeza
933fa75a3b
Changes icon and text for spending proposals
2016-01-14 14:20:07 +01:00
