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

4066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Alberto Garcia Cabeza
3bbc2862d2 Adds admin setting 'months to archive proposals' 2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Alberto Garcia Cabeza
41312ca2a5 Creates archived proposals method 2016-09-09 17:31:05 +02:00
Juanjo Bazán
e330b704c0 removes half-baked feature 
archived proposals is a separate issue now
 2016-09-08 17:06:16 +02:00
Juanjo Bazán
11a5ed15ea adds question marks to seed data 2016-09-08 15:45:29 +02:00
Juanjo Bazán
974c4d6d70 adds specs for proposal ballots 2016-09-08 12:43:06 +02:00
Juanjo Bazán
50ef23205f avoids loading featured proposals if voting notice 2016-09-08 12:42:44 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
Juanjo Bazán
9c2f5e3944 Merge pull request #1205 from jaimeiniesta/docs-typos 
fixes typos in docs
 2016-09-07 14:30:50 +02:00
Jaime Iniesta
56b7474f68 fixes typos in docs 2016-09-07 14:21:44 +02:00
Jaime Iniesta
9c48a46f0a adjusts style for badge in featured proposals 2016-09-07 13:22:52 +02:00
Jaime Iniesta
8af944ce56 Fixes failing spec for badges. 
spec/features/official_positions_spec.rb:56 was failing because the expected
badge was not being shown in featured proposals.
 2016-09-07 13:13:06 +02:00
Alberto Garcia Cabeza
22487592cf Adds scope for archived proposals 2016-09-07 12:57:53 +02:00
Alberto Garcia Cabeza
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
Alberto Garcia Cabeza
a527de4f92 Adds proposal ballots controller and views 2016-09-07 12:43:12 +02:00
Jaime Iniesta
3d5f7f207c no need to db:create here 2016-09-07 11:58:10 +02:00
Raimond Garcia
9e72b91ef0 Merge pull request #1200 from jaimeiniesta/typos 
fixes a few typos
 2016-09-06 18:28:33 +02:00
Jaime Iniesta
2e6328d502 fixes a few typos 2016-09-06 18:21:15 +02:00
Raimond Garcia
362f45378c Merge pull request #1197 from consul/shut-up-sprockets 
downgrades sprockets to 3.6.3 to avoid warnings
 2016-09-01 15:30:59 +02:00
Raimond Garcia
6a0f756a88 Merge pull request #1196 from consul/ckeditor-conf 
Ckeditor conf
 2016-09-01 12:44:39 +02:00
kikito
fb31a4782f downgrades sprockets to 3.6.3 to avoid warnings 2016-08-30 18:35:53 +02:00
kikito
7ad4a21229 Tries to make ckeditor work correctly with the asset pipeline 
Reference: https://github.com/galetahub/ckeditor/issues/519
 2016-08-30 12:05:46 +02:00
kikito
345e34d422 adds ckeditor config 2016-08-29 16:49:52 +02:00