Alberto Garcia Cabeza
|
c80d9b0a47
|
Reorganizes scss files
|
2015-08-10 13:33:02 +02:00 |
|
kikito
|
a9a4f4fb81
|
Undo user.moderator? returning true for admins
|
2015-08-10 13:00:26 +02:00 |
|
Raimond Garcia
|
ee681b7725
|
Merge pull request #130 from AyuntamientoMadrid/sdoc
removes doc from gemfile
|
2015-08-10 12:48:57 +02:00 |
|
kikito
|
8b53ae6f08
|
Adds Abilities for Debates
|
2015-08-10 12:38:22 +02:00 |
|
Juanjo Bazán
|
857edf60cc
|
Merge pull request #129 from AyuntamientoMadrid/votes
Adds styles for debates voted and no voted
|
2015-08-10 12:23:33 +02:00 |
|
Juanjo Bazán
|
259c90d65c
|
removes doc from gemfile
Ref: #125
|
2015-08-10 12:16:14 +02:00 |
|
Alberto Garcia Cabeza
|
6c0dd32ed1
|
Adds styles for debates voted and no voted
|
2015-08-10 12:08:43 +02:00 |
|
Juanjo Bazán
|
6d989488d9
|
Merge pull request #128 from AyuntamientoMadrid/remove-jbuilder-125
Remove jbuilder gem. Fixes #125
|
2015-08-10 11:56:41 +02:00 |
|
kikito
|
d7ab4331ea
|
Remove jbuilder gem. Fixes #125
|
2015-08-10 09:52:24 +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 |
|
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
|
f8becd1b23
|
Merge branch 'master' into admin-77
|
2015-08-08 13:00:41 +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
|
a949d54a85
|
removes unused json respond block [#77]
|
2015-08-07 21:52:14 +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 |
|
kikito
|
dac5b8d22a
|
Make /admin and /moderation only accesible to Admins & Moderators
|
2015-08-07 19:15:08 +02:00 |
|
kikito
|
9eae91c764
|
Makes user.moderator? return true for administrators
|
2015-08-07 18:52:09 +02:00 |
|
kikito
|
99df1c0bbf
|
adds cancancan
|
2015-08-07 18:28:54 +02:00 |
|
Juanjo Bazán
|
d04383db24
|
validates uniqueness of admins & mods
|
2015-08-07 18:20: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 |
|
kikito
|
5cc9c21b8d
|
fixes typo in user_spec
|
2015-08-07 17:46:36 +02:00 |
|
kikito
|
8d83607331
|
Implements dashboard controllers & views for admin & moderation
|
2015-08-07 17:20:28 +02:00 |
|
kikito
|
c04d397e66
|
Implements User.administrator? & User.moderator?
|
2015-08-07 17:20:20 +02:00 |
|
kikito
|
3378790764
|
Adds migrations & models for administrators & moderators
|
2015-08-07 17:04:50 +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 |
|