consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,492 Commits 1 Branch 0 Tags
b31f853bc6ad15cb479e958a1ea2acbcf53d5012
Commit Graph

4510 Commits

Author SHA1 Message Date
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
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
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
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
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
rgarcia
2a3086010e adds voting for comments functionality [#25] 2015-08-02 13:37:37 +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
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
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
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
rgarcia
1deecea0af adds wysiwyg to debate description 2015-07-28 21:46:01 +02:00
rgarcia
bdcd513f26 responds with ajax to debate vote [#47] 2015-07-28 20:52:59 +02:00
rgarcia
3247180dfa responds with ajax to comment creation [#47] 2015-07-28 20:32:53 +02:00
Juanjo Bazán
efc1b71dbf adds i18n to header 
ref: #38
 2015-07-28 18:49:41 +02:00
rgarcia
7a53055db1 updates alert styling [#45] 2015-07-28 18:33:09 +02:00
rgarcia
81a5ddb580 refactors recaptchable helper [#45] 2015-07-28 18:32:45 +02:00
rgarcia
c5bfc9420f adds recaptcha validation to registration controller [#45] [#45] 2015-07-28 18:32:10 +02:00
Enrique García
6a6804f73b Merge pull request #48 from AyuntamientoMadrid/footer 
Adds fake footer
 2015-07-28 17:00:03 +02:00
Enrique García
5860efe35d Merge pull request #46 from AyuntamientoMadrid/beautification 
Beautification
 2015-07-28 16:50:32 +02:00
Juanjo Bazán
e9c1910d7d adds i18n to debates' interface 2015-07-28 16:48:36 +02:00
kikito
d5710c8dc6 Removes '|' after button in debates/show 
The rest of the commit noise is trailing spaces :(
 2015-07-28 16:32:07 +02:00
decabeza
d422830228 Adds fake footer 2015-07-28 14:07:47 +02:00
rgarcia
05bff9dc1f adds styling to submit button 2015-07-28 13:55:31 +02:00
rgarcia
1609f6970f displays debates next to each other 2015-07-28 13:55:15 +02:00
rgarcia
62be883bcc displays welcome image only at home page 2015-07-28 13:54:43 +02:00