Commit Graph

4207 Commits

Author SHA1 Message Date
Amaia Castro
f3daf2aca2 Show comments box when scrolling to annotation 2017-01-10 18:24:55 +01:00
Amaia Castro
329b288c01 Try to fix poltergeist error in spec 2017-01-10 17:56:35 +01:00
Amaia Castro
4f539b374f View comments for draft text 2017-01-10 17:25:02 +01:00
Amaia Castro
7d8c3bd39c Merge pull request #55 from medialab-prado/22-draft-version-comments-page
Legislation annotations/comments page
2017-01-10 13:13:09 +01:00
Amaia Castro
f43f13e826 Create first comment automatically from the annotation 2017-01-09 17:03:00 +01:00
Amaia Castro
b8f034d896 Legislation annotations/comments page 2017-01-09 09:29:15 +01:00
Amaia Castro
068c2c9f3d Merge branch 'master' into legislation-module-stable 2017-01-09 09:27:38 +01:00
Juanjo Bazán
ef7988649d Merge pull request #1330 from amiedes/master
Fix typo
2017-01-07 17:12:43 +01:00
Alberto Miedes Garcés
4e019c79d6 Fix typo 2017-01-07 16:55:24 +01:00
Fernando Blat
c50e8cbbdf Merge pull request #54 from medialab-prado/fix-small-issues
Fix small issues
2017-01-05 17:34:40 +01:00
Fernando Blat
a5421597a4 Safe call to flash text 2017-01-05 17:12:42 +01:00
Fernando Blat
1fbb10ff34 Include link to resource in the flash message 2017-01-05 17:03:08 +01:00
Fernando Blat
13c49c1f75 Format text with markdown 2017-01-05 16:49:18 +01:00
Fernando Blat
dc3a917877 Add missing translation 2017-01-05 16:46:53 +01:00
Fernando Blat
8682e426ac Show warning if phase is not open 2017-01-05 13:08:06 +01:00
Juanjo Bazán
0de74a05a8 Merge pull request #1327 from consul/dependencies
updates minor dependencies
2017-01-05 13:04:26 +01:00
Fernando Blat
ed714f7c7d Add flash messages. Redirect to edit action after update 2017-01-05 12:56:55 +01:00
Fernando Blat
6c8060af38 Check the field is present before validating it 2017-01-05 12:45:27 +01:00
Fernando Blat
0c83b87b7b Ignore dynamic i18n keys 2017-01-05 12:36:28 +01:00
Fernando Blat
de13574617 Show link to the first question 2017-01-05 12:31:20 +01:00
Fernando Blat
450fcc3e04 Use SQL to sum the comments 2017-01-05 11:14:12 +01:00
Fernando Blat
ba0089ac44 Truncate social networks text 2017-01-05 11:05:45 +01:00
Fernando Blat
7100156b28 Show full header when click on expand button 2017-01-05 10:55:53 +01:00
Fernando Blat
48764d757c Fix label markup 2017-01-05 10:29:21 +01:00
Fernando Blat
814cf9df56 Show creation date and status in admin list 2017-01-05 10:22:40 +01:00
Amaia Castro
2f173d2877 Merge branch 'master' into legislation-module-stable 2017-01-05 10:19:39 +01:00
Fernando Blat
fba4c79d2a Show the first paragraph of the description 2017-01-05 09:43:40 +01:00
Fernando Blat
0c5063add9 Show message when there aren't processes 2017-01-05 09:36:08 +01:00
Fernando Blat
71ed50928f Merge pull request #53 from medialab-prado/46-validate-legislation-process-dates
Validate date ranges for legislation process
2017-01-05 09:25:10 +01:00
Fernando Blat
ab445b6bff Merge pull request #52 from medialab-prado/refactor-process-phase-pages
Refactor process phases pages
2017-01-05 09:24:11 +01:00
rgarcia
6688832f8c updates dependencies 2017-01-05 01:02:07 +01:00
Amaia Castro
bc1905e5d9 Validate date ranges for legislation process
Only validates start and end dates for the whole process or a phase, not overlap between phases, as they are permitted, at least for now.
2017-01-04 18:13:28 +01:00
Juanjo Bazán
6e5492de22 Merge pull request #1323 from ferblape/1322-fix-initializer
Don't fetch setting in dev mode
2017-01-04 14:50:01 +01:00
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +01:00
Fernando Blat
b6b33ff85b Merge pull request #51 from medialab-prado/14-base-legislation-annotations
Base Legislation Annotations
2017-01-04 13:50:37 +01:00
Fernando Blat
ad20302052 Merge pull request #48 from medialab-prado/13-draft-version-page
Draft Version page
2017-01-04 13:43:54 +01:00
Fernando Blat
8350143496 Don't fetch setting if table doesn't exist 2017-01-04 13:37:55 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
Amaia Castro
39633dce67 Fix back links in admin 2017-01-04 12:39:09 +01:00
Amaia Castro
375602d297 Display title with an * when status is draft in version chooser 2017-01-04 12:15:12 +01:00
Amaia Castro
c935373c07 Remove draft version preview buttons from edit form and add link to index 2017-01-04 10:14:58 +01:00
Amaia Castro
6d99a24740 Fix draft versions list 2017-01-04 10:13:55 +01:00
Amaia Castro
f040759693 Show only published draft versions to users (and also drafts to admins) 2017-01-03 22:08:54 +01:00
Amaia Castro
3ba6b409aa Make markdown helper safer to use
Avoid exception if text is nil
2017-01-03 21:41:00 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
Amaia Castro
d2b3a21182 Fix abilities and add specs 2017-01-03 17:48:21 +01:00
Enrique García
465a93f49c Merge pull request #1318 from ferblape/1315-manage-offices_url-as-setting
Manage offices url as a setting
2017-01-03 13:27:52 +01:00
Amaia Castro
99e3afd6ca Merge branch 'legislation-module-stable' into 13-draft-version-page 2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91 Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Fernando Blat
dcfb39d38d Merge pull request #44 from medialab-prado/42-integrate-admin-html-css
Integrate admin html and css from sandbox
2017-01-03 09:03:06 +01:00