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
Enrique García
e4e94ae7cf
Merge pull request #84 from Ferdy89/escoger_idioma_803
...
Escoger idioma
2015-08-06 10:59:00 +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
Raimond Garcia
ca60d57c02
Merge pull request #95 from AyuntamientoMadrid/comment-box
...
Not-logged users should not see comment forms in debate
2015-08-05 19:44:45 +02:00
Juanjo Bazán
64f5c4e7f1
shows "0%" when there's zero votes
...
Closes #97
2015-08-05 17:56:14 +02:00
Juanjo Bazán
ae8068f5fd
fix conflict
2015-08-05 14:46:18 +02:00
Juanjo Bazán
d23ce151a6
Merge pull request #96 from AyuntamientoMadrid/coveralls
...
Cobertura de tests
2015-08-05 14:40:39 +02:00
Juanjo Bazán
c18bc06c26
Merge pull request #94 from AyuntamientoMadrid/vote_comments-25
...
refactors voting
2015-08-05 14:37:51 +02:00
Juanjo Bazán
062ef365ad
vote action not allowed for unauthenticated users
2015-08-05 14:34:55 +02:00
rgarcia
c854d51c67
adds coveralls badge to readme
2015-08-05 14:27:17 +02:00
