consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
571 Commits 1 Branch 0 Tags
2fe55513c1fbe690178f8b06b51d4967a34e7a1f
Commit Graph

571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto Garcia Cabeza
3cddc1070a Adds styles for not logged votes 2015-08-11 17:40:27 +02:00
Raimond Garcia
d86eb9f550 Merge pull request #145 from AyuntamientoMadrid/home 
moves featured debates to home page
 2015-08-11 17:31:53 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
Raimond Garcia
2c88c6e07d Merge pull request #141 from AyuntamientoMadrid/debates 
Improves styles for debates
 2015-08-11 13:21:42 +02:00
Alberto Garcia Cabeza
d5c27b36d5 Improves styles for debate show and comments 2015-08-11 13:16:24 +02:00
Alberto Garcia Cabeza
f9e0dad7a2 Adds links on comments title 2015-08-11 12:00:54 +02:00
Juanjo Bazán
d7931f3d74 adds ImageMagick to README 2015-08-11 11:18:57 +02:00
Raimond Garcia
37790341a9 Merge pull request #140 from AyuntamientoMadrid/fix-debates-vote 
Fixes votes in debates' show
 2015-08-11 11:05:54 +02:00
Raimond Garcia
7fbdd96de3 Merge pull request #139 from AyuntamientoMadrid/update-gems 
Update dependencies
 2015-08-11 11:05:21 +02:00
Juanjo Bazán
f36f408f63 fixes votes in debates' show 
Closes #135
 2015-08-11 10:57:48 +02:00
Juanjo Bazán
3f27458ce2 updates dependencies 
makes gemnasium happy
 2015-08-11 10:43:33 +02:00
Juanjo Bazán
6346d79c1e Merge pull request #137 from AyuntamientoMadrid/captcha-51 
uses simple_captcha instead of recaptcha [#51]
 2015-08-11 09:57:22 +02:00
Raimond Garcia
240125d9e8 Merge pull request #138 from AyuntamientoMadrid/styleguide 
Creates style guide html
 2015-08-10 21:30:14 +02:00
Alberto Garcia Cabeza
a2f83e2ced Creates style guide html 2015-08-10 20:50:29 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
Juanjo Bazán
ee463f2ab1 Merge pull request #127 from Ferdy89/compartir-en-redes-sociales 
Adds sharing buttons
 2015-08-10 18:36:44 +02:00
Fernando Seror
6d20972f34 Share in social networks 
* Add the social buttons gem to the Gemfile

* Initializer and translations for the social buttons

* Add the social buttons assets to the sprockets require

* Add the social buttons in the show debate view

* Spec to lock down the amount of social share buttons to three
 2015-08-10 11:00:39 -05:00
Raimond Garcia
8053034ddf Merge pull request #132 from AyuntamientoMadrid/i18n-files 
adds i18n files for new namespaces
 2015-08-10 17:04:00 +02:00
Juanjo Bazán
8b50b60814 adds i18n files for new namespaces 2015-08-10 16:58:35 +02:00
Raimond Garcia
17aba2303d Merge pull request #131 from AyuntamientoMadrid/footer 
Footer
 2015-08-10 16:49:12 +02:00
rgarcia
66e4581a84 fixes conflicts with master 2015-08-10 16:46:27 +02:00
Raimond Garcia
16183d9909 Merge pull request #116 from AyuntamientoMadrid/admin-77 
Administrator and Moderator basic interface
 2015-08-10 16:41:47 +02:00
kikito
7f5f5d6b19 Adds i18n for unauthorized messages 2015-08-10 16:24:01 +02:00
kikito
51323fa891 Adds back missing authenticate_user! calls 2015-08-10 16:05:58 +02:00
kikito
84d848df7e Adapts the CommentsController to the new permissions system 2015-08-10 15:40:23 +02:00
Alberto Garcia Cabeza
91cdfbc8a1 Adds content on footer 2015-08-10 15:39:38 +02:00
Eloy Gomez
cfd923138c Add minimum PostgreSQL version. 2015-08-10 15:39:14 +02:00
kikito
ce27a6f2ea Adapts AccountController to new permissions system 2015-08-10 15:10:47 +02:00
kikito
c1c1362780 Adapts debates controller to new permissions system 2015-08-10 15:00:14 +02:00
kikito
30e738a2fe Add cancan authorization in all main urls 2015-08-10 14:59:42 +02:00
Alberto Garcia Cabeza
c80d9b0a47 Reorganizes scss files 2015-08-10 13:33:02 +02:00
kikito
a9a4f4fb81 Undo user.moderator? returning true for admins 2015-08-10 13:00:26 +02:00
Raimond Garcia
ee681b7725 Merge pull request #130 from AyuntamientoMadrid/sdoc 
removes doc from gemfile
 2015-08-10 12:48:57 +02:00
kikito
8b53ae6f08 Adds Abilities for Debates 2015-08-10 12:38:22 +02:00
Juanjo Bazán
857edf60cc Merge pull request #129 from AyuntamientoMadrid/votes 
Adds styles for debates voted and no voted
 2015-08-10 12:23:33 +02:00
Juanjo Bazán
259c90d65c removes doc from gemfile 
Ref: #125
 2015-08-10 12:16:14 +02:00
Alberto Garcia Cabeza
6c0dd32ed1 Adds styles for debates voted and no voted 2015-08-10 12:08:43 +02:00
Juanjo Bazán
6d989488d9 Merge pull request #128 from AyuntamientoMadrid/remove-jbuilder-125 
Remove jbuilder gem. Fixes #125
 2015-08-10 11:56:41 +02:00
kikito
d7ab4331ea Remove jbuilder gem. Fixes #125 2015-08-10 09:52:24 +02:00
Adrian Pradilla
85e3e4439c Add translations for active record models 
Fix i18n spec

Add i18n activerecord files

Fix activerecord first name and last name labels
 2015-08-09 17:40:14 +02:00
Eloy Gomez
7f8b3abace Use Postgres 9.4 with travis 2015-08-08 15:04:47 +02:00
Eloy Gomez
fe2080aff9 Display some stats 2015-08-08 14:33:44 +02:00
Juanjo Bazán
d96f1697dc Merge pull request #121 from AyuntamientoMadrid/user 
styles user account
 2015-08-08 14:07:26 +02:00
Juanjo Bazán
fefe5a12ba adds spec for failed edition of user data 2015-08-08 14:04:55 +02:00
Juanjo Bazán
61463fc378 removes unused i18n entries 2015-08-08 13:53:15 +02:00
Alberto Garcia Cabeza
c048f25941 Fixes conflicts 2015-08-08 13:28:29 +02:00
Alberto Garcia Cabeza
fdfef95595 Adds styles for account page and edit user 2015-08-08 13:21:46 +02:00
Eloy Gomez
02f19aa4b1 Add visit_id to debate 2015-08-08 13:09:22 +02:00
Eloy Gomez
b23ca8deb1 Create event on debate creation 2015-08-08 13:08:48 +02:00
Juanjo Bazán
f8becd1b23 Merge branch 'master' into admin-77 2015-08-08 13:00:41 +02:00