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

550 Commits

Author SHA1 Message Date
Juanjo Bazán
2cddad22d6 redux admin for spending proposals 
adds dossier info
adds assignments to admin and valuators
 2016-02-24 19:39:02 +01:00
Juanjo Bazán
00eec532a6 removes resolution status from spending proposals 2016-02-24 18:50:39 +01:00
kikito
49dec60615 adds a redeemable code to users. It can be filled up when signing up from /cuentasegura 2016-02-22 17:41:08 +01:00
kikito
81b5ae7089 Implements /cuentasegura 2016-02-22 13:40:49 +01:00
kikito
cc17986745 changes welcome screen to stress verification and demote view proposals 2016-02-22 11:03:56 +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
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
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
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
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
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