kikito
|
a4585b00f2
|
Merge branch 'polls' into polls-geozones
|
2017-01-24 18:26:23 +01:00 |
|
kikito
|
15b531f068
|
Fixes failing specs
|
2017-01-24 18:10:41 +01:00 |
|
Juanjo Bazán
|
467ca1ba68
|
Merge branch 'master' into polls
|
2017-01-24 12:08:59 +01:00 |
|
Fernando Blat
|
f7a6f8399b
|
Add pending translations
|
2017-01-23 14:58:12 +01:00 |
|
Amaia Castro
|
6e9750bcd8
|
Merge branch 'legislation-module-stable' into add-url-helpers-for-legislation-again
|
2017-01-21 21:52:44 +01:00 |
|
Amaia Castro
|
7a55ac1561
|
Merge branch 'master' into legislation-module-stable
|
2017-01-21 21:52:17 +01:00 |
|
Amaia Castro
|
7692fb9cb0
|
Try to avoid poltergeist error on hover
|
2017-01-20 19:56:33 +01:00 |
|
Amaia Castro
|
289b8e044b
|
Fix url to notifiable when it is a Legislation Question or Annotation
|
2017-01-20 18:46:57 +01:00 |
|
Fernando Blat
|
7613091d2e
|
Merge pull request #88 from medialab-prado/publish-comment-from-comments-box
Publish comment from comments box
|
2017-01-20 18:45:38 +01:00 |
|
Amaia Castro
|
78219b5c31
|
Merge branch 'master' into legislation-module-stable
|
2017-01-20 11:50:15 +01:00 |
|
Amaia Castro
|
47b35a8149
|
Add spec for publishing a comment from the comments box for a draft
|
2017-01-20 11:42:14 +01:00 |
|
Juanjo Bazán
|
bd6514d4a4
|
Merge branch 'master' into polls
|
2017-01-20 11:34:12 +01:00 |
|
Juanjo Bazán
|
113f9b32d7
|
Merge branch 'master' into polls
|
2017-01-19 16:51:19 +01:00 |
|
Amaia Castro
|
551e8dc6c1
|
Increase Poltergeist timeout in specs
This is to try to avoid flaky js specs in Travis
|
2017-01-19 13:38:06 +01:00 |
|
Amaia Castro
|
35d2c54b4e
|
Merge branch 'master' into legislation-module-stable
|
2017-01-19 12:40:07 +01:00 |
|
rgarcia
|
c918c9e081
|
adds specs for many tags in a budget investment
|
2017-01-19 10:03:38 +01:00 |
|
Fernando Blat
|
5c3f87c4a2
|
Merge pull request #70 from medialab-prado/reorganize-locale-files
Change comments texts in legislation questions
|
2017-01-17 16:39:08 +01:00 |
|
Amaia Castro
|
6c36fde6cc
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 15:45:33 +01:00 |
|
Amaia Castro
|
53e9837db3
|
Change texts for legislation questions comments
|
2017-01-17 15:42:42 +01:00 |
|
Juanjo Bazán
|
555cc4529b
|
removes focus
|
2017-01-17 13:33:45 +01:00 |
|
Amaia Castro
|
00b488fe84
|
Merge branch 'master' into legislation-module-stable
|
2017-01-17 10:46:33 +01:00 |
|
rgarcia
|
dc2bfbdc97
|
fixes specs
|
2017-01-16 19:49:04 +01:00 |
|
Alberto Miedes Garcés
|
18fb1485eb
|
No need to specify the resolve type for GraphQL::Schema
This was needed back in the 0.18.11 version but not anymore after the
update to 1.3.0
|
2017-01-16 11:28:28 +01:00 |
|
Alberto Miedes Garcés
|
cb0a477d88
|
Fix weird bug caused by pending specs
|
2017-01-16 11:23:48 +01:00 |
|
rgarcia
|
5f7269a070
|
displays unfeasible budgets link from home
|
2017-01-16 03:09:08 +01:00 |
|
rgarcia
|
fa9cb00c65
|
displays appropriate permission messages in accepting phase
|
2017-01-15 20:37:44 +01:00 |
|
Raimond Garcia
|
69c043a886
|
Merge pull request #1356 from consul/budget-emails
Budget emails
|
2017-01-15 19:15:39 +01:00 |
|
rgarcia
|
0f1a98da7d
|
fixes conflicts with master
|
2017-01-15 19:04:12 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
Alberto Garcia Cabeza
|
9741ee859a
|
updates i18n and specs
|
2017-01-15 14:02:08 +01:00 |
|
rgarcia
|
42604e27b9
|
Displays tag cloud in all phases
|
2017-01-15 09:55:01 +01:00 |
|
Fernando Blat
|
819c9efcc3
|
Fix and complete feature specs
|
2017-01-14 17:19:27 +01:00 |
|
rgarcia
|
7aba8ef299
|
adds specs
|
2017-01-14 17:02:45 +01:00 |
|
Fernando Blat
|
f1be212eeb
|
Fix and complete controller specs
|
2017-01-14 16:56:55 +01:00 |
|
rgarcia
|
11a8086599
|
adds specs
|
2017-01-14 16:12:45 +01:00 |
|
Raimond Garcia
|
7f88100599
|
Merge pull request #1352 from consul/feasibility_link
Feasibility index
|
2017-01-14 12:36:26 +01:00 |
|
Juanjo Bazán
|
36140e0ce3
|
adds link to unfeasible investments to index page
|
2017-01-14 11:33:49 +01:00 |
|
rgarcia
|
6d71cd985c
|
displays appropriate vote info depending on phase
|
2017-01-13 21:15:08 +01:00 |
|
Amaia Castro
|
49e66a431c
|
Check phase dates and that draft version is not final before creating annotations
|
2017-01-13 19:11:05 +01:00 |
|
Raimond Garcia
|
4c818bfcc4
|
Merge pull request #1349 from consul/budgets-vote-permissions
User permissions for selecting phase
|
2017-01-13 18:34:31 +01:00 |
|
rgarcia
|
17946b292b
|
fixes specs
|
2017-01-13 16:37:39 +01:00 |
|
rgarcia
|
b2b9954e6d
|
allows user to support only in one heading per group
|
2017-01-13 15:24:57 +01:00 |
|
Juanjo Bazán
|
d17a07b096
|
Merge pull request #1347 from consul/budgets-vote-button
only displays vote button in selecting phase
|
2017-01-13 11:58:28 +01:00 |
|
rgarcia
|
dbf8b86518
|
fixes specs
|
2017-01-13 11:37:06 +01:00 |
|
rgarcia
|
470fe41585
|
only displays vote button in selecting phase
|
2017-01-13 11:13:01 +01:00 |
|
Juanjo Bazán
|
a771408f4b
|
Merge pull request #1336 from aspgems/bug_filter_advance_search
Fixes values of official_level options for selects in search filters.
|
2017-01-13 11:00:00 +01:00 |
|
Juanma
|
68b2f6d9c4
|
Fixes specs.
|
2017-01-13 07:44:57 +01:00 |
|
Alberto Miedes Garcés
|
7a9373942a
|
Testing GraphQL 1.3.0 in Travis
|
2017-01-12 20:11:47 +01:00 |
|
Alberto Miedes Garcés
|
d1f14ffb93
|
Simplify the way GraphQL 'resolve' is used
|
2017-01-12 19:51:58 +01:00 |
|
Amaia Castro
|
a56898fed7
|
Fix version chooser for annotations page
|
2017-01-11 23:11:11 +01:00 |
|