Jose Manuel
982dc180cc
Adds moderators config to admin console
2015-08-24 01:50:01 +01:00
Raimond Garcia
86ebe64dba
Merge pull request #229 from AyuntamientoMadrid/flag-as-inappropiate-171
...
Flag as inappropiate
2015-08-23 22:06:28 +02:00
kikito
c88f7c1f30
merges master and fixes conflicts
2015-08-23 20:27:11 +02:00
kikito
720630e0ab
Fixes failing spec which expected a menu id
2015-08-23 18:32:00 +02:00
Raimond Garcia
8f2cec60bf
Merge pull request #223 from AyuntamientoMadrid/improve_admin
...
Improve admin
2015-08-23 12:11:14 +02:00
Alberto Garcia Cabeza
908d19e2e7
Improves styles for admin
2015-08-23 11:45:43 +02:00
kikito
5db63228ad
Adds moderation sidebar
2015-08-23 00:02:40 +02:00
kikito
5eeaa7d189
implements /moderation/debates
2015-08-22 23:20:55 +02:00
kikito
47842cb1cc
Refactors spec/features/moderation/comments_spec
2015-08-22 20:56:05 +02:00
kikito
169809496e
Adds filters & refactors to comment moderation
2015-08-22 20:28:48 +02:00
kikito
8bc92811b6
Adds traits to debate & comment factories
2015-08-22 20:20:47 +02:00
kikito
9785749057
Refactors organization factories & admin controller
2015-08-22 19:46:28 +02:00
Alberto Garcia Cabeza
30d685ec32
Adds styles for organizations
2015-08-22 18:06:27 +02:00
Alberto Garcia Cabeza
6b4b0553b9
Adds new icons for admin menu
2015-08-22 18:06:03 +02:00
Alberto Garcia Cabeza
9d992da2be
Adds new icon for rejected items
2015-08-22 18:05:32 +02:00
Alberto Garcia Cabeza
570169af57
Changes icons classes names
2015-08-22 14:46:26 +02:00
Alberto Garcia Cabeza
d1a3ea6fd4
Updates custom icons font
2015-08-22 14:45:43 +02:00
Juanjo Bazán
752c8f6651
updates Gemfile
2015-08-22 12:50:11 +02:00
Raimond Garcia
c473c30792
Merge pull request #222 from AyuntamientoMadrid/mails
...
Improves emails
2015-08-22 11:48:08 +02:00
kikito
4f0c49f921
Changes moderation/comments to allow for different commentable_types
2015-08-22 09:15:20 +02:00
Juanjo Bazán
c08d2cdf08
improves emails
...
Adds texts and i18n, ready to add design now.
Advances #221
2015-08-21 23:01:51 +02:00
kikito
00b51bbc23
Adds first version of comment moderation
...
Missing:
* Ensure removing a flag updates the flagged_at attribute correctly
* Showing the debate when the comment is not a “root”
* Filter (pending / reviewed / all)
* Order
* Same for debates
2015-08-21 22:01:47 +02:00
kikito
b7718a2e5d
Adds i18n for comment moderation view
2015-08-21 21:59:11 +02:00
kikito
2c49d30952
Adds review-related methods to comment & debate
2015-08-21 21:58:48 +02:00
kikito
b4bd70436a
Adds routes for new methods in comment & debate moderation
2015-08-21 21:57:00 +02:00
kikito
5e32fd2fa4
Adds new abilities for moderators
...
extends hiding (i.e. you can not hide your own content or yourself) and
adds marking as reviewed
2015-08-21 20:39:40 +02:00
kikito
0fe7740a41
Refactors ability making flagging more efficient
2015-08-21 20:36:04 +02:00
kikito
007ca4afe0
Adds reviewed_at to comments and debates tables
2015-08-21 20:34:56 +02:00
Raimond Garcia
a9a8359bc7
Merge pull request #216 from AyuntamientoMadrid/design_improvements
...
Design improvements
2015-08-21 20:17:34 +02:00
rgarcia
0e6afa941d
removes ssl from staging and production envs
2015-08-21 19:27:50 +02:00
rgarcia
3126200c15
removes tests and revision check before deploy
2015-08-21 19:27:10 +02:00
rgarcia
24d3342af2
uses server_name from secrets
2015-08-21 19:18:30 +02:00
kikito
5328355c3e
Add tests for visible admin links and fix bug
2015-08-21 19:09:26 +02:00
Alberto Garcia Cabeza
fbc1817f81
Modifies test for not logged users
2015-08-21 19:03:43 +02:00
Raimond Garcia
db45451d9b
Merge pull request #215 from AyuntamientoMadrid/deploy
...
Deploy
2015-08-21 19:03:01 +02:00
rgarcia
a7dc306a40
Merge branch 'master' into deploy
2015-08-21 19:00:22 +02:00
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
