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

4747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Bazán
a5f85a414c Merge pull request #1226 from consul/polish-banner 
Polish voting proposals banner
 2016-09-16 12:10:40 +02:00
Alberto Garcia Cabeza
a39506f54b Polish voting proposals banner 2016-09-16 12:08:38 +02:00
Juanjo Bazán
902bdb8bd3 Merge pull request #1223 from consul/binstubs 
updates binstubs for rails 4
 2016-09-15 14:29:50 +02:00
rgarcia
a1c893ce28 updates binstubs for rails 4 2016-09-15 14:16:45 +02:00
Raimond Garcia
86ab58e7f7 Merge pull request #1206 from consul/voting-proposals 
Proposal ballots
 2016-09-15 14:10:08 +02:00
Alberto Garcia Cabeza
910b24936d Merge branch 'master' into voting-proposals 
Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb
 2016-09-15 13:58:53 +02:00
Alberto Garcia Cabeza
7abd31e4bf Renames variable, updates text 2016-09-15 13:47:53 +02:00
Juanjo Bazán
e0c3f7c029 Merge pull request #1213 from consul/archived-proposals 
Archived proposals
 2016-09-15 13:22:05 +02:00
Juanjo Bazán
dd8352a0c4 Merge pull request #1220 from consul/binstubs 
updates binstubs
 2016-09-15 13:21:49 +02:00
Marcia
fa833f5a4a modificado otro mensaje en los test 2016-09-15 13:06:03 +02:00
Marcia
4832558948 modificado mensaje en el test 2016-09-15 12:21:25 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
Alberto Garcia Cabeza
89340d4647 Deletes author_id on specs 2016-09-14 12:20:22 +02:00
rgarcia
67096725ed updates binstubs 2016-09-14 11:50:11 +02:00
Alberto Garcia Cabeza
30c11c9e22 Fixes specs 2016-09-14 11:41:29 +02:00
Alberto Garcia Cabeza
db6f82fa4c Moves banner to a partial and includes it on debates index 2016-09-14 11:09:36 +02:00
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +02:00
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management 
Budget management
 2016-09-13 18:45:30 +02:00
Raimond Garcia
c41699fdf0 Merge pull request #1207 from consul/spending_proposals_import 
Spending proposals import
 2016-09-13 18:35:50 +02:00
Raimond Garcia
76cd435808 Merge pull request #1217 from albertomg994/iss-1209 
Development environment setup documentation
 2016-09-13 18:18:19 +02:00
Alberto Miedes Garcés
2c54e19df4 Dev environment setup docs for Mac OS X (spanish) 2016-09-13 14:12:09 +02:00
Alberto Miedes Garcés
955d531683 Dev environment setup docs for Mac OS X (english) 2016-09-13 14:11:57 +02:00
Raimond Garcia
9fb387def1 Merge pull request #1215 from consul/budget-styles 
Budget styles
 2016-09-13 13:02:46 +02:00
Juanjo Bazán
2142351743 archived proposals should not appear in 'featured' 2016-09-13 12:56:49 +02:00
Juanjo Bazán
11dbc05a80 removes archived proposals from index/search pages 2016-09-13 12:56:10 +02:00
kikito
13ffd73fee UNFINISHED budget management 2016-09-13 12:33:34 +02:00
Juanjo Bazán
8d48eccfed adds not_archived scope to proposal 2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99 archived proposals can not accept votes 2016-09-12 18:47:56 +02:00
Alberto Garcia Cabeza
a4693788f1 Updates custom icons font 2016-09-12 18:46:04 +02:00
Alberto Garcia Cabeza
c42877efb1 Improves styles for select heading page 2016-09-12 18:45:47 +02:00
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
Alberto Garcia Cabeza
6fac3c67ff Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals 2016-09-12 18:07:22 +02:00
Alberto Garcia Cabeza
77077b28b8 Removes question and supports on successfull proposals 2016-09-12 18:06:43 +02:00
Juanjo Bazán
fa8458576c Merge branch 'archived-proposals' of github.com:consul/consul into archived-proposals 2016-09-12 17:59:51 +02:00
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +02:00
Juanjo Bazán
aa05b0259e fixes featured proposal creation in failing spec 2016-09-12 17:37:55 +02:00
Raimond Garcia
992425f4b3 Merge pull request #1212 from consul/budget-votes 
Budget votes
 2016-09-12 16:00:23 +02:00
Juanjo Bazán
5b1ff1584c Merge branch 'master' into budget 2016-09-12 12:29:47 +02:00
Alberto García Cabeza
cebc83f97c Merge pull request #1204 from jaimeiniesta/fix-spec 
Fixes failing spec for badges
 2016-09-12 12:25:27 +02:00
kikito
2bc9e7be78 started working on budget manatement 2016-09-12 12:11:47 +02:00
rgarcia
e38e89aea0 fixes specs 2016-09-10 16:22:43 +02:00
rgarcia
fdb1d4aac9 refactors specs 2016-09-10 16:22:43 +02:00
rgarcia
16794c580c groups and headings navigation 2016-09-10 16:22:43 +02:00
rgarcia
3730b0315c runs all specs 2016-09-10 16:22:43 +02:00
rgarcia
263b729ede removes delegation specs and voting via get 2016-09-10 16:22:43 +02:00
rgarcia
65f029f34c Fixes permissions and feasibility specs 2016-09-10 16:22:42 +02:00
rgarcia
4ded0350a1 removes investments from sidebar 2016-09-10 16:22:42 +02:00
rgarcia
24740578ff displays money remaining in each group 2016-09-10 16:22:42 +02:00
rgarcia
5aeec32704 simplifies spec 2016-09-10 16:22:42 +02:00
rgarcia
94d3cbb380 adds pending spec 2016-09-10 16:22:42 +02:00