Enrique García
e4e94ae7cf
Merge pull request #84 from Ferdy89/escoger_idioma_803
...
Escoger idioma
2015-08-06 10:59:00 +02:00
Fernando Seror
c4eb29f99d
Merge branch 'master' into escoger_idioma_803
...
Conflicts:
app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00
Fernando Seror
a89d621d1d
Allow locale to be set through the front-end
...
* Store the last used locale in the session
* Allow home page to be identified in helpers even when containing
parameters
* Create initializer to explicitly set the available locales, the
default and the load_path
2015-08-05 15:43:39 -05:00
Raimond Garcia
ca60d57c02
Merge pull request #95 from AyuntamientoMadrid/comment-box
...
Not-logged users should not see comment forms in debate
2015-08-05 19:44:45 +02:00
Juanjo Bazán
64f5c4e7f1
shows "0%" when there's zero votes
...
Closes #97
2015-08-05 17:56:14 +02:00
Juanjo Bazán
ae8068f5fd
fix conflict
2015-08-05 14:46:18 +02:00
Juanjo Bazán
d23ce151a6
Merge pull request #96 from AyuntamientoMadrid/coveralls
...
Cobertura de tests
2015-08-05 14:40:39 +02:00
Juanjo Bazán
c18bc06c26
Merge pull request #94 from AyuntamientoMadrid/vote_comments-25
...
refactors voting
2015-08-05 14:37:51 +02:00
Juanjo Bazán
062ef365ad
vote action not allowed for unauthenticated users
2015-08-05 14:34:55 +02:00
rgarcia
c854d51c67
adds coveralls badge to readme
2015-08-05 14:27:17 +02:00
rgarcia
14e48035f6
ignores local test coverage stats
2015-08-05 14:17:18 +02:00
rgarcia
2dd0c51f10
integrates coveralls with travis
2015-08-05 14:17:08 +02:00
rgarcia
c2091f570c
integrates coveralls in test suite
2015-08-05 14:16:58 +02:00
rgarcia
f7de43de10
adds coveralls gem
2015-08-05 14:16:44 +02:00
Juanjo Bazán
8d87a69e0f
hides comment forms from not logged users
...
Closes #66
2015-08-05 14:12:58 +02:00
rgarcia
dda5963641
adds spec for voting a featured debate [ #25 ]
2015-08-05 13:50:15 +02:00
rgarcia
fa5b678b69
fixes conflicts with master [ #25 ]
2015-08-05 13:47:23 +02:00
Juanjo Bazán
cf1b72ba22
Merge pull request #90 from AyuntamientoMadrid/badges-81
...
Adds badges for travis, code climate and gemnasium
2015-08-05 12:41:39 +02:00
rgarcia
c2e7ff32b1
adds spec for voting from debate index [ #25 ]
2015-08-05 12:24:22 +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
Enrique García
715ee61979
Merge pull request #86 from AyuntamientoMadrid/verify_captcha
...
verify captcha only when captcha keys present
2015-08-05 12:23:33 +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
Enrique García
4ddaaeae6c
Merge pull request #92 from juandefelix/readme-correction
...
corrige rake task en README.md
2015-08-05 10:54:33 +02:00
Juan Ortiz
7915f9d77c
rake:schema_load to rake:schema:load
2015-08-04 18:21:00 -05:00
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
