consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,013 Commits 1 Branch 0 Tags
ceebae644fc6543dbf4f2eafc88b3f7c5e1b2983
Commit Graph

1078 Commits

Author SHA1 Message Date
rgarcia
a95fb75103 adds participatory_budget scope 2016-02-21 20:57:24 +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
e924736932 updates form label for association name 2016-02-20 20:20:38 +01:00
rgarcia
5067af3899 displays spending proposal association name 2016-02-20 20:16:13 +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
rgarcia
de8b7cdb70 uses a more efficient way of getting category names 2016-02-19 18:45:45 +01:00
rgarcia
a4ff3c6a6d displays categories and districts correctly capitalized 2016-02-19 18:21:45 +01:00
Juanjo Bazán
11d6d0b6d6 adds spending proposal show for valuator and admin 2016-02-18 19:00:24 +01:00
Alberto Garcia Cabeza
b81b560bd6 Deletes top debates link 2016-02-17 14:40:52 +01:00
Alberto Garcia Cabeza
ee5e20a0b6 Adds new links on popular section 2016-02-16 19:21:12 +01:00
Enrique García
3eb53332ae Merge pull request #899 from consul/report-info-for-spending-proposals 
Dossier info for spending proposals
 2016-02-16 17:33:43 +01:00
Juanjo Bazán
d48f9168c7 notting hill 2016-02-16 17:01:34 +01:00
rgarcia
72b8c24470 moves category_names method to Tag class 2016-02-16 16:23:20 +01:00
Juanjo Bazán
0ad56c4f51 adds dossier info to admin' spending proposal show 2016-02-16 14:26:30 +01:00
Alberto Garcia Cabeza
1158e764ca Adds styles to proposals summary 2016-02-16 13:04:40 +01:00
rgarcia
6540092bcd displays the top 3 proposals for every category 2016-02-16 12:17:37 +01:00
Enrique García
870d349f86 Merge pull request #895 from consul/find-by-proposal-code 
Find by proposal code
 2016-02-15 14:27:25 +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
1e03ff4153 updates management proposal search's placeholder 2016-02-12 13:55:29 +01:00
Juanjo Bazán
28bdd6b426 Merge pull request #875 from palomahnhp/inform_users_in_vote_comments 
show link to sign in for no connect users
 2016-02-11 17:28:17 +01:00
Juanjo Bazán
3e0dd544a6 adds specs 2016-02-08 17:49:03 +01:00
Juanjo Bazán
16db3f8537 adds minimal public stats 2016-02-08 14:12:37 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +01:00
rgarcia
eb04266772 removes unused translations 2016-02-05 13:08:49 +01:00
rgarcia
a5f7211d82 corrects error translations keys 2016-02-05 12:54:21 +01:00
rgarcia
36aee45908 removes unused combined stats 2016-02-04 12:36:14 +01:00
palomahnhp
837da1b6b2 show link to sign in for no connect users 2016-02-04 10:40:13 +01:00
rgarcia
77fc851748 fixes specs 2016-02-03 19:57:42 +01:00
rgarcia
41cdf6cec2 organizes translations according to view structure 2016-02-03 19:57:42 +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
Juanjo Bazán
eda2c419f7 fixes typo in es locale 2016-02-03 11:39:16 +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
kikito
4bac9e6ea1 updates oauth code to handle faulty facebook responses better 2016-01-27 18:36:22 +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
1617f7295c requests omniauth facebook email 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
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
kikito
f262686023 Allows deploying branches in preproduction 
Bundle install
 2016-01-26 18:10:51 +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
df04992405 adds translations 2016-01-25 22:28:46 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 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
3945eb1ff0 lists dynamic keys as ignore_unused in i18n-tasks 2016-01-25 14:59:37 +01:00