Alberto Garcia Cabeza
|
ff6285d114
|
Improves general styles
|
2015-08-21 18:57:09 +02:00 |
|
rgarcia
|
8e0c2c27da
|
uses https for staging and production envs
|
2015-08-21 18:54:03 +02:00 |
|
rgarcia
|
6d14d07e5a
|
adds deploy secrets to staging and production envs
|
2015-08-21 18:52:52 +02:00 |
|
Juanjo Bazán
|
385da5185a
|
adds keys to deploy-secrets.yml
|
2015-08-21 17:14:00 +02:00 |
|
Raimond Garcia
|
000b5d1dda
|
Merge pull request #214 from AyuntamientoMadrid/registrations-refactored
Refactor of user's registration
|
2015-08-21 17:09:56 +02:00 |
|
rgarcia
|
7da272898e
|
deploys to multiple preproduction servers
|
2015-08-21 17:07:31 +02:00 |
|
rgarcia
|
dbc3a6596e
|
adds mail host for staging and production
|
2015-08-21 17:06:51 +02:00 |
|
rgarcia
|
c39657cf5c
|
fixes capistrano unicorn restart task
|
2015-08-21 17:06:35 +02:00 |
|
Juanjo Bazán
|
b396a3b415
|
refactors user's registration
Simplifies process and fields:
* In: username
* Out: first_name, last_name, phone, nickname, use_nickname?
Closes #213
|
2015-08-21 16:41:08 +02:00 |
|
Juanjo Bazán
|
e69688e91f
|
Merge pull request #212 from AyuntamientoMadrid/reorganize_header
Reorganize header
|
2015-08-21 15:17:32 +02:00 |
|
Alberto Garcia Cabeza
|
3c29ac90c9
|
Merge branch 'master' into reorganize_header
|
2015-08-21 13:05:21 +02:00 |
|
Alberto Garcia Cabeza
|
6bd060f536
|
Reorganizes header links, adds responsive styles
|
2015-08-21 13:04:41 +02:00 |
|
Raimond Garcia
|
0a4cb357ce
|
Merge pull request #209 from alejanderl/some_doc_missing
Added ghostscript to Readme. Required for captcha
|
2015-08-21 10:19:24 +02:00 |
|
Raimond Garcia
|
a7cc888a70
|
Merge pull request #210 from AyuntamientoMadrid/select_language
Adds styles for language select
|
2015-08-21 10:16:41 +02:00 |
|
Raimond Garcia
|
518d779605
|
Merge pull request #211 from AyuntamientoMadrid/update_texts
Updates some texts
|
2015-08-21 10:15:55 +02:00 |
|
Alberto Garcia Cabeza
|
bf727699f3
|
Updates some texts
|
2015-08-21 09:02:43 +02:00 |
|
Alberto Garcia Cabeza
|
efd7b688cb
|
Renames language to locale
|
2015-08-21 08:50:09 +02:00 |
|
kikito
|
01eb89f5f4
|
DRYes comment views related with flagging as inappropiate
|
2015-08-20 22:54:05 +02:00 |
|
Alberto Garcia Cabeza
|
2415a0fae2
|
Adds styles for language select
|
2015-08-20 21:28:10 +02:00 |
|
Alejandro
|
71b9c84b7f
|
Added ghostscript to Readme. Required for captcha
|
2015-08-20 21:18:31 +02:00 |
|
kikito
|
12e8cf2056
|
Allows flagging debates as inappropriate
|
2015-08-20 19:26:36 +02:00 |
|
kikito
|
ee881230ba
|
merges master and fixes conflicts
|
2015-08-20 18:50:10 +02:00 |
|
kikito
|
e7effbf77c
|
Allows flagging comments as inappropriate
|
2015-08-20 18:47:16 +02:00 |
|
kikito
|
e5f893c8d1
|
Adds i18n texts for flagging content
|
2015-08-20 18:45:56 +02:00 |
|
kikito
|
246145e4cb
|
adds abilities for regular users
|
2015-08-20 18:45:32 +02:00 |
|
Enrique García
|
73f5c4e21e
|
Merge pull request #208 from AyuntamientoMadrid/hide-users
Moderate users
|
2015-08-20 18:00:43 +02:00 |
|
Juanjo Bazán
|
896fe41db0
|
favors with_hidden
|
2015-08-20 17:52:59 +02:00 |
|
Juanjo Bazán
|
aff366827d
|
removes unused route
|
2015-08-20 16:14:22 +02:00 |
|
Juanjo Bazán
|
f0a6926710
|
adds restore user action for administrators
|
2015-08-20 16:06:23 +02:00 |
|
kikito
|
8944327405
|
adds InappropiateFlag model with relations and specs
|
2015-08-20 16:03:00 +02:00 |
|
kikito
|
1e6ed6940b
|
Merge branch 'master' into flag-as-inappropiate-171
|
2015-08-20 16:01:04 +02:00 |
|
kikito
|
1458037ee8
|
adds db migrations for flagging comments & debates as inappropiate
|
2015-08-20 15:35:47 +02:00 |
|
Juanjo Bazán
|
a269750c49
|
improves moderation users spec to include comments
|
2015-08-20 13:47:45 +02:00 |
|
Juanjo Bazán
|
8bb0a13f3f
|
removes unused :js from spec
|
2015-08-20 13:30:40 +02:00 |
|
Juanjo Bazán
|
37ef85ed91
|
adds spec for paranoid added bulk methods
|
2015-08-20 13:26:51 +02:00 |
|
Juanjo Bazán
|
b340d7741a
|
adds hiding users by moderators
|
2015-08-20 13:16:37 +02:00 |
|
Juanjo Bazán
|
259aa29de7
|
adds new abilities
|
2015-08-20 13:16:37 +02:00 |
|
Juanjo Bazán
|
bd16e9345a
|
adds paranoia to User
|
2015-08-20 13:16:37 +02:00 |
|
Juanjo Bazán
|
2b6ea3a40f
|
Merge pull request #207 from AyuntamientoMadrid/pagination
Pagination styles
|
2015-08-20 13:15:42 +02:00 |
|
Juanjo Bazán
|
d70ca040f3
|
ignores unused kaminari i18n keys
|
2015-08-20 13:10:21 +02:00 |
|
Alberto Garcia Cabeza
|
0d54cca910
|
Changes test for pagination
|
2015-08-20 12:55:31 +02:00 |
|
rgarcia
|
839314868c
|
adding staging.rb
|
2015-08-20 12:50:36 +02:00 |
|
Alberto Garcia Cabeza
|
51d08d9798
|
Adds styles for pagination
|
2015-08-20 12:35:00 +02:00 |
|
Juanjo Bazán
|
9e15652d58
|
adds kaminari views
|
2015-08-20 11:35:46 +02:00 |
|
Enrique García
|
5b529c7963
|
Merge pull request #206 from AyuntamientoMadrid/code-of-conduct
Code of conduct
|
2015-08-20 11:19:29 +02:00 |
|
Enrique García
|
307fb05e09
|
Merge pull request #201 from AyuntamientoMadrid/pagination
Adds Pagination
|
2015-08-20 00:54:06 +02:00 |
|
kikito
|
5c3f664da4
|
Fixes links in Admin::Organizations to handle filters + pages
|
2015-08-20 00:50:50 +02:00 |
|
Juanjo Bazán
|
541a7479ab
|
Merge pull request #203 from AyuntamientoMadrid/select-language-switcher-155
Select language switcher
|
2015-08-19 22:56:09 +02:00 |
|
Juanjo Bazán
|
b2f29215ee
|
unifies localization specs
|
2015-08-19 22:51:58 +02:00 |
|
kikito
|
710e83fb22
|
Adds locale switcher js code + feature tests
|
2015-08-19 21:40:17 +02:00 |
|