Commit Graph

6573 Commits

Author SHA1 Message Date
iagirre
fb5fb866b5 Added space after <% and before %> in order to maintain consistency in the ERB code. Review of PR. 2017-09-13 17:44:11 +02:00
iagirre
2621d2694b Added test for comments 2017-09-13 16:04:45 +02:00
iagirre
1356ea217b Erased extra empty HTML for comments without replies. Added .gitignore rules for Netbeans projects
Cambios para hacer commit:
	modificado:    .gitignore
	modificado:    app/assets/javascripts/comments.js.coffee
	modificado:    app/views/comments/_comment.html.erb
	modificado:    spec/features/comments/debates_spec.rb
2017-09-13 13:30:37 +02:00
Raimond Garcia
a5b6620537 Merge pull request #1664 from artofhuman/log
Change log level in production to warn
2017-09-04 19:45:00 +02:00
BertoCQ
6fa1401fa7 Merge pull request #1810 from consul/admin-menu
Empty admin menu
2017-09-04 16:40:52 +02:00
decabeza
d676018a23 remove condition on current poll officer helper 2017-09-01 20:52:43 +02:00
decabeza
dd6ad5294c improves show_admin_menu helper 2017-09-01 19:01:19 +02:00
decabeza
c68923c5a8 adds helper to prevent show empty admin menu 2017-09-01 18:31:03 +02:00
BertoCQ
e94ef72630 Merge pull request #1807 from consul/help-headers
Help headers and footers
2017-09-01 14:53:25 +02:00
Bertocq
9665548f77 Small corrections on english translations for help texts 2017-09-01 13:52:39 +02:00
BertoCQ
4aeb4fc452 Merge pull request #1808 from consul/consul-brand
CONSUL brand
2017-09-01 13:47:30 +02:00
decabeza
dd0452ece6 updates texts on specs 2017-09-01 13:18:56 +02:00
decabeza
68591fa7d6 removes image and improves layout of welcome index page 2017-09-01 12:52:13 +02:00
decabeza
5949f7abf0 uppercase all consul name 2017-09-01 12:51:31 +02:00
decabeza
ab013bd48a adds brand guidelines 2017-09-01 12:46:06 +02:00
decabeza
bd274bdde6 replaces consul images with new logo 2017-09-01 12:45:22 +02:00
decabeza
79a461fa86 simplifies css classes on section header partial 2017-08-31 17:43:03 +02:00
decabeza
6e58a321fe includes help sections to budgets 2017-08-31 14:01:37 +02:00
decabeza
ff66909cd5 includes help sections to legislation processes 2017-08-31 13:50:40 +02:00
decabeza
7a1a18b962 improves icons for help sections 2017-08-30 18:11:29 +02:00
decabeza
e24e9df4a5 adds section header on polls, make filter styles consistent 2017-08-30 18:10:59 +02:00
decabeza
c15b78b802 adds i18n ignore for section_header keys 2017-08-30 17:53:02 +02:00
decabeza
4e7e1410e9 includes help header and footer on debates and proposals 2017-08-29 18:46:10 +02:00
Bertocq
c1a18192c9 Remove ghostscript requisite, no longer in use 2017-08-29 11:46:16 +02:00
BertoCQ
fdf0d7eb14 Merge pull request #1805 from consul/users-proposal
Users proposal list
2017-08-29 10:14:27 +02:00
decabeza
0b93f1c119 adds text to retired proposal 2017-08-26 13:11:25 +02:00
BertoCQ
abad0f5618 Merge pull request #1806 from consul/external-links
External links on proposal show
2017-08-25 21:35:46 +02:00
decabeza
e85c71fe9a improves styles for external links on proposal show 2017-08-25 13:45:50 +02:00
Bertocq
3103fc3459 Verify seeds valuator user 2017-08-25 13:00:05 +02:00
decabeza
f9e5086a95 fixes table on users proposal list 2017-08-25 12:12:21 +02:00
BertoCQ
7d95edf93e Merge pull request #1802 from consul/share-whatsapp
Share button WhatsApp
2017-08-17 23:10:13 +02:00
BertoCQ
1e5c77293c Merge pull request #1803 from consul/html-issue
HTML Tag
2017-08-17 22:49:28 +02:00
decabeza
099c3f888d changes styles to show missing divider lines 2017-08-17 17:31:43 +02:00
decabeza
bf33a00863 replaces div tags inside span 2017-08-17 17:31:29 +02:00
Bertocq
89452645ee Use CGI.escape for whatsapp title sharing 2017-08-17 14:14:30 +02:00
BertoCQ
eed30e6375 Update spanish Code of Conduct to 1.4 2017-08-17 13:18:57 +02:00
decabeza
decbd261bb improves styles to whatsapp share icon 2017-08-16 13:41:13 +02:00
decabeza
827e4702a9 removes duplicated social share partial on legislation views 2017-08-16 13:40:46 +02:00
decabeza
247ceed3f4 escape quotation marks on whatsapp share links 2017-08-16 13:40:12 +02:00
BertoCQ
5da7952a18 Merge pull request #1795 from artofhuman/fix-datetime-locale
Return datetime format for en locale
2017-08-10 23:16:14 +02:00
BertoCQ
4311b405d6 Merge pull request #1798 from artofhuman/fix-double-button
Show bottom proposals button only if proposals exists
2017-08-10 23:09:21 +02:00
Semyon Pupkov
87093b08b7 Show bottom proposals button only if proposals exists 2017-08-10 23:58:59 +05:00
María Checa
92de42da75 Merge pull request #1796 from consul/html-issue
HTML issue
2017-08-10 11:19:22 +02:00
decabeza
7becda96ed fixes heading inside ul html issue 2017-08-09 18:33:09 +02:00
Semyon Pupkov
bc486945b7 Return datetime format for en locale 2017-08-09 01:07:45 +05:00
Semyon Pupkov
65b13f4476 Change log level in production to warn
ref: https://github.com/AyuntamientoMadrid/consul/pull/828
2017-08-08 23:42:52 +05:00
BertoCQ
411fb96ec7 Merge pull request #1770 from consul/back-link
Back link
2017-08-04 01:54:12 +02:00
Bertocq
5ede222346 Remove spending proposal specs, deprecated feature with flaky tests 2017-08-03 14:03:19 +02:00
decabeza
095f8a704d Removes unnecessary margin-bottom 2017-08-03 14:03:19 +02:00
decabeza
6814f0f847 removes text-decoration on icons 2017-08-03 14:03:19 +02:00