rgarcia
|
8f4eec2b8e
|
zips all users with newsletter activated
|
2017-05-23 16:46:05 +02:00 |
|
rgarcia
|
2a7ff2270e
|
sends zip file with test data
|
2017-05-23 16:45:34 +02:00 |
|
decabeza
|
5e0d5fc8c3
|
Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation
|
2017-05-22 18:43:49 +02:00 |
|
Juanjo Bazán
|
bf8651febc
|
Merge pull request #1555 from consul/budgets-results
Budget Results
|
2017-05-22 17:11:22 +02:00 |
|
rgarcia
|
ed5a1cecbb
|
adds budget results
|
2017-05-19 14:04:46 +02:00 |
|
Juanjo Bazán
|
e922a11aa3
|
permits fields in management investment creation
|
2017-05-19 11:32:14 +02:00 |
|
Juanjo Bazán
|
86c37d4952
|
removes old commented code
|
2017-05-16 13:12:55 +02:00 |
|
Juanjo Bazán
|
3eb22ab7b9
|
removes exception on invalid vote
responds rendering correct error message instead
|
2017-05-16 13:12:32 +02:00 |
|
rgarcia
|
10282d67ab
|
fixes typo
|
2017-05-15 11:53:01 +02:00 |
|
Alberto Miedes Garcés
|
5d9054d284
|
Merge branch 'master' into api-dev-PRs
Conflicts:
Gemfile.lock
config/routes.rb
db/dev_seeds.rb
db/schema.rb
|
2017-05-11 21:59:42 +02:00 |
|
Raimond Garcia
|
aad725faf6
|
Merge pull request #1523 from consul/budgets-polish
Budgets polish
|
2017-05-06 05:08:27 +02:00 |
|
rgarcia
|
c0488c3b3c
|
refactors investment filters
|
2017-05-06 04:57:06 +02:00 |
|
rgarcia
|
8e7ca16c47
|
makes ballot's back link point to referer
|
2017-05-05 20:07:24 +02:00 |
|
rgarcia
|
87dd15b7bf
|
includes search concern in commendable actions
|
2017-05-04 20:42:21 +02:00 |
|
rgarcia
|
37d8693049
|
extracts advanced search to controller concern
|
2017-05-04 04:23:53 +02:00 |
|
Alberto Garcia Cabeza
|
60d08ab565
|
improves query on admin stats controller
|
2017-04-26 13:12:55 +02:00 |
|
Alberto Garcia Cabeza
|
45af9ce5aa
|
adds budget investments numbers and chart on admin stats
|
2017-04-25 16:46:20 +02:00 |
|
Raimond Garcia
|
0c7332c4b7
|
Merge pull request #1471 from consul/activity-valuation
Log valuators activity
|
2017-04-12 10:36:41 +02:00 |
|
Amaia Castro
|
9e5324cc1b
|
Merge branch 'master' into site-customization
|
2017-04-07 17:29:33 +02:00 |
|
Amaia Castro
|
b0b39d9f8a
|
Remove sandbox
Revert "Implement Sandbox"
This reverts commit e806a39820c2920d18b80dc560d05db36ecb6ede.
|
2017-04-06 17:00:05 +02:00 |
|
Amaia Castro
|
c1de2dced4
|
Custom content blocks for top_links and footer
|
2017-04-06 17:00:05 +02:00 |
|
Amaia Castro
|
8143fe1037
|
Site customization: images uploads
|
2017-04-06 17:00:04 +02:00 |
|
Amaia Castro
|
54fab919e5
|
Show custom pages in public site
|
2017-04-06 16:59:58 +02:00 |
|
Amaia Castro
|
255b57cc85
|
Admin for custom pages
|
2017-04-06 16:25:07 +02:00 |
|
Martín González
|
b35683f75e
|
Implement Sandbox
|
2017-04-06 15:04:23 +02:00 |
|
Alberto
|
6bbcc71ecb
|
Merge branch 'master' into polls
|
2017-04-06 14:16:49 +02:00 |
|
Amaia Castro
|
6e71774504
|
Merge branch 'master' into legislation-module-stable
|
2017-03-29 14:28:22 +02:00 |
|
Juanjo Bazán
|
c86cdb5d9b
|
logs valuators activity
|
2017-03-27 13:56:55 +02:00 |
|
Juanjo Bazán
|
652aff4e19
|
adds validation for custom dates in advanced search
avoids error 500 on invalid dates
|
2017-03-27 12:18:45 +02:00 |
|
Amaia Castro
|
5caa31dba1
|
Merge branch 'master' into legislation-module-stable
|
2017-03-25 13:34:49 +01:00 |
|
Alberto Garcia Cabeza
|
dadfdba1b1
|
adds date of birth form when manager creates new user
|
2017-03-20 11:59:22 +01:00 |
|
Amaia Castro
|
483d7c6e2b
|
Merge branch 'master' into legislation-module-stable
|
2017-03-17 18:08:22 +01:00 |
|
rgarcia
|
170cb89a5c
|
allows admins to see budgets in reviewing and selecting phase
|
2017-03-15 14:50:50 +01:00 |
|
Amaia Castro
|
13ff9816ae
|
Merge pull request #124 from medialab-prado/122-color-intensity
Annotations color intensity according to (comments) weight
|
2017-03-09 16:27:14 +01:00 |
|
Amaia Castro
|
1cedf73a39
|
Merge pull request #123 from medialab-prado/120-hidden-comments
Several comments boxes
|
2017-03-09 16:26:33 +01:00 |
|
Amaia Castro
|
d95f902fdf
|
Merge branch 'master' into legislation-module-stable
|
2017-03-07 23:19:26 +01:00 |
|
kikito
|
3dbdc8f455
|
Adds delete link to budget investment list in user activities
|
2017-03-06 19:24:10 +01:00 |
|
Amaia Castro
|
854d51dd8e
|
Calculate annotations weight and add weight css classes for color intensity
|
2017-03-02 14:25:23 +01:00 |
|
Amaia Castro
|
c7eaadb4b2
|
Show comment boxes for all annotations at the clicked point
|
2017-02-24 15:45:36 +01:00 |
|
Amaia Castro
|
20bfe5e0e5
|
Fix annotation highlight on click
|
2017-02-23 16:04:55 +01:00 |
|
Juanjo Bazán
|
4a195e07c4
|
improves notice/alert messages on poll recounting
|
2017-02-18 13:23:29 +01:00 |
|
Juanjo Bazán
|
58b1ad950a
|
fix bug storing null results as white results
|
2017-02-18 12:11:49 +01:00 |
|
Juanjo Bazán
|
1b2061f95b
|
fixes date/datetime comparison
|
2017-02-17 15:27:04 +01:00 |
|
Juanjo Bazán
|
0a2c6c0921
|
reorders booth_assignments query
|
2017-02-15 10:46:38 +01:00 |
|
Juanjo Bazán
|
d68be1f6f0
|
adds automatic recount to admin poll and paginates recounts
|
2017-02-14 19:44:19 +01:00 |
|
Juanjo Bazán
|
2b68f02b95
|
paginates booths
|
2017-02-14 19:09:31 +01:00 |
|
Juanjo Bazán
|
8129131a3c
|
adds pagination to officer assignments
|
2017-02-14 19:09:19 +01:00 |
|
Juanjo Bazán
|
4beee7bacc
|
improves naming consistency
|
2017-02-14 16:05:28 +01:00 |
|
Juanjo Bazán
|
c359b93fd0
|
fixes booth search in admin
|
2017-02-14 16:01:09 +01:00 |
|
Juanjo Bazán
|
0bd87c7e43
|
extracts results from admin's poll/show
|
2017-02-14 14:26:46 +01:00 |
|