consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,480 Commits 1 Branch 0 Tags
bc34cd8bf258db6fe75e7ae752a3e2ad0986f19a
Commit Graph

1080 Commits

Author SHA1 Message Date
rgarcia
8bce72bea3 displays correct admin info for proposals with supports 2016-04-26 17:37:21 +02:00
rgarcia
d51fe779e2 displays summary info for supported spending proposals 2016-04-26 15:13:53 +02:00
rgarcia
ab1216af3d adds more info to admin summary for spending proposals 2016-04-26 14:47:44 +02:00
Juanjo Bazán
d69d752f58 Merge pull request #1089 from consul/admin-sp-errors-on-update 
displays error on failed update
 2016-04-26 11:22:27 +02:00
Juanjo Bazán
5dd4d2a80a improves spec 
scopes css element search to the main area, ignoring sidebar
 2016-04-26 11:18:01 +02:00
rgarcia
23e325896f displays error on failed update 2016-04-26 11:12:07 +02:00
Juanjo Bazán
d5e3c9ac3c adds specs for new filter 2016-04-26 10:30:31 +02:00
Juanjo Bazán
66dd511979 Merge pull request #1041 from consul/select-featured-debates 
Select featured debates
 2016-04-25 18:19:40 +02:00
Juanjo Bazán
479b48796f Merge pull request #1085 from consul/retire-proposals 
Retire proposals
 2016-04-25 18:00:34 +02:00
Juanjo Bazán
198f6c96bd adds & refactors specs for featured debates 2016-04-25 17:59:42 +02:00
kikito
c1f5db1f1e Fixes issue when evaluating feasible sps - the explanation should be required only for unfeasible ones 2016-04-25 14:55:59 +02:00
Juanjo Bazán
91199cda77 removes capybara warning messages 2016-04-25 11:44:33 +02:00
Juanjo Bazán
32f971f0ad Merge pull request #1084 from consul/spending-proposals-summary 
Spending proposals admin summary
 2016-04-25 11:29:07 +02:00
Juanjo Bazán
ed0a4a8525 adds links to filter retired proposals by reason 2016-04-23 13:24:15 +02:00
Juanjo Bazán
d63cf8b392 removes retired proposals from default index 
adds a sidebar link to retired proposals list
 2016-04-23 13:24:15 +02:00
Juanjo Bazán
58a5e2a283 authors can retire proposals now 2016-04-23 13:24:15 +02:00
Juanjo Bazán
f36f0ca8c8 adds scope & boolean method for retired proposals 2016-04-23 13:24:15 +02:00
rgarcia
bdc815e05c adds specs 2016-04-22 15:03:50 +02:00
rgarcia
8a1d1986f2 fixes specs 2016-04-21 15:50:47 +02:00
rgarcia
521172bc19 adds validation on feasible_explanation 2016-04-21 14:07:41 +02:00
MaiteHdezRivas
c86f3516db correct text in the test 2016-04-21 11:30:45 +02:00
palomahnhp
bf5d253e12 Merge branch 'master' into tracking_user_verifications_and_others 
Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb
 2016-04-20 11:44:33 +02:00
palomahnhp
b4ec077f16 Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others 
Conflicts:
	app/assets/javascripts/application.js
 2016-04-20 11:28:06 +02:00
Juanjo Bazán
59e2c8a122 Merge pull request #1072 from consul/oauth-signup-fix 
Oauth signup fix
 2016-04-19 16:01:00 +02:00
kikito
d577a2b82e add spec for user identity erasure 2016-04-19 13:33:52 +02:00
kikito
f776f863bb Adds missing step to oauth spec 2016-04-19 13:33:16 +02:00
Juanjo Bazán
038a520987 updates dependencies and specs 2016-04-19 13:05:08 +02:00
rgarcia
08db8a6b17 fixes specs 2016-04-18 20:08:05 +02:00
Juanjo Bazán
c939339020 shows voting button for sps only if voting allowed 2016-04-18 12:04:50 +02:00
Juanjo Bazán
e6a9cb4fcc disable voting on sps if setting disabled 
refactors hover messages on sps votes
 2016-04-15 23:01:00 +02:00
kikito
d9ec2e2cf3 Calculates SP.total_votes using physical_votes 2016-04-15 17:16:35 +02:00
kikito
92ecd7c983 replaces length 9 validation by format validation: only numbers, spaces and plus sign allowed 2016-04-13 19:27:04 +02:00
Juanjo Bazán
ff898c08c3 Merge pull request #1062 from consul/gender 
Renames "Genre" to "Gender"
 2016-04-13 18:12:55 +02:00
Juanjo Bazán
c1b8c287c5 Merge pull request #1061 from consul/admin-edit-sp 
Admin edit sp
 2016-04-13 14:32:58 +02:00
kikito
1b1f2bc2c9 renames genre to gender in code 2016-04-13 14:27:27 +02:00
kikito
89d269e4f5 fixes flacky test: "$ is undefined" 2016-04-13 14:13:45 +02:00
kikito
b0b810d484 Adds a spec so that admins can edit Spending Proposal regular fields 2016-04-13 13:32:24 +02:00
kikito
d7f9862290 fixes failing specs 2016-04-13 12:06:50 +02:00
Juanjo Bazán
73a3fcc35f Merge pull request #1057 from consul/demographic-data 
Add demographic data to users
 2016-04-12 19:03:57 +02:00
rgarcia
efc8115899 fixes specs 2016-04-12 18:49:48 +02:00
kikito
4f724ef3bf Modifies census_api to parse genre and dob 2016-04-12 18:18:25 +02:00
rgarcia
bcc687d947 adds filtering of spending proposals by valuator 2016-04-12 17:17:02 +02:00
kikito
2c51115d6d Residence Verification now fills up the date of birth and genre 2016-04-12 13:38:39 +02:00
Juanjo Bazán
3087b2dac9 changes default order in valuation/sps to votes up 2016-04-11 16:12:03 +02:00
kikito
5fec3b9858 persists responsible name, even if the user is erased 2016-04-11 12:21:11 +02:00
Raimond Garcia
5e19f33c49 Merge pull request #1048 from consul/management-delete-accounts 
Management delete accounts
 2016-04-08 18:58:19 +02:00
Juanjo Bazán
3ce6c81913 Merge pull request #1049 from consul/spending_proposal_responsible 
Spending proposal responsible
 2016-04-08 17:54:27 +02:00
kikito
61b2c087b6 changes the responsible_name from username to document_number 2016-04-08 17:45:20 +02:00
Juanjo Bazán
83e58f0cc9 adds account section to management 
for now it only has the option to delete account
 2016-04-08 11:43:26 +02:00
Juanjo Bazán
ce477273da adds managers option to delete a level 2 account 2016-04-08 11:03:30 +02:00