consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags
ac6b75e8f916db499cd6af4a74d442ba751fb194
Commit Graph

2298 Commits

Author SHA1 Message Date
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +02:00
rgarcia
7d4d9b0ead sorts archived proposals by votes 2016-09-16 19:42:18 +02:00
Alberto Garcia Cabeza
a39506f54b Polish voting proposals banner 2016-09-16 12:08:38 +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
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
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
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
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +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
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
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
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
Juanjo Bazán
46563f8222 Merge pull request #1194 from consul/notifications-polish 
Notifications polish
 2016-08-04 11:29:21 +02:00
rgarcia
b087fe8fb7 refactors email digest 2016-08-03 19:33:37 +02:00
rgarcia
9d9bf488fc does not create notifications for blocked or erased users 2016-08-02 20:52:20 +02:00
Juanjo Bazán
fb810c1b90 Merge pull request #1188 from consul/custom-folders 
Custom folders
 2016-07-21 13:19:52 +02:00
Juanjo Bazán
f6525944d3 Merge pull request #1190 from consul/accesibility 
Accesibility
 2016-07-20 13:17:50 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Juanjo Bazán
dc7ee45766 uses before_action instead of before_filter 
before_filter is deprecated
 2016-07-18 14:50:28 +02:00
Alberto Garcia Cabeza
a30d9218d4 Deletes alt text for decorative images 2016-07-14 18:07:45 +02:00
Alberto Garcia Cabeza
c3d70f6e95 Adds text for show comment children 2016-07-14 18:02:27 +02:00
Alberto Garcia Cabeza
616e8abe28 Updates foundation rails gem 2016-07-13 14:22:24 +02:00
Alberto Garcia Cabeza
62a7b32389 Adds texts to icons on comments votes 2016-07-12 13:55:52 +02:00
Alberto Garcia Cabeza
77b99c1b5c Adds text to icons like and unlike on debates 2016-07-12 13:48:55 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Raimond Garcia
50cbce2283 Merge pull request #1179 from consul/setting-helper 
makes sure setting helper is used in views
 2016-07-08 15:09:53 +02:00
Juanjo Bazán
7f01dbdca2 makes sure setting helper is used in views 2016-07-08 14:42:28 +02:00
Alberto Garcia Cabeza
e55fdc42ee Updates classes names for social share button 2016-07-08 14:13:13 +02:00
Alberto Garcia Cabeza
702cfe13d1 Fixes specs 2016-07-06 14:47:09 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
ece2f6f019 Removes Madrid references on pages 2016-07-04 18:07:45 +02:00
rgarcia
96630f88f2 takes into account emails separated by commas without spaces 2016-06-29 21:46:03 +02:00
rgarcia
ad1720ba02 uses applications's default locale 2016-06-27 23:38:23 +02:00