consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,828 Commits 1 Branch 0 Tags
837da1b6b22c2dbe9785ee38da8b201927e22de3
Commit Graph

520 Commits

Author SHA1 Message Date
palomahnhp
837da1b6b2 show link to sign in for no connect users 2016-02-04 10:40:13 +01:00
Maite
8f1431ec3f corrections about coding style 2016-02-01 17:11:29 +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
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
7931ae914b adds specific treatment for feature flags in admin 2016-01-25 14:52:57 +01:00
Juanjo Bazán
c287ae97d9 fix setting key 2016-01-25 14:12:16 +01:00
Juanjo Bazán
64441825d8 renames settings zone in admin 2016-01-25 12:04:40 +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
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
Juanjo Bazán
d36ee4cdaf changes text 2016-01-15 11:18:00 +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
258416de19 Advanced search translated 2016-01-13 19:25:46 +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
3f05864a16 adds spending proposals to admin 2016-01-11 13:45:10 +01:00
Juanjo Bazán
b3677fc044 fixes typo 2016-01-11 12:18:23 +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
767d1fd09e adds spending_proposals info page 2016-01-11 12:16:31 +01:00
Juanjo Bazán
864ef6e73b adds basic spending proposals index 2016-01-11 12:16:31 +01:00
Julian Herrero
7bbfcd74e2 check if username is available in registration form 2016-01-10 19:17:20 +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