Commit Graph

3780 Commits

Author SHA1 Message Date
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
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
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
rgarcia
dee1b4ca0f updates updates test coverage badge for spanish Readme 2016-07-19 11:47:19 +02:00
rgarcia
132e7d720f updates test coverage badge 2016-07-19 11:44:16 +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
Juanjo Bazán
0772c8a5ca updates ckeditor version 2016-07-18 14:49:56 +02:00
Juanjo Bazán
1946fa242f updates dependencies
fuubar, groupdate
2016-07-18 14:37:16 +02:00
Raimond Garcia
e98c0ced26 Merge pull request #1184 from andreslucena/docs
Initial version of documentation
2016-07-15 13:30:13 +02:00
Andrés Lucena
c37a96c404 Fixing docs Markdown format and images routes 2016-07-14 18:25:25 +02:00
Andrés Pereira
e8b73947ef Adding initial documentation for users and panels for special users 2016-07-14 18:18:15 +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
Raimond Garcia
d8593f3619 Merge pull request #1183 from andreslucena/fix-consul.dev
Change madrid.es to consul.dev - closes #1169
2016-07-14 17:53:31 +02:00
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
Juanjo Bazán
9144c7da05 changes travis script
this commit reverts cf50b3743c because Fuubar 
format does not works well with travis/coveralls
2016-07-14 14:01:25 +02:00
Juanjo Bazán
24dfbdceed Merge pull request #1181 from consul/update-foundation-rails
Updates foundation rails gem
2016-07-13 15:47:23 +02:00