consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

9884 Commits

Author SHA1 Message Date
Juanjo Bazán
11208ebb05 removes unused css class 2016-04-25 18:12: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
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
32f971f0ad Merge pull request #1084 from consul/spending-proposals-summary 
Spending proposals admin summary
 2016-04-25 11:29:07 +02:00
Alberto Garcia Cabeza
a45e112e65 Adds styles to admin spending proposals summary 2016-04-25 11:12:52 +02:00
Alberto Garcia Cabeza
f079bdac8a Improves styles for retire proposals 2016-04-23 13:28:43 +02:00
Juanjo Bazán
5b4a7b8cf8 adds link to explanation 2016-04-23 13:24:15 +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
Juanjo Bazán
a8bc3095b4 improves activity styles 2016-04-23 13:24:15 +02:00
Juanjo Bazán
e3bbce5bd4 fixes wrong i18n key 2016-04-23 13:23:47 +02:00
rgarcia
13f65b6b71 cleans up 2016-04-22 15:03:50 +02:00
rgarcia
de84480788 adds admin summary page for spending proposals 2016-04-22 15:03:46 +02:00
Enrique García
2f1b84f565 Merge pull request #1082 from consul/valuator-validation 
adds validation on feasible_explanation
 2016-04-21 16:48:43 +02:00
rgarcia
521172bc19 adds validation on feasible_explanation 2016-04-21 14:07:41 +02:00
Alberto Garcia Cabeza
aaeb710118 Adds custom.css file 2016-04-21 14:06:12 +02:00
Alberto Garcia Cabeza
08a17f3b0e Makes generic logos and avatars, and removes unused images 2016-04-21 14:05:30 +02:00
Alberto Garcia Cabeza
a636ddeb83 Removes test page 2016-04-21 14:03:42 +02:00
Juanjo Bazán
54c1c581f9 uses index_customization in debates_controller 2016-04-21 12:00:48 +02:00
MaiteHdezRivas
f771a61a50 Refactoring method on debates controller 2016-04-21 11:13:58 +02:00
Juanjo Bazán
f3aafcb29e Merge pull request #1080 from consul/collapse-comments 
Collapse comments
 2016-04-20 17:49:09 +02:00
Alberto Garcia Cabeza
e3878ff437 Fixes icon animation on reply comments 2016-04-20 17:27:58 +02:00
MaiteHdezRivas
3e7db9d1b5 Best practices code changes 2016-04-20 16:40:58 +02:00
Alberto Garcia Cabeza
6a26bfd928 Updates icons font 2016-04-20 15:57:07 +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
Alberto Garcia Cabeza
4a013a65bc Fixes subnavigation layout 2016-04-19 23:45:03 +02:00
rgarcia
0648c7f38d removes duplicate graphs 2016-04-19 20:26:14 +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
aa351256d0 spanish typo 
spanish typo

style
 2016-04-19 15:59:24 +02:00
kikito
e6c42860a7 destroy the identities associated with an user when the user deletes his account 2016-04-19 13:33:52 +02:00
kikito
3637c95fe2 adds note to finish_signup 2016-04-19 13:33:17 +02:00
kikito
3504a27ca3 limits username uniqueness when registering with oauth 2016-04-19 13:33:16 +02:00
kikito
f86912c77c Adapts to new User api 2016-04-19 13:33:16 +02:00
kikito
3cd12bd6ea Simplifies use of registering_with_oauth in User 
Now we just ignore all validations when saving a user for oauth
 2016-04-19 13:33:16 +02:00
Juanjo Bazán
87d2d74f66 updates devise & ahoy 2016-04-19 13:27:16 +02:00
Juanjo Bazán
038a520987 updates dependencies and specs 2016-04-19 13:05:08 +02:00
Juanjo Bazán
856f226937 Merge pull request #1066 from consul/international-phone 
Adds label and placeholder for international numbers verification
 2016-04-19 10:46:00 +02:00
Alberto Garcia Cabeza
84a7438786 Improves styles for long proposals show texts 2016-04-19 00:08:50 +02:00
Alberto Garcia Cabeza
42502cecb7 Fixes youtu.be embedded videos 2016-04-19 00:08:12 +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
11bcdf0211 changes reasons order, :not_voting_allowed first 2016-04-18 12:04:18 +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
Alberto Garcia Cabeza
7d32f2a4b0 Adds label and placeholder for international numbers verification 2016-04-15 13:09:54 +02:00
Alberto Garcia Cabeza
e55a4c9f23 Renters videos on proposals show 2016-04-14 16:38:39 +02:00
Juanjo Bazán
b1eb0ee4e8 Merge pull request #1063 from consul/where-is-carmen-sandiego 
does not require phones to be Spanish any more
 2016-04-14 09:08:43 +02:00
Alberto Garcia Cabeza
fa2fe873ff Fixes styles for progress meter proposals supports 2016-04-14 00:14:35 +02:00