consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,003 Commits 1 Branch 0 Tags
19b5887f548dd38e448b6b1caebd17a4fd19d32c
Commit Graph

4003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Bazán
decf0f2683 changes admin/valuator permissions 
not allowed to create/destroy spending proposals anymore
 2016-03-14 14:35:57 +01:00
Enrique García
89c7459de4 Merge pull request #991 from consul/destroy-spending-proposals 
Destroy spending proposals
 2016-03-14 14:14:52 +01:00
Juanjo Bazán
6ad7fca22d corrects css ids 2016-03-14 13:17:46 +01:00
Juanjo Bazán
5aa9cf9c50 changes links in 'My activity' to point to comment 
(instead of to commentable)
Closes #947
 2016-03-14 13:17:29 +01:00
Juanjo Bazán
c09e6f95d7 users can now delete their own spending proposals 
via the 'my activity' page
 2016-03-14 12:53:00 +01:00
Juanjo Bazán
142c981cdf adds ability to level 2 users to delete owned sps 2016-03-14 12:51:58 +01:00
palomahnhp
7d4936b577 track user verification and add statistics of verified users who did not vote proposals 2016-03-13 21:38:05 +01:00
Ana
8119df26fb Use of fontastic instead of font-awesome 2016-03-12 22:20:35 +01:00
Alberto García Cabeza
0b1b4384ee Merge pull request #990 from consul/polish-three-column-valuators 
polishes three column valuators
 2016-03-11 20:46:19 +01:00
rgarcia
d5d91b9c5d polishes three column valuators 2016-03-11 20:26:20 +01:00
Raimond Garcia
6c788c0854 Merge pull request #988 from consul/admin-valuators 
Shows valuators name only on label's title
 2016-03-11 19:23:37 +01:00
Alberto Garcia Cabeza
26e46e4e11 Shows valuators name only on label's title 2016-03-11 19:14:07 +01:00
Raimond Garcia
cbf3cc853a Merge pull request #987 from consul/admin-valuators 
Shows valuators list in admin in three columns
 2016-03-11 18:35:25 +01:00
Alberto Garcia Cabeza
ac611bea97 Shows valuators list in admin in three columns 2016-03-11 17:31:59 +01:00
Raimond Garcia
5792ab2a24 Merge pull request #986 from consul/admin-edit-spendings 
Minor changes in spending proposals' admin
 2016-03-11 14:14:12 +01:00
Juanjo Bazán
648527e32c changes order of fields in admin edit form 2016-03-11 14:04:05 +01:00
Juanjo Bazán
adacd50588 unifies styles for edit links 2016-03-11 13:59:20 +01:00
Enrique García
afc04219fe Merge pull request #981 from consul/latest-rails 
Rails up
 2016-03-11 13:54:42 +01:00
Juanjo Bazán
e560f718aa Merge pull request #984 from pablogfb/tag-fixing 
fixes tags links through searches to avoid misspellings
 2016-03-11 12:45:39 +01:00
Ana
f4b7e0c142 Share with Whatsapp improvement 2016-03-11 00:34:07 +01:00
Ana
f866c7be8f Share with WhatsApp in proposals 2016-03-11 00:25:29 +01:00
Ana
927b1e8e5d Share with WhatsApp in debates 2016-03-11 00:21:39 +01:00
Juanjo Bazán
343fd72d12 updates rake & rollbar 2016-03-10 21:52:01 +01:00
pablogfb
9e22feb83a fixes tags links through searches 2016-03-10 16:38:56 +01:00
Juanjo Bazán
ffc00671f1 Merge pull request #983 from andion/patch-5 
Check if spending_proposals is enabled to show 'valuation' link
 2016-03-10 13:04:04 +01:00
Lucas Andión Montáns
fa1bbd2ea2 Check if spending_proposals is enabled to show 'valuation' link 
The link was broken when Spending Proposals is disabled from administration.

The /valuation link points to `Valuation::SpendingProposalsController` which has a `feature_flag :spending_proposals` flag.
 2016-03-10 12:48:06 +01:00
Juanjo Bazán
70627148fe rails up to v4.2.6 🎉 2016-03-09 14:40:57 +01:00
Juanjo Bazán
beddbd6e87 updates dependencies 2016-03-09 13:44:14 +01:00
Juanjo Bazán
3b3031518a Revert "updates dependencies" 
This reverts commit 90a9220927.

Some dependency causes an error on rake db:setup
 2016-03-09 13:36:37 +01:00
Juanjo Bazán
90a9220927 updates dependencies 2016-03-09 13:23:54 +01:00
Raimond Garcia
108f092114 Merge pull request #980 from consul/undefined-feasibility 
adds radio to mark feasibility as undefined (nil)
 2016-03-09 12:47:10 +01:00
Juanjo Bazán
32c155999e adds radio to mark feasibility as undefined (nil) 2016-03-09 12:37:22 +01:00
Juanjo Bazán
e3b547f5d5 Merge pull request #979 from consul/featured-proposals 
Improves styles for featured proposals
 2016-03-09 12:19:07 +01:00
Alberto Garcia Cabeza
5fa592a734 Improves styles for featured proposals 2016-03-09 11:54:49 +01:00
Juanjo Bazán
65b01ae344 Merge pull request #978 from consul/info-style-fix 
fixes css
 2016-03-08 22:07:54 +01:00
kikito
e89885000a fixes css 2016-03-08 21:58:06 +01:00
Enrique García
f6aaec9c49 Merge pull request #976 from consul/valuation-changes 
Valuation changes
 2016-03-08 20:57:21 +01:00
Juanjo Bazán
7f97b9ef2c uses _html i18n keys for html_safe values 2016-03-08 20:50:36 +01:00
Juanjo Bazán
e732f88f46 adds info on public visibility for dossier fields 2016-03-08 20:32:23 +01:00
Juanjo Bazán
1e6dc18fbf adds link to edit dossier for admins 2016-03-08 20:31:49 +01:00
Juanjo Bazán
7f5e79da6b improves spending_proposal back link 2016-03-08 20:10:19 +01:00
Juanjo Bazán
c4532bf339 updates i18n for dossier form 2016-03-08 20:07:00 +01:00
Juanjo Bazán
7d31528239 moves feasibility fields to top 2016-03-08 20:07:00 +01:00
Juanjo Bazán
a37e6afa7d sets max limit for price form fields 2016-03-08 20:07:00 +01:00
Juanjo Bazán
0a0eb00f97 changes price fields type to bigint 2016-03-08 20:07:00 +01:00
Juanjo Bazán
f13b4cfc6c Merge pull request #974 from consul/valuator-tags 
Valuator tags
 2016-03-08 20:04:18 +01:00
kikito
8db6b3fa69 fixes specs 2016-03-08 17:38:52 +01:00
kikito
5151e868f5 Merge branch 'master' into valuator-tags 2016-03-08 17:19:15 +01:00
Enrique García
d56aba3695 Merge pull request #975 from consul/price-validations 
adds validation for price fields
 2016-03-08 17:18:41 +01:00
Alberto Garcia Cabeza
dee52c279f Improves styles 2016-03-08 17:13:08 +01:00