consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,173 Commits 1 Branch 0 Tags
2b6df62dd74906b51a06d971841db5af5d256aae
Commit Graph

874 Commits

Author SHA1 Message Date
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
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
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
b0b810d484 Adds a spec so that admins can edit Spending Proposal regular fields 2016-04-13 13:32:24 +02:00
rgarcia
efc8115899 fixes specs 2016-04-12 18:49:48 +02:00
rgarcia
bcc687d947 adds filtering of spending proposals by valuator 2016-04-12 17:17:02 +02:00
Juanjo Bazán
3087b2dac9 changes default order in valuation/sps to votes up 2016-04-11 16:12:03 +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
kikito
d03864adb2 replaces the select in the valuators index with a list of links + pending count 2016-04-07 10:49:58 +02:00
Juanjo Bazán
1d931e7943 removes unnecessary :js 2016-04-06 19:05:00 +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
cb05231794 adds index/show/voting to management for sps 2016-04-06 12:05:43 +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
rgarcia
53502039dc adds specs for spending proposal code 2016-04-04 18:49:46 +02:00
rgarcia
4c52390608 removes unused spec 2016-04-04 18:49:29 +02:00
kikito
dea67a36ca fixes failing email spec 2016-04-04 14:56:16 +02:00
Juanjo Bazán
c536a12e3d adds voting to spending proposals index 2016-03-30 18:47:40 +02:00
Juanjo Bazán
4fad283947 adds geozone and unfeasible filters to index 2016-03-30 14:04:01 +02:00
Juanjo Bazán
18d304ea03 adds spending proposals search spec 2016-03-30 10:59:27 +02:00
Raimond Garcia
c581aad9bf Merge pull request #1018 from consul/investment-project-vote 
Investment project vote
 2016-03-29 18:57:05 +02:00
Juanjo Bazán
5166d0ce06 Merge pull request #1020 from consul/cannot-delete-proposals 
allows only admins to delete spending proposals
 2016-03-29 18:23:34 +02:00
kikito
ee4c6dd267 merges with master 2016-03-29 17:44:16 +02:00
rgarcia
d5453f1733 fixes spec 2016-03-29 17:36:31 +02:00
Alberto García Cabeza
f2291070b2 Merge pull request #1007 from palomahnhp/embed_videos_in_show_proposal 
embed video in proposal show #949
 2016-03-29 17:33:31 +02:00
Alberto García Cabeza
16bf4137ee Merge pull request #1019 from consul/spending-proposals-index 
Spending proposals index
 2016-03-29 17:16:07 +02:00
Juanjo Bazán
6008244ecf adds basic spending_proposals index 2016-03-29 16:46:24 +02:00
rgarcia
a6d7f9b323 runs all specs 2016-03-29 16:44:15 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
rgarcia
e52004edc3 adds permissions for everyone to see investment projects 2016-03-29 13:26:08 +02:00
rgarcia
595c5485d6 adds code to email body 2016-03-29 11:38:54 +02:00
rgarcia
467c06c3ca allows unfeasible emails only to be send out once 2016-03-28 18:06:43 +02:00
rgarcia
8a8f062398 updates investment project code 2016-03-28 16:37:16 +02:00
rgarcia
db5348938e adds code to email subject 2016-03-28 14:08:39 +02:00
rgarcia
d7996cd01b fixes specs 2016-03-28 12:16:08 +02:00
rgarcia
9aaeb23e7f sends an email for unfeasible spending proposals 2016-03-28 12:16:07 +02:00
MaiteHdezRivas
69bd24d2c8 merge with consul 2016-03-21 18:28:20 +01:00
palomahnhp
3c7b71018b embed video in proposal show 2016-03-20 20:44:20 +01:00
MaiteHdezRivas
68f9a76cea Mark debates as featured 2016-03-20 13:56:05 +01:00
Juanjo Bazán
3c815217f0 changes visible fields in dossier form 
depending on feasibility value
 2016-03-16 20:16:22 +01:00
Juanjo Bazán
4546af5be1 redux of valuators creation form 2016-03-15 15:33:00 +01:00
kikito
072faf928f adds specs for preserving filtering params when using the admin links for spending proposals 
changes the order in which specs are executed for travis

another change for travis

another change for travis
 2016-03-14 18:23:11 +01:00
Juanjo Bazán
b660702787 specifies permission the right way 2016-03-14 14:36:13 +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
palomahnhp
7d4936b577 track user verification and add statistics of verified users who did not vote proposals 2016-03-13 21:38:05 +01:00
Juanjo Bazán
adacd50588 unifies styles for edit links 2016-03-11 13:59:20 +01:00