consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,828 Commits 1 Branch 0 Tags
d901b09560b9e73eaf35d4dd90fef6c79b66d9a1
Commit Graph

6270 Commits

Author SHA1 Message Date
kikito
17a741d838 Adds nickname support in the registration form 2015-08-06 18:54:03 +02:00
Juanjo Bazán
cdaa3e2808 favors dom_id 2015-08-06 18:53:40 +02:00
Juanjo Bazán
33489e7b0c adds css classes to voted options in debates 
for logged users.
Closes #88
 2015-08-06 18:53:05 +02:00
Juanjo Bazán
6e7832957a adds method to get user votes on specific debates 2015-08-06 18:10:14 +02:00
Juanjo Bazán
8d36487cd0 Merge pull request #105 from AyuntamientoMadrid/description_link 
adds link to debate description
 2015-08-06 18:09:44 +02:00
Alberto Garcia Cabeza
1067d2272e Adds styles for debate new 2015-08-06 17:59:22 +02:00
Alberto Garcia Cabeza
c7cd29360d Updates icons fonts 2015-08-06 17:59:05 +02:00
kikito
72c33330cf Adds nickname-related validations & name to User 2015-08-06 16:53:18 +02:00
rgarcia
515d083633 use custom layout for devise controllers 2015-08-06 16:01:01 +02:00
rgarcia
ae34be1ddd adds link to debate description 2015-08-06 15:50:36 +02:00
Juanjo Bazán
44e049e483 Merge pull request #104 from AyuntamientoMadrid/debates_title_length_93 
Debates title length
 2015-08-06 15:25:16 +02:00
kikito
5c141e36ab uses the debate title length in the debates form 2015-08-06 14:01:48 +02:00
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
Alberto Garcia Cabeza
56f480d5c0 Improves CSS styles for votes 2015-08-06 12:53:19 +02:00
Alberto Garcia Cabeza
f0be767ae8 Updates styles for debates show 2015-08-06 12:42:41 +02:00
Enrique García
ca575a6f20 Merge pull request #101 from AyuntamientoMadrid/show-0-votes 
shows "0%" when there's zero votes
 2015-08-06 12:00:37 +02:00
Alberto Garcia Cabeza
77ecf39852 Updates styles for debates index 2015-08-06 11:19:37 +02:00
Alberto Garcia Cabeza
e69eb1eae8 Creates new sass for variables 2015-08-06 11:19:13 +02:00
Alberto Garcia Cabeza
228fd80688 Updates icons font 2015-08-06 11:18:56 +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
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
062ef365ad vote action not allowed for unauthenticated users 2015-08-05 14:34:55 +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
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