rgarcia
fa5b678b69
fixes conflicts with master [ #25 ]
2015-08-05 13:47:23 +02:00
rgarcia
5ce8db002b
adds vote partial for debate index [ #25 ]
2015-08-05 12:24:22 +02:00
rgarcia
91b52ad8d2
refactors voting implementation [ #25 ]
2015-08-05 12:24:22 +02:00
kikito
08fdc768b2
fix wrong merge with master
2015-08-05 12:17:27 +02:00
kikito
d7a9f05cc5
merges master and fixes conflicts
2015-08-05 12:07:54 +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
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
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
kikito
b53bc42dcd
Uses the TagSanitizer in Debate
2015-08-03 19:32:00 +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
2a3086010e
adds voting for comments functionality [ #25 ]
2015-08-02 13:37:37 +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
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
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
Juanjo Bazán
627616d9ff
adds devise's confirmable/reconfirmable to user
2015-07-31 13:51:03 +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
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
kikito
59cea45c26
Use App.Comments module in create.js.erb
2015-07-30 14:08:05 +02:00
Alberto Garcia Cabeza
793127fbd3
Deletes margin-top on footer
2015-07-30 13:59:53 +02:00
Alberto Garcia Cabeza
d8d03604b9
Adds styles for comments
2015-07-30 13:59:35 +02:00
kikito
1237f9d8ad
make a comments module. Move module initializing to application.js
2015-07-30 13:19:34 +02:00
kikito
f1ebca66c1
add app.js module
2015-07-30 12:55:45 +02:00
kikito
affda6b4c5
merges master and fixes conflicts
2015-07-29 19:14:06 +02:00
kikito
a4bc9ed08f
removes conflict code which was left there by mistake
2015-07-29 18:45:10 +02:00
Alberto Garcia Cabeza
0efa9c77f1
Adds new styles for debates show
2015-07-29 17:47:05 +02:00
Alberto Garcia Cabeza
63895f52c3
Changes tags styles
2015-07-29 17:45:43 +02:00
Alberto Garcia Cabeza
53e22e78ec
Renames images for header, adds for default user
2015-07-29 17:45:43 +02:00
kikito
c495d4678c
merges master and fixes conflicts
2015-07-29 17:13:09 +02:00
Juanjo Bazán
08671414f2
removes hashrockets
2015-07-29 14:27:58 +02:00
rgarcia
95101c4cc8
fixing conflicts [ #45 ]
2015-07-29 13:36:48 +02:00
Alberto García Cabeza
ca49101209
Merge pull request #53 from AyuntamientoMadrid/buttons-style
...
Adds classes to several buttons so they don't look ugly
2015-07-29 13:22:50 +02:00
Juanjo Bazán
64e78dd019
Merge pull request #54 from AyuntamientoMadrid/wysiwyg-39
...
removes options from wysiwyg [closes #39 ]
2015-07-29 13:21:54 +02:00
rgarcia
6c2673b169
removes options from wysiwyg [ #39 ]
2015-07-29 13:11:44 +02:00
kikito
b87331c958
merges master and fixes conflicts
2015-07-29 13:00:33 +02:00
kikito
c71182f6a6
Adds classes to several buttons so they don't look ugly
2015-07-29 12:54:51 +02:00
Juanjo Bazán
daa172e408
adds i18n to all devise views
...
ref: #38
2015-07-29 12:18:55 +02:00
Juanjo Bazán
2ba3f8a1a9
Merge pull request #39 from AyuntamientoMadrid/wysiwyg-39
...
Adds WYSIWYG to debate's form
2015-07-29 10:19:23 +02:00
