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
|
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 |
|
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 |
|
Juanjo Bazán
|
1454a3063c
|
Merge pull request #118 from AyuntamientoMadrid/emails-23
Sends emails
|
2015-08-07 21:25:09 +02:00 |
|
rgarcia
|
3eac8d0bd8
|
adds email specs [#23]
|
2015-08-07 20:58:24 +02:00 |
|
rgarcia
|
0a55a7b6a8
|
changes untranslated spec to english [#23]
|
2015-08-07 20:57:52 +02:00 |
|
rgarcia
|
829180a84a
|
adds reset password spec [#23]
|
2015-08-07 20:57:31 +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
|
6803dc9d74
|
configures email_spec gem [#23]
|
2015-08-07 20:48:20 +02:00 |
|
rgarcia
|
a65396886a
|
adds error messages to account edit
|
2015-08-07 17:47:53 +02:00 |
|
rgarcia
|
076448ec80
|
fixes credentials page
|
2015-08-07 17:47:12 +02:00 |
|
Raimond Garcia
|
ac3c7002d2
|
Merge pull request #114 from AyuntamientoMadrid/capistrano
Adds Capistrano
|
2015-08-07 16:03:12 +02:00 |
|
Raimond Garcia
|
5a224f613b
|
Merge pull request #115 from AyuntamientoMadrid/readme-en
Adds english lang README & CONTRIBUTING files
|
2015-08-07 16:02:25 +02:00 |
|
Juanjo Bazán
|
601b0ac390
|
typo
|
2015-08-07 14:17:57 +02:00 |
|
Juanjo Bazán
|
989dd1a8e8
|
links README to CONTRIBUTING
|
2015-08-07 14:15:10 +02:00 |
|
Juanjo Bazán
|
59c960f9fe
|
favors db:setup in the doc
|
2015-08-07 14:14:10 +02:00 |
|
Juanjo Bazán
|
9a2d08e3da
|
adds README_EN.md
|
2015-08-07 14:13:39 +02:00 |
|
Juanjo Bazán
|
1a97c23b94
|
we ❤️ our contributors
|
2015-08-07 14:12:46 +02:00 |
|
Juanjo Bazán
|
2aa5fac59b
|
adds english contributing guide
|
2015-08-07 14:12:19 +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 |
|
Alberto Garcia Cabeza
|
8fdba1b5b4
|
Merges accounts show with registrations edit
|
2015-08-07 12:16:20 +02:00 |
|
Alberto García Cabeza
|
a0140f6dda
|
Merge pull request #108 from AyuntamientoMadrid/voted-css
Adds CSS class to voted options
|
2015-08-07 10:34:56 +02:00 |
|
Juanjo Bazán
|
af0698da35
|
fixes conflicts
|
2015-08-07 10:12:58 +02:00 |
|
Raimond Garcia
|
3279eeba45
|
Merge pull request #111 from AyuntamientoMadrid/user_nickname_98
User nickname
|
2015-08-07 09:23:44 +02:00 |
|
Juanjo Bazán
|
e34ae1a805
|
adds tests for :js vote specs
|
2015-08-07 09:21:29 +02:00 |
|
Raimond Garcia
|
3a70d6e2dd
|
Merge pull request #112 from AyuntamientoMadrid/devise_layout
Devise layout
|
2015-08-07 09:19:32 +02:00 |
|
Juanjo Bazán
|
37199125fa
|
refactors votes view code to helper
|
2015-08-07 09:19:02 +02:00 |
|
Alberto Garcia Cabeza
|
beb05106cb
|
Fixes conflicts
|
2015-08-06 20:58:54 +02:00 |
|
Alberto Garcia Cabeza
|
df3884ad18
|
Adds styles for debate new
|
2015-08-06 20:54:37 +02:00 |
|
Alberto Garcia Cabeza
|
724cffa4ce
|
Updates icons fonts
|
2015-08-06 20:54:37 +02:00 |
|
rgarcia
|
6e59df2a3b
|
adds link to debate description
|
2015-08-06 20:54:37 +02:00 |
|
Alberto Garcia Cabeza
|
f9cb8151ff
|
Adds styles for authentication pages
|
2015-08-06 20:53:14 +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 |
|
Juanjo Bazán
|
cdaa3e2808
|
favors dom_id
|
2015-08-06 18:53:40 +02:00 |
|
kikito
|
5710a5e134
|
Adds missing i18n labels and removes unused ones
|
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 |
|
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 |
|
Juanjo Bazán
|
6e7832957a
|
adds method to get user votes on specific debates
|
2015-08-06 18:10:14 +02:00 |
|