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
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
Alberto Garcia Cabeza
e3ad813b4f
Improves styles for districts map page
2016-01-26 13:28:33 +01:00
rgarcia
df04992405
adds translations
2016-01-25 22:28:46 +01:00
rgarcia
a86f6bc5b7
fixes conflicts with master
2016-01-25 22:28:46 +01:00
Perisso
93d794c089
change locales
2016-01-25 22:28:17 +01:00
Perisso
7d1d4cea4a
filter by districts and categories
2016-01-25 22:28:17 +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
ffbbdb3358
Adds custom styles for date picker
2016-01-20 15:57:14 +01:00
Juanjo Bazán
34456320e1
adds spending proposals to Management
2016-01-20 13:08:54 +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
ba74542c3d
Parameterize social links
2016-01-18 12:43:36 +01:00
Alberto Garcia Cabeza
8ef74f1e11
Merges master branch
2016-01-18 11:33:49 +01:00
rgarcia
609feb0116
fixes specs
2016-01-16 22:18:46 +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
8fc76ef67a
normalizes i18n keys
2016-01-16 18:40:24 +01:00
Alberto Garcia Cabeza
933fa75a3b
Changes icon and text for spending proposals
2016-01-14 14:20:07 +01:00
Raimond Garcia
0a6639834d
Merge pull request #823 from consul/featured_and_filters
...
Featured and filters
2016-01-13 20:20:53 +01:00
rgarcia
7dcbf11860
adds missing translation
2016-01-13 19:31:13 +01:00
Ana
7d3dff3222
Translation changed
2016-01-13 19:25:47 +01:00
Ana
48d6a76491
Advanced search added to debates
2016-01-13 19:25:47 +01:00
Ana
b6472f6492
Advanced search moved to locales files
2016-01-13 19:25:46 +01:00
Alberto Garcia Cabeza
f1844411c4
Adds title to notifications page
2016-01-13 16:24:46 +01:00
Juanjo Bazán
1ab0b31d4b
only level 2 users can create spending proposals
2016-01-13 13:35:21 +01:00
Alberto Garcia Cabeza
edc20e9a0c
Improves styles for featured debates
2016-01-12 15:51:13 +01:00
Juanjo Bazán
e5caf84c02
adds show view in admin for spending proposals
2016-01-11 14:25:33 +01:00
Alberto Garcia Cabeza
f03558fff3
Adds title to notifications page
2016-01-11 13:58:04 +01:00
Juanjo Bazán
bc8c14e4a1
adds geozone to spending_proposals
2016-01-11 12:18:23 +01:00
Juanjo Bazán
8aebfecae0
removes tags from spending proposals
2016-01-11 12:18:01 +01:00
Juanjo Bazán
54badef191
users can create spending proposals
2016-01-11 12:17:10 +01:00
Juanjo Bazán
864ef6e73b
adds basic spending proposals index
2016-01-11 12:16:31 +01:00
Juanjo Bazán
c8ad7a8fb2
pluralizes notifications alert
2016-01-08 17:28:27 +01:00
Juanjo Bazán
307b29736d
Merge branch 'master' into notifications
2016-01-08 15:07:16 +01:00
Juanjo Bazán
704a038795
groups notifications
2016-01-08 14:32:16 +01:00
Alberto Garcia Cabeza
9db19a3049
Merge branch 'master' into comment-show
2016-01-08 13:41:25 +01:00
Alberto Garcia Cabeza
de51bb0f79
Merge branch 'master' into notifications
2016-01-08 12:46:28 +01:00
Alberto Garcia Cabeza
e008d1f642
Adds new styles for notifications
2016-01-08 12:45:37 +01:00
Alberto Garcia Cabeza
b84730aac0
Merge branch 'master' into design_layout
2016-01-07 16:21:00 +01:00
rgarcia
816a95b7b7
adds comment show view
2016-01-07 15:18:28 +01:00
kikito
2467ee4a54
removes unused i18n keys
2016-01-07 12:37:16 +01:00
Alberto Garcia Cabeza
2948a2ebe4
Improves search form of header
2016-01-07 12:05:05 +01:00
rgarcia
e2f419e625
destroy notifications when marked as read
2016-01-07 12:02:01 +01:00
kikito
8a594e673a
modifies i18n for the new orders
2016-01-05 19:39:59 +01:00
Julian Herrero
d9ba3edc2a
mostrar notificaciones a los usuarios cuando alguien comenta en su
...
debate o responde a su comentario
2016-01-05 17:43:44 +01:00
Julian Herrero
b64dc3a7cb
Merge branch 'master' of https://github.com/consul/consul
2015-12-24 12:58:51 +01:00
Alberto Garcia Cabeza
69e66ccbeb
Adds annotator help
2015-12-18 12:21:47 +01:00
Julian Herrero
e7314ac380
add option to subscribe/unsubscribe to website newsletter
2015-12-16 16:14:35 +01:00
Alberto Garcia Cabeza
ca18eb99de
Cleans and improves styles for header and homepage
2015-12-15 16:35:55 +01:00
Juanjo Bazán
c47f5e84b6
removes provisional transparency page
2015-12-03 20:46:19 +01:00
Alberto Garcia Cabeza
d5c898867b
Removes unused keys
2015-12-03 20:38:51 +01:00
