Commit Graph

20144 Commits

Author SHA1 Message Date
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
Juanjo Bazán
8d36487cd0 Merge pull request #105 from AyuntamientoMadrid/description_link
adds link to debate description
2015-08-06 18:09:44 +02:00
Juanjo Bazán
73f1283f73 Merge pull request #107 from AyuntamientoMadrid/forms
Forms design
2015-08-06 18:08:05 +02:00
Alberto Garcia Cabeza
1067d2272e Adds styles for debate new 2015-08-06 17:59:22 +02:00
Alberto Garcia Cabeza
c7cd29360d Updates icons fonts 2015-08-06 17:59:05 +02:00
kikito
72c33330cf Adds nickname-related validations & name to User 2015-08-06 16:53:18 +02:00
kikito
23a21d14f2 Migration for user.use_nickname 2015-08-06 16:03:54 +02:00
rgarcia
515d083633 use custom layout for devise controllers 2015-08-06 16:01:01 +02:00
kikito
b848e8d346 migration adding nickname to user 2015-08-06 15:53:31 +02:00
rgarcia
ae34be1ddd adds link to debate description 2015-08-06 15:50:36 +02:00
Juanjo Bazán
44e049e483 Merge pull request #104 from AyuntamientoMadrid/debates_title_length_93
Debates title length
2015-08-06 15:25:16 +02:00
kikito
5c141e36ab uses the debate title length in the debates form 2015-08-06 14:01:48 +02:00
Raimond Garcia
3a27e64863 Merge pull request #102 from AyuntamientoMadrid/debates
Debates
2015-08-06 13:55:45 +02:00
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
kikito
6b58fd64bb limits the length of debates.title to 80 in the db 2015-08-06 13:18:21 +02:00
Alberto Garcia Cabeza
56f480d5c0 Improves CSS styles for votes 2015-08-06 12:53:19 +02:00
Alberto Garcia Cabeza
f0be767ae8 Updates styles for debates show 2015-08-06 12:42:41 +02:00
Enrique García
ca575a6f20 Merge pull request #101 from AyuntamientoMadrid/show-0-votes
shows "0%" when there's zero votes
2015-08-06 12:00:37 +02:00
Alberto Garcia Cabeza
77ecf39852 Updates styles for debates index 2015-08-06 11:19:37 +02:00
Alberto Garcia Cabeza
e69eb1eae8 Creates new sass for variables 2015-08-06 11:19:13 +02:00
Alberto Garcia Cabeza
228fd80688 Updates icons font 2015-08-06 11:18:56 +02:00