Commit Graph

874 Commits

Author SHA1 Message Date
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
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +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
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
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
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
Amaia Castro
98b6dd75ea Fix stack level too deep bug when deleting questions with answers 2017-01-02 20:45:20 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Amaia Castro
f505d6fec7 Check if debate phase is open to create answers 2016-12-28 22:02:08 +01:00
Amaia Castro
28689a5a7d Merge branch 'legislation-module-stable' into 27-answer-questions 2016-12-28 17:54:21 +01:00
Amaia Castro
525ad3ebd1 Merge branch 'master' into legislation-module-stable 2016-12-28 17:51:15 +01:00
Amaia Castro
2693393eb0 Answer question through ajax 2016-12-28 16:21:58 +01:00
rgarcia
d554ec810a adds document counter to signature sheet 2016-12-28 11:40:20 +01:00
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
rgarcia
af7d71ccfd Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets 2016-12-26 11:14:56 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
rgarcia
ddeca6f06d fixes specs 2016-12-23 19:05:25 +01:00
Amaia Castro
de5df61359 Legislation question comments spec 2016-12-23 15:40:52 +01:00
Amaia Castro
368430d914 Legislation Question page 2016-12-22 16:00:28 +01:00
Amaia Castro
959b36caa8 Add more specs for process page (phases) 2016-12-22 13:21:44 +01:00
Amaia Castro
36399277ec Legislation Process page 2016-12-22 11:23:49 +01:00
rgarcia
0deba76db1 adds specs 2016-12-21 18:46:38 +01:00
Fernando Blat
e872f2d626 Merge pull request #33 from medialab-prado/25-legislation-questions
Legislation Questions model and basic admin
2016-12-21 08:50:28 +01:00
Amaia Castro
92a13b0f77 Merge branch 'master' into legislation-module-stable 2016-12-20 20:03:04 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00
rgarcia
76723070e2 adds pending specs 2016-12-20 12:21:45 +01:00
Alberto Garcia Cabeza
3f394d099d fixes specs 2016-12-20 11:41:24 +01:00
Amaia Castro
a4055a1578 Legislation processes home page 2016-12-16 17:59:44 +01:00
Amaia Castro
e4315f94c8 Merge branch 'master' into legislation-module-stable 2016-12-15 11:26:22 +01:00
Raimond Garcia
392f00cdbd Merge pull request #1282 from amiedes/crud-geozones-PRs
[Finished] Allow admins to manage geozones
2016-12-14 19:25:17 +01:00
Fernando Blat
13a23d8383 Merge pull request #12 from PopulateTools/store-processed-html-from-markdown
Store DraftVersion processed html
2016-12-14 12:07:15 +01:00
Amaia Castro
8c9cfa8b3f Merge branch 'master' into legislation-module-stable 2016-12-14 11:48:28 +01:00
Amaia Castro
400b510b71 Store the processed html from the markdown text body field 2016-12-14 11:32:28 +01:00
Alberto Miedes Garcés
db029964fa Check geozone 'safe_to_delete' behavior as unit test instead of integration test 2016-12-13 18:38:13 +01:00
Alberto Miedes Garcés
419905fb59 Set expectations for flash inside admin geozones spec 2016-12-13 13:25:38 +01:00
Alberto Miedes Garcés
2a3dfdd595 Refactor admin geozones specs 2016-12-13 12:33:58 +01:00
rgarcia
6b0f8eb62b do not allow verification of deregistered accounts 2016-12-12 19:11:00 +01:00
Alberto Miedes Garcés
0e1cea48c4 Fixed admin edit geozone spec 2016-12-08 13:17:05 +01:00
Alberto Miedes Garcés
93e79228a7 Ability to delete geozones from admin dashboard 2016-12-08 13:16:42 +01:00
Alberto Miedes Garcés
fea2009396 Ability to edit geozones from admin dashboard 2016-12-07 22:08:22 +01:00
Alberto Garcia Cabeza
7ef9bafbf9 fixes specs of remove link on debates and proposals description 2016-12-07 18:42:56 +01:00
Amaia Castro
e4fe499e66 DraftVersion base model and very basic admin pages 2016-12-06 12:10:20 +01:00