Enrique García
|
1c9cfb5a48
|
Merge pull request #333 from AyuntamientoMadrid/favicon
adds favicon to other layouts
|
2015-09-03 10:18:19 +02:00 |
|
Juanjo Bazán
|
27ed66ea71
|
Merge pull request #336 from AyuntamientoMadrid/cleanup
Cleanup
|
2015-09-03 09:35:04 +02:00 |
|
rgarcia
|
10127f546e
|
upgrade before_filter to new syntax
|
2015-09-03 01:40:24 +02:00 |
|
rgarcia
|
4897d5df4e
|
makes spaces consistent
|
2015-09-03 01:29:46 +02:00 |
|
rgarcia
|
29ae0c68f8
|
removes unnecessary comments
|
2015-09-03 01:29:13 +02:00 |
|
rgarcia
|
ae0ad77197
|
reorders before_actions
|
2015-09-03 01:28:46 +02:00 |
|
Raimond Garcia
|
276df52c69
|
Merge pull request #335 from AyuntamientoMadrid/improve_texts
Improve texts
|
2015-09-03 00:27:36 +02:00 |
|
Alberto Garcia Cabeza
|
3f53f61b1d
|
Fixes conflicts
|
2015-09-03 00:12:59 +02:00 |
|
Alberto Garcia Cabeza
|
fca3a4de37
|
Changes tests for new texts
|
2015-09-03 00:10:07 +02:00 |
|
Alberto Garcia Cabeza
|
3172223930
|
Updates header and footer
|
2015-09-02 23:43:32 +02:00 |
|
Alberto Garcia Cabeza
|
7fefcb692e
|
Changes and updates texts
|
2015-09-02 23:43:08 +02:00 |
|
Alberto Garcia Cabeza
|
a8cbc60b02
|
Adds new pages, includes new texts
|
2015-09-02 23:42:06 +02:00 |
|
rgarcia
|
137ca75055
|
adds favicon to other layouts
|
2015-09-02 22:34:16 +02:00 |
|
rgarcia
|
b8e35ac95f
|
cleans up
|
2015-09-02 22:06:50 +02:00 |
|
rgarcia
|
4cb7a698fe
|
fixes spec
|
2015-09-02 22:01:07 +02:00 |
|
rgarcia
|
4d97063887
|
removes unused spec
|
2015-09-02 21:59:51 +02:00 |
|
rgarcia
|
99d779bcec
|
adds letter code verification
|
2015-09-02 21:57:03 +02:00 |
|
rgarcia
|
280028cfa4
|
adds missing translation for incorrect phone
|
2015-09-02 21:45:53 +02:00 |
|
Juanjo Bazán
|
73f0b4b74e
|
adds migration to remove AaCwT columns
it migrates existing comments to ancestry
|
2015-09-02 19:24:57 +02:00 |
|
Juanjo Bazán
|
dee2d0196b
|
ancestries
moves to ancestry from acts_as_commentable_with_threading
|
2015-09-02 19:23:09 +02:00 |
|
Juanjo Bazán
|
3eae5dff1f
|
adds ancestry
|
2015-09-02 19:21:15 +02:00 |
|
Raimond Garcia
|
faf1b32cf5
|
Merge pull request #329 from AyuntamientoMadrid/verification
Verification
|
2015-09-02 18:58:25 +02:00 |
|
kikito
|
e3cbae4f02
|
Makes capybara exact. Should fix some randomly-failing specs
|
2015-09-02 18:05:43 +02:00 |
|
Raimond Garcia
|
36d8bd778b
|
Merge pull request #325 from AyuntamientoMadrid/admin-in-seed
creates admin user in db/seeds
|
2015-09-02 17:36:29 +02:00 |
|
kikito
|
47b66f3f37
|
creates admin user in db/seeds
|
2015-09-02 17:25:12 +02:00 |
|
Juanjo Bazán
|
e0c67d8404
|
adds ancestry column to comments
|
2015-09-02 17:24:24 +02:00 |
|
Juanjo Bazán
|
eb689d7c7e
|
refactors comment form
|
2015-09-02 17:22:21 +02:00 |
|
Juanjo Bazán
|
df5ef2dc29
|
makes helper independent of commentable class
|
2015-09-02 17:06:11 +02:00 |
|
kikito
|
c7b44485b3
|
modifies example so that the dev database can be used to generate the assets of staging, preproduction and production
|
2015-09-02 16:52:29 +02:00 |
|
Juanjo Bazán
|
04127b23f9
|
Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
|
2015-09-02 14:24:06 +02:00 |
|
kikito
|
c3b1fa7434
|
fixes failing i18n specs
|
2015-09-02 14:15:14 +02:00 |
|
Raimond Garcia
|
dac1a9726b
|
Merge pull request #322 from AyuntamientoMadrid/one-hundred-free-votes
changes rules for allowing debate votes
|
2015-09-02 13:46:44 +02:00 |
|
Juanjo Bazán
|
274ddb2589
|
changes rules for allowing debate votes
first 100 votes are allowed for unverified users
|
2015-09-02 13:40:38 +02:00 |
|
kikito
|
79febe7bb8
|
Adds shared/filter_subnav partial to DRY filters
|
2015-09-02 13:39:27 +02:00 |
|
kikito
|
ebacc8c9c7
|
Uses has_filters in all controllers with filters & renames @filter to @current_filter
|
2015-09-02 13:21:46 +02:00 |
|
kikito
|
83d08b0017
|
Implements the HasFilters controller concern
|
2015-09-02 13:21:05 +02:00 |
|
Juanjo Bazán
|
31a8c15344
|
removes redundant condition
|
2015-09-02 12:57:09 +02:00 |
|
Alberto Garcia Cabeza
|
c06491db57
|
Changes test for verification process
|
2015-09-02 12:51:32 +02:00 |
|
Enrique García
|
7d3cb8b493
|
Merge pull request #321 from AyuntamientoMadrid/votes-organizations
Disallow votes from organizations
|
2015-09-02 12:50:12 +02:00 |
|
Juanjo Bazán
|
0c7ce4b6cf
|
includes organizations in the cache key helper
|
2015-09-02 12:39:31 +02:00 |
|
Alberto Garcia Cabeza
|
da86c5d6e0
|
Adds styles for verification account process
|
2015-09-02 12:34:08 +02:00 |
|
Juanjo Bazán
|
5c10435064
|
disables voting on comments for not allowed users
|
2015-09-02 12:23:56 +02:00 |
|
Juanjo Bazán
|
8915ce7ffd
|
adds interface to disallow organizations votes
on debates
|
2015-09-02 12:16:55 +02:00 |
|
Juanjo Bazán
|
361ccb8624
|
adds setting to dev_seeds
|
2015-09-02 11:58:29 +02:00 |
|
Juanjo Bazán
|
58d2af7340
|
Merge branch 'master' of github.com:AyuntamientoMadrid/participacion
|
2015-09-02 11:39:32 +02:00 |
|
Juanjo Bazán
|
ef200c4ea1
|
update dependencies
|
2015-09-02 11:39:12 +02:00 |
|
rgarcia
|
abfc93ea78
|
hot fix to take into account preproduction
|
2015-09-02 11:36:30 +02:00 |
|
kikito
|
15115f0179
|
Merge branch 'dev-seed'
|
2015-09-02 10:49:00 +02:00 |
|
kikito
|
09764ac783
|
adds tags to debates in dev_seed
|
2015-09-02 10:48:43 +02:00 |
|
Juanjo Bazán
|
940f5c42a0
|
typo
|
2015-09-02 10:42:54 +02:00 |
|