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 |
|
Juanjo Bazán
|
c84108ae60
|
updates rails version
(security fix)
|
2016-08-12 13:41:51 +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
|
24bc8cca20
|
runs all specs
|
2016-08-03 20:56:33 +02:00 |
|
rgarcia
|
4f4a5b68e5
|
runs all spec file
|
2016-08-03 20:50:37 +02:00 |
|
rgarcia
|
3b5e0b55c0
|
tries to fix flacky spec
|
2016-08-03 20:45:36 +02:00 |
|
rgarcia
|
5bd7fdb263
|
fixes specs
|
2016-08-03 20:05:08 +02:00 |
|
rgarcia
|
63274dfe08
|
marks notifications as emailed after rake
|
2016-08-03 19:48:43 +02:00 |
|
rgarcia
|
0faff2f01c
|
adds specs
|
2016-08-03 19:33:43 +02:00 |
|
rgarcia
|
b087fe8fb7
|
refactors email digest
|
2016-08-03 19:33:37 +02:00 |
|
rgarcia
|
6281af2a7d
|
adds emailed_at attribute to notifications
|
2016-08-03 19:33:23 +02:00 |
|
rgarcia
|
9d9bf488fc
|
does not create notifications for blocked or erased users
|
2016-08-02 20:52:20 +02:00 |
|
rgarcia
|
99b9c3867e
|
adds pending spec
|
2016-08-02 20:52:08 +02:00 |
|
Juanjo Bazán
|
9abf6e1558
|
updates dependencies
bullet, coveralls, faker, uglifier
|
2016-07-29 15:13:28 +02:00 |
|
Juanjo Bazán
|
2f392a28c3
|
updates dependencies
sass-rails & sprockets
|
2016-07-25 13:57:22 +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 |
|
Juanjo Bazán
|
6d2f28b13d
|
removes unused i18n entries
|
2016-07-20 13:16:59 +02:00 |
|
rgarcia
|
c42a041d3a
|
fixes specs
|
2016-07-19 16:20:45 +02:00 |
|
rgarcia
|
3f6dc4ff5e
|
updates Readme with reference to Customization instructions
|
2016-07-19 16:00:42 +02:00 |
|
rgarcia
|
a23666683f
|
fixes conflicts with master
|
2016-07-19 15:50:22 +02:00 |
|
Juanjo Bazán
|
075c6c24b9
|
Merge pull request #1187 from consul/docs
updates Readme with reference to current features in Docs
|
2016-07-19 12:35:15 +02:00 |
|
rgarcia
|
a3f5b826d8
|
updates Readme with reference to current features in Docs
|
2016-07-19 12:27:19 +02:00 |
|