Commit Graph

6907 Commits

Author SHA1 Message Date
rgarcia
938ba40306 loads categories in sidebar for balloting phase 2017-01-15 12:06:38 +01:00
rgarcia
42604e27b9 Displays tag cloud in all phases 2017-01-15 09:55:01 +01:00
Raimond Garcia
3038e841e0 Merge pull request #1353 from consul/verified-admin
verifies admin in dev seeds
2017-01-14 21:57:51 +01:00
Alberto Garcia Cabeza
e18751ce5c verifies admin in dev seeds 2017-01-14 18:14:32 +01:00
Fernando Blat
819c9efcc3 Fix and complete feature specs 2017-01-14 17:19:27 +01:00
rgarcia
abd8cd2faf fixes translations 2017-01-14 17:13:59 +01:00
rgarcia
7aba8ef299 adds specs 2017-01-14 17:02:45 +01:00
rgarcia
79767b5f1d adds translations 2017-01-14 17:02:41 +01:00
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
Fernando Blat
f1be212eeb Fix and complete controller specs 2017-01-14 16:56:55 +01:00
Fernando Blat
046c021c0c Complete create comment details 2017-01-14 16:43:40 +01:00
Fernando Blat
f47cef5a93 Highlight text when creating a comment 2017-01-14 16:43:26 +01:00
Fernando Blat
d253c4c09f Restore custom position 2017-01-14 16:42:59 +01:00
Fernando Blat
755ddab2cb Amend translations 2017-01-14 16:42:59 +01:00
Fernando Blat
72ff1de2ab CSS fix 2017-01-14 16:42:59 +01:00
Fernando Blat
17a68f5c14 Load annotations on click event 2017-01-14 16:42:57 +01:00
Fernando Blat
4431d95d31 Basic annotation creation 2017-01-14 16:42:12 +01:00
Fernando Blat
4fe656bdd4 Merge pull request #61 from medialab-prado/50-draft-final-version
Drafts final version
2017-01-14 16:35:15 +01:00
rgarcia
11a8086599 adds specs 2017-01-14 16:12:45 +01:00
rgarcia
82322ee233 sends budget investment created email 2017-01-14 16:10:43 +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
Raimond Garcia
a67bf44f9e Merge pull request #1351 from consul/budget-vote-text
displays appropriate vote info depending on phase
2017-01-13 21:27:00 +01:00
rgarcia
6d71cd985c displays appropriate vote info depending on phase 2017-01-13 21:15:08 +01:00
Amaia Castro
49f4bf5bc5 Destroy object when their parent object is destroyed 2017-01-13 19:34:17 +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
Martín González
eadf933c22 Change debate questions class to avoid colliding with other CSS 2017-01-13 16:42:59 +01:00
rgarcia
17946b292b fixes specs 2017-01-13 16:37:39 +01:00
Martín González
db8084ddb8 Fix merge 2017-01-13 16:21:38 +01:00
Martín González
5a5fed975a Push changes 2017-01-13 16:19:57 +01:00
Martín González
02d49266e0 Increase margin on questions to fix a cosmetic issue 2017-01-13 16:14:44 +01:00
Martín González
3f956294ed Fix legislation question comments markup 2017-01-13 15:51:12 +01:00
Martín González
1cf074a297 Fix identation and markup issue on the legislation question page 2017-01-13 15:41:23 +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
Juanjo Bazán
238c01cecd Merge pull request #1345 from aspgems/bug_compile_ckeditor_locales
Fixes bug. Compiles all locales for ckeditor.
2017-01-13 11:49:58 +01:00
Juanma
e418937d42 Add custom setting for foundation variables. 2017-01-13 11:49:23 +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
119061bd4c Fixes bug. Compiles all locales for ckeditor. 2017-01-13 09:40:33 +01:00
Juanma
68b2f6d9c4 Fixes specs. 2017-01-13 07:44:57 +01:00
Alberto Miedes Garcés
d2a8d509b6 Cleaning 2017-01-13 01:21:59 +01:00
Alberto Miedes Garcés
f2eb8724d3 Remove duplicated scopes 2017-01-13 00:54:52 +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
Martín González
046bcbfb0f Fix small header toggle 2017-01-12 12:48:14 +01:00
Martín González
495c7e8099 Key dates SVG fix 2017-01-12 12:16:45 +01:00
Martín González
a0011b7c5c More css fixes 2017-01-12 11:55:12 +01:00