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

2098 Commits

Author SHA1 Message Date
Juanjo Bazán
bc34cd8bf2 Merge pull request #1094 from consul/admin-summary-second-table 
displays correct admin info for proposals with supports
 2016-04-26 18:10:12 +02:00
rgarcia
8bce72bea3 displays correct admin info for proposals with supports 2016-04-26 17:37:21 +02:00
Raimond Garcia
8bd6741fdf Merge pull request #1093 from consul/sps-summary-styles 
Improves table layout for sps admin summary
 2016-04-26 16:39:07 +02:00
Alberto Garcia Cabeza
106469dbf4 Improves table layout for sps admin summary 2016-04-26 16:33:45 +02:00
rgarcia
79c6a936bc improves performance of admin summary 2016-04-26 16:12:09 +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
rgarcia
23e325896f displays error on failed update 2016-04-26 11:12:07 +02:00
Juanjo Bazán
1c92ac4089 adds new filter 'All' to admin sps index 2016-04-26 10:20:07 +02:00
Juanjo Bazán
907737d5fa Merge pull request #1087 from consul/spending_proposal_admin_ui 
Spending proposal admin ui
 2016-04-25 18:50:03 +02:00
kikito
73ffd3e189 adds feasibility column to sp admin 2016-04-25 18:35:28 +02:00
kikito
6e8a310ee1 Sorts spending proposals by votes and creation in admin 2016-04-25 18:33:18 +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
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