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
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
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
rgarcia
c2e7ff32b1
adds spec for voting from debate index [ #25 ]
2015-08-05 12:24:22 +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
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
Juanjo Bazán
c3046ccc2b
fixes build
...
adds empty featured_debates
2015-08-04 17:56:38 +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
cce6ca2fb9
adds feature specs [ #25 ]
2015-08-02 13:37:50 +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
kikito
824ce3c8fe
Add specs for description sanitisation
2015-07-31 16:10:20 +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
Juanjo Bazán
927f79fd78
adds i18n to comments_helper
2015-07-31 15:13:00 +02:00
Juanjo Bazán
0ca3d2501f
fixes build
2015-07-31 14:54:49 +02:00
rgarcia
0bc5ac01b2
updates spec content
2015-07-31 13:46:00 +02:00
rgarcia
cd2d05e0c5
fixing conflicts [ #47 ] [ #47 ]
2015-07-30 18:19:38 +02:00
kikito
affda6b4c5
merges master and fixes conflicts
2015-07-29 19:14:06 +02:00
kikito
cee0aef916
Fixes spec: Tags are not separated by commas any more
2015-07-29 18:48:39 +02:00
kikito
efbb9a52d8
Fixes spec: "el " was removed from view
2015-07-29 18:47:22 +02:00
kikito
6d10d97a32
Fixes specs: "Por" was removed from the view.
2015-07-29 18:46:09 +02:00
kikito
c495d4678c
merges master and fixes conflicts
2015-07-29 17:13:09 +02:00
Juanjo Bazán
daa172e408
adds i18n to all devise views
...
ref: #38
2015-07-29 12:18:55 +02:00
rgarcia
8a642d3c96
fixes specs [ #47 ]
2015-07-28 20:53:09 +02:00
rgarcia
be2a481cd7
fixes specs [ #47 ]
2015-07-28 20:32:59 +02:00
Juanjo Bazán
e9c1910d7d
adds i18n to debates' interface
2015-07-28 16:48:36 +02:00
Juanjo Bazán
9073037a45
makes test suite default to :en locale
...
ref: #38
2015-07-28 12:52:10 +02:00
rgarcia
94594ae03c
adds js driver to js spec
2015-07-27 23:35:28 +02:00
rgarcia
90f476f8d1
Merge branch 'master' into home
2015-07-27 23:30:46 +02:00
Raimond Garcia
943b19c3a4
Merge pull request #40 from AyuntamientoMadrid/js_comments-21
...
Hide/show comment forms
2015-07-27 23:30:25 +02:00
rgarcia
cc3f151914
fixing conflicts
2015-07-27 23:29:32 +02:00
rgarcia
137267887c
fixes specs
2015-07-27 23:21:15 +02:00
rgarcia
baaf9cac93
refactors duplicate form id scenario [ #21 ]
2015-07-27 22:50:38 +02:00
rgarcia
dea2964f08
fixes duplicate id in comment form [ #21 ]
2015-07-27 22:22:12 +02:00
kikito
00d21fbabd
Remove focus from test
2015-07-27 19:22:17 +02:00
kikito
bed380fffd
Make the comment button appear by clicking in "Comentar" in the test
2015-07-27 19:22:05 +02:00
rgarcia
23fc19f4b0
fixing specs
2015-07-27 18:46:13 +02:00
kikito
bc1c49f19e
Merge branch 'master' into js_comments-21
2015-07-27 17:23:44 +02:00
rgarcia
4d0f9ae5c3
fixes specs
2015-07-27 11:15:20 +02:00
rgarcia
0aaa8169f0
tmp commit [ #21 ]
2015-07-27 11:12:55 +02:00
Juanjo Bazán
bd92f6ec5c
makes tag list sorted
...
fixes build
2015-07-24 12:51:55 +02:00
Juanjo Bazán
2a63d1f953
manages permissions for debate editing
2015-07-19 14:47:14 +02:00
Juanjo Bazán
984984473f
Fix conflict
2015-07-18 21:58:43 +02:00
Juanjo Bazán
b6d2a5efd6
uses new hash syntax by default
2015-07-18 21:49:36 +02:00
rgarcia
2eb0602097
fixes specs
2015-07-18 21:37:15 +02:00
