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

5807 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
79b0f38e34 Removes unused keys 2016-04-26 13:10:02 +02:00
Alberto Garcia Cabeza
7320d17bea Moves back links inside a partial 2016-04-26 13:04:57 +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
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
296f41b1ed changes copy 2016-04-25 18:19:03 +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
62745136db Fixes capistrano setup mismatch 2016-04-25 15:14:44 +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
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
e3bbce5bd4 fixes wrong i18n key 2016-04-23 13:23:47 +02:00
rgarcia
44528c4a32 adds translations 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
MaiteHdezRivas
3e7db9d1b5 Best practices code changes 2016-04-20 16:40:58 +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
kikito
aa351256d0 spanish typo 
spanish typo

style
 2016-04-19 15:59:24 +02:00
kikito
3637c95fe2 adds note to finish_signup 2016-04-19 13:33:17 +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
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
Juanjo Bazán
5a785ca7ce adds voting on sps as admin feature flag 2016-04-15 17:57:02 +02:00
Alberto Garcia Cabeza
7d32f2a4b0 Adds label and placeholder for international numbers verification 2016-04-15 13:09:54 +02:00
kikito
2e0eaa80ca i18n 2016-04-13 13:56:15 +02:00
rgarcia
bcc687d947 adds filtering of spending proposals by valuator 2016-04-12 17:17:02 +02:00
Juanjo Bazán
473cca418d updates management's dashboard index 2016-04-08 11:47:56 +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
e4e87bf548 moves user deletion link to a partial 2016-04-08 11:39:33 +02:00
Juanjo Bazán
ce477273da adds managers option to delete a level 2 account 2016-04-08 11:03:30 +02:00
Juanjo Bazán
58fb6e68ea cleans up routes: use blocks only when necessary 2016-04-06 19:25:27 +02:00
Juanjo Bazán
785170213b adds print page to management/spending_proposals 
includes search and filtering by geozone
 2016-04-06 19:04:03 +02:00
Juanjo Bazán
fc5f5eec8b changes default order in management sps to votes 2016-04-06 18:45:58 +02:00
Juanjo Bazán
9c6813b23c changes i18n for spending proposals in management 2016-04-06 12:40:19 +02:00
Juanjo Bazán
1e8204e676 adds support for spending proposals to mgmt menu 2016-04-06 12:06:07 +02:00
Juanjo Bazán
cb05231794 adds index/show/voting to management for sps 2016-04-06 12:05:43 +02:00
Alberto Garcia Cabeza
b4c6e2f160 Removes unused keys 2016-04-06 11:09:24 +02:00
Juanjo Bazán
3c37575f88 adds management spending proposals index to routes 2016-04-06 11:04:22 +02:00
Alberto Garcia Cabeza
3fd8e76a79 Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured 
Conflicts:
	db/schema.rb
 2016-04-05 14:05:27 +02:00
Alberto Garcia Cabeza
d76f1907cc Fixes typo 2016-04-05 10:19:58 +02:00
Raimond Garcia
a7d69336da Merge pull request #1035 from consul/show_sp_ids 
Show sp ids
 2016-04-04 19:08:10 +02:00
Alberto Garcia Cabeza
ca99b2b529 Removes code on index, changes styles on show 2016-04-04 18:35:28 +02:00
Alberto Garcia Cabeza
6e89a21786 Fixes commentable i18n 2016-04-04 18:26:07 +02:00
Raimond Garcia
562e768a46 Merge pull request #1033 from consul/i18n-issues 
fixes i18n calls
 2016-04-04 15:48:46 +02:00
rgarcia
27986c05c6 fixes typo 2016-04-04 15:37:55 +02:00
Juanjo Bazán
1e35169694 fixes i18n calls 2016-04-04 14:43:49 +02:00
rgarcia
545e0a3d0e udpates translation keys 2016-04-04 14:41:43 +02:00