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
Eloy Gomez
fe2080aff9
Display some stats
2015-08-08 14:33:44 +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
Eloy Gomez
42d6e49915
Save visitor ip
2015-08-08 12:23:28 +02:00
Eloy Gomez
aaeb77d969
Add gem ahoy_matey and some dependencies
2015-08-08 12:05:55 +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
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
