Juanjo Bazán
992aee2f42
Merge pull request #91 from AyuntamientoMadrid/debates_description_html
...
debates description html
2015-08-04 19:11:00 +02:00
kikito
fc4e67824b
Merge branch 'master' into debates_description_html
...
I removed the truncation from debates.description because
debates.description returns html
Conflicts:
app/views/debates/_debate.html.erb
app/views/debates/show.html.erb
2015-08-04 19:07:20 +02:00
Enrique García
e6ac2a4337
Merge pull request #87 from AyuntamientoMadrid/debates
...
Debates
2015-08-04 18:49:50 +02:00
kikito
87dd655d70
Make debate.description always html_safe
2015-08-04 18:42:49 +02:00
kikito
1fa4087bef
Removes all the extra sanitisation from debates
...
This makes the feature red
2015-08-04 18:42:05 +02:00
Juanjo Bazán
a2ea42d13d
adds first 3 debates as featured_debates
2015-08-04 18:41:09 +02:00
kikito
90e577c811
Adds feature for debate description
2015-08-04 18:40:58 +02:00
kikito
16549f90c4
Adds badges for travis, code climate and gemnasium
2015-08-04 17:58:30 +02:00
Juanjo Bazán
c3046ccc2b
fixes build
...
adds empty featured_debates
2015-08-04 17:56:38 +02:00
Alberto Garcia Cabeza
4344bc121f
Changes styles for debates index and debate show
2015-08-04 13:25:00 +02:00
Alberto Garcia Cabeza
90f863c49f
Adds custom icons fonts
2015-08-04 13:23:33 +02:00
Alberto Garcia Cabeza
9dfde8125e
Deletes foundation icons, adds custom icons font
2015-08-04 13:23:33 +02:00
rgarcia
823426bfde
verify captcha only when captcha keys present
2015-08-04 12:54:24 +02:00
Juanjo Bazán
34fb646db3
Merge pull request #83 from AyuntamientoMadrid/tag-security-15
...
Tag security
2015-08-04 09:42:42 +02:00
kikito
b53bc42dcd
Uses the TagSanitizer in Debate
2015-08-03 19:32:00 +02:00
kikito
99c09afb02
Adds TagSanitizer
2015-08-03 19:30:06 +02:00
Enrique García
1ffcd35ed5
Update CONTRIBUTING.md
2015-08-03 18:34:26 +02:00
Raimond Garcia
a86772008f
Merge pull request #79 from AyuntamientoMadrid/contributing-tags
...
Adds references to contributing-related tags
2015-08-03 17:25:06 +02:00
Juanjo Bazán
d517ca4193
adds references to contributing-related tags
2015-08-03 17:21:17 +02:00
Juanjo Bazán
8fa6bab454
Merge pull request #76 from AyuntamientoMadrid/sanitize-debate-desc-71
...
Sanitizes debate desc
2015-08-02 22:32:42 +02:00
rgarcia
cce6ca2fb9
adds feature specs [ #25 ]
2015-08-02 13:37:50 +02:00
rgarcia
2a3086010e
adds voting for comments functionality [ #25 ]
2015-08-02 13:37:37 +02:00
rgarcia
44ae7078ea
adds routes to votable comments and debates [ #25 ] [ #25 ]
2015-08-02 13:36:39 +02:00
rgarcia
7a50d2064c
adds voting methods to comment model [ #25 ]
2015-08-02 13:35:48 +02:00
rgarcia
90720457bd
moves wysiwyg sanitizer to lib [ #71 ]
2015-07-31 18:51:20 +02:00
Raimond Garcia
254522d5c9
Merge pull request #75 from AyuntamientoMadrid/confirmation_spec
...
adds spec step to confirm email after sign up
2015-07-31 18:05:59 +02:00
Raimond Garcia
e0ff331cc8
Merge pull request #74 from AyuntamientoMadrid/missing-i18n
...
adds i18n to comments_helper
2015-07-31 18:04:35 +02:00
kikito
e277959274
Allow rendering the description with html_safe
...
We made sure that it is properly sanitised before allowing this.
2015-07-31 16:11:10 +02:00
kikito
c1028f794c
Implement description sanitization
2015-07-31 16:10:32 +02:00
kikito
824ce3c8fe
Add specs for description sanitisation
2015-07-31 16:10:20 +02:00
kikito
8d9f9a21a4
Autoloads app/services
2015-07-31 16:09:50 +02:00
Juanjo Bazán
45d2fe5462
adds spec step to confirm email after sign up
...
rel: #44
2015-07-31 15:44:08 +02:00
kikito
9ab8910329
Add WYSIWYGSanitizer
2015-07-31 15:40:32 +02:00
Juanjo Bazán
927f79fd78
adds i18n to comments_helper
2015-07-31 15:13:00 +02:00
Enrique García
66079f1741
Merge pull request #72 from AyuntamientoMadrid/confirmable-users
...
Confirmable users
2015-07-31 15:03:47 +02:00
Juanjo Bazán
0ca3d2501f
fixes build
2015-07-31 14:54:49 +02:00
Juanjo Bazán
e2f7b9c505
adds letter_opener
2015-07-31 13:51:31 +02:00
Juanjo Bazán
627616d9ff
adds devise's confirmable/reconfirmable to user
2015-07-31 13:51:03 +02:00
rgarcia
0bc5ac01b2
updates spec content
2015-07-31 13:46:00 +02:00
Raimond Garcia
2ea638967b
Merge pull request #64 from AyuntamientoMadrid/auth
...
Adds styles for authentication pages
2015-07-31 05:25:46 +02:00
Alberto Garcia Cabeza
851aefbaa6
Adds styles for authentication pages
2015-07-30 19:51:33 +02:00
Raimond Garcia
7fc7be371b
Merge pull request #47 from AyuntamientoMadrid/ajax-47
...
Mejorar usabilidad con AJAX
2015-07-30 18:55:31 +02:00
rgarcia
ba1f4e3850
merges master [ #47 ]
2015-07-30 18:53:04 +02:00
rgarcia
5bdc3fbaa0
updates correct dom element after voting [ #47 ]
2015-07-30 18:45:17 +02:00
rgarcia
ad0e578f2a
renders votes partial on ajax request [ #47 ]
2015-07-30 18:43:28 +02:00
rgarcia
5d5b9d00e0
adds ajax to vote links [ #47 ]
2015-07-30 18:43:11 +02:00
rgarcia
cd2d05e0c5
fixing conflicts [ #47 ] [ #47 ]
2015-07-30 18:19:38 +02:00
Juanjo Bazán
f195edef99
Merge pull request #63 from AyuntamientoMadrid/fix-readme
...
Fixes README, adds CONTRIBUTING.md
2015-07-30 17:52:37 +02:00
Juanjo Bazán
8141acafc2
typos
2015-07-30 17:51:08 +02:00
Enrique García
f3f2fd48ca
Merge pull request #62 from AyuntamientoMadrid/account
...
Adds basic "My account" page
2015-07-30 17:49:59 +02:00
