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

94 Commits

Author SHA1 Message Date
Enrique García
2397344597 Merge pull request #169 from AyuntamientoMadrid/staging_deploy_fixes 
adds fixes for staging deploys
 2015-08-14 18:13:40 +02:00
Enrique García
beac5de0c3 Merge pull request #151 from manolomaldonado/capistrano 
Capistrano recipe
 2015-08-14 18:11:11 +02:00
rgarcia
76826af7dd adds fixes for staging deploys 2015-08-14 18:09:05 +02:00
rgarcia
101477c7da refactors admin layout 2015-08-14 13:33:30 +02:00
rgarcia
88defaa455 adds admin layout and access links [#163] 2015-08-14 12:37:44 +02:00
Raimond Garcia
e49567c953 Merge pull request #154 from AyuntamientoMadrid/debates 
Debates
 2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
d6c7528df3 Improves styles of debates show page 2015-08-12 15:26:46 +02:00
David Gil
1ee3378768 adding a few tests 2015-08-12 14:59:54 +02:00
David Gil
0291f574a2 add vote counters to comments 2015-08-12 14:59:21 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
Alberto Garcia Cabeza
00af11396d Improves styles for auth pages 2015-08-12 14:07:34 +02:00
Alberto Garcia Cabeza
502920c7f2 Improves styles for account page, adds user image 2015-08-12 11:53:28 +02:00
Enrique García
d243d81fea Merge pull request #150 from AyuntamientoMadrid/votes 
Avoid voting by not logged users
 2015-08-12 10:15:06 +02:00
Manuel Maldonado
4b501ee46b Capistrano recipe 2015-08-12 01:36:42 +02:00
Alberto Garcia Cabeza
3cddc1070a Adds styles for not logged votes 2015-08-11 17:40:27 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +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
Juanjo Bazán
8b50b60814 adds i18n files for new namespaces 2015-08-10 16:58:35 +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
Alberto Garcia Cabeza
91cdfbc8a1 Adds content on footer 2015-08-10 15:39:38 +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
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
Juanjo Bazán
f8becd1b23 Merge branch 'master' into admin-77 2015-08-08 13:00:41 +02:00
Juanjo Bazán
90a3dcdc16 Merge pull request #119 from AyuntamientoMadrid/header 
Changes styles for header
 2015-08-08 01:51:59 +02:00
Alberto Garcia Cabeza
d45a22781a Changes styles for header 2015-08-07 23:23:16 +02:00
rgarcia
beb1a796f5 adds email sending preferences [#23] 2015-08-07 20:56:27 +02:00
rgarcia
3752054aab sends emails [#23] 2015-08-07 20:52:53 +02:00
rgarcia
076448ec80 fixes credentials page 2015-08-07 17:47:12 +02:00
kikito
8d83607331 Implements dashboard controllers & views for admin & moderation 2015-08-07 17:20:28 +02:00
Juanjo Bazán
60a9fad9c1 adds passenger to deploy config 2015-08-07 12:23:33 +02:00
Juanjo Bazán
8a8ca834ba adds capistrano-rvm 
sets ruby version for deploy to 2.2.2
 2015-08-07 12:21:03 +02:00
Juanjo Bazán
949f8a68df adds sample deploy-secrets.yml file 2015-08-07 12:19:01 +02:00
Juanjo Bazán
808f0fcfbb adds capistrano's deploy configuration and scripts 2015-08-07 12:17:18 +02:00
kikito
a194d9584b merges master and fixes conflicts 2015-08-06 19:25:51 +02:00
kikito
c4c764df38 Adds nickname and use_nickname to "my profile" 2015-08-06 19:19:45 +02:00
kikito
17a741d838 Adds nickname support in the registration form 2015-08-06 18:54:03 +02:00
kikito
5710a5e134 Adds missing i18n labels and removes unused ones 2015-08-06 18:53:40 +02:00
kikito
17fb44c70b Moves i18n initialisation to application.rb 2015-08-06 18:31:44 +02:00
kikito
b1acbeb39d Adds i18n-tasks 2015-08-06 18:31:26 +02:00
Alberto Garcia Cabeza
1067d2272e Adds styles for debate new 2015-08-06 17:59:22 +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
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