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
rgarcia
91b52ad8d2
refactors voting implementation [ #25 ]
2015-08-05 12:24:22 +02:00
Alberto Garcia Cabeza
4344bc121f
Changes styles for debates index and debate show
2015-08-04 13:25: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
44ae7078ea
adds routes to votable comments and debates [ #25 ] [ #25 ]
2015-08-02 13:36:39 +02:00
rgarcia
90720457bd
moves wysiwyg sanitizer to lib [ #71 ]
2015-07-31 18:51:20 +02:00
kikito
8d9f9a21a4
Autoloads app/services
2015-07-31 16:09:50 +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
Juanjo Bazán
e2f7b9c505
adds letter_opener
2015-07-31 13:51:31 +02:00
Juanjo Bazán
bd4b023715
adds 'my account' link to header
...
ref: #22
2015-07-30 17:36:32 +02:00
Juanjo Bazán
8f6e5ecfc8
adds basic 'my account' page
...
Fields related with authentication are not included
because the auth system will change to integrate with
Madrid.es's Ciudadano360
ref: #22
2015-07-30 17:36:32 +02:00
Alberto Garcia Cabeza
0efa9c77f1
Adds new styles for debates show
2015-07-29 17:47:05 +02:00
Juanjo Bazán
146cfbcf84
removes deprecation method call
2015-07-29 13:57:56 +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
efc1b71dbf
adds i18n to header
...
ref: #38
2015-07-28 18:49:41 +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
Juanjo Bazán
b436331ce5
fixes key name
2015-07-27 18:48:30 +02:00
rgarcia
115eb86539
fixes typo
2015-07-27 18:46:13 +02:00
rgarcia
382028b7b6
adds recaptcha translations
2015-07-27 18:44:33 +02:00
rgarcia
ef2cd18028
configures recaptcha
2015-07-27 18:44:33 +02:00
rgarcia
723b0584ce
removes secrets.yml from version control
2015-07-25 18:19:03 +02:00
Juanjo Bazán
50d32cd2b7
removes db name from defaults
2015-07-24 12:51:28 +02:00
Alberto García Cabeza
68c45198c6
Includes fonts files
2015-07-24 11:50:08 +02:00
Alberto García Cabeza
8d0c326267
configures postgres
2015-07-22 13:01:52 +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
2bd2ceaf59
makes debates/index the root url
2015-07-18 21:28:38 +02:00
rgarcia
b060ffaa17
fixing conflicts [ #9 ]
2015-07-18 18:19:00 +02:00
rgarcia
73c3890027
fixing conflicts [ #9 ]
2015-07-18 18:16:10 +02:00
rgarcia
e006549092
adds votes to debates [ #9 ]
2015-07-18 18:10:19 +02:00
rgarcia
28e36b76e2
fixing conflicts [ #7 ]
2015-07-18 18:04:23 +02:00
rgarcia
fce0068bf4
fixing conflicts [ #7 ]
2015-07-18 17:40:38 +02:00
rgarcia
98463e4930
adds comments to debates [ #7 ]
2015-07-18 17:38:57 +02:00
rgarcia
6adedf45b8
configures act_as_taggable [ #8 ]
2015-07-18 17:23:00 +02:00
rgarcia
c55021e18b
fixing conflicts [ #8 ]
2015-07-18 15:04:36 +02:00
rgarcia
62d0a385ab
adds first name and last name to users
2015-07-17 19:52:55 +02:00
