Alberto Garcia Cabeza
a95edee7c7
improves styles for reply and deleted comments
2016-12-27 16:29:32 +01:00
Alberto Garcia Cabeza
170ef4e680
improves styles for users avatar
2016-12-27 16:17:43 +01:00
Alberto Garcia Cabeza
f0258fb3ee
improves html structure for comments
2016-12-27 14:26:20 +01:00
kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
Alberto Garcia Cabeza
ae7458024d
closes missing aside tag
2016-12-27 13:57:27 +01:00
Alberto Garcia Cabeza
bb64dab5b9
adds type date on advanced search date min and date max
2016-12-27 13:51:19 +01:00
Alberto Garcia Cabeza
736099fa51
adds id to advanced search href link and form
2016-12-27 13:37:24 +01:00
Juanjo Bazán
283a474135
adds order to search results
2016-12-27 12:38:46 +01:00
Juanjo Bazán
ee8c057a46
adds officer search to admin polls
2016-12-27 12:36:16 +01:00
Amaia Castro
e03522e267
Merge branch 'legislation-module-stable' into sandbox-html
2016-12-27 12:36:10 +01:00
Amaia Castro
eed8f1dd83
Set admin layout for admin sandbox templates
2016-12-27 12:32:07 +01:00
Alberto Garcia Cabeza
0d5d082e68
fixes specs
2016-12-26 19:15:05 +01:00
Alberto Garcia Cabeza
7f9d1dfc09
Merge branch 'polls' into polls-design
2016-12-26 18:22:07 +01:00
Alberto Garcia Cabeza
219754e02e
maintains answers centered on questions show
2016-12-26 17:36:50 +01:00
Alberto Garcia Cabeza
daf800564a
changes highlighted color on dark heading
2016-12-26 17:32:50 +01:00
Alberto Garcia Cabeza
aac501bfda
improves styles for polls questions views
2016-12-26 17:23:17 +01:00
Alberto Garcia Cabeza
ba9ed83a3a
separates answerable questions and moves callout to a partial
2016-12-26 17:22:40 +01:00
Alberto Garcia Cabeza
d231a0188c
improves layout for polls index
2016-12-26 17:20:26 +01:00
Alberto Garcia Cabeza
5d656f157a
improves styles for polls views
2016-12-26 17:19:48 +01:00
Juanjo Bazán
f0156c5b5a
adds admin search/add/remove question to poll
2016-12-26 16:19:35 +01:00
rgarcia
316f9a0370
creates users with email nil to avoid index constraint
2016-12-26 14:28:45 +01:00
rgarcia
5281bb8181
fixes typo
2016-12-26 12:59:23 +01:00
rgarcia
c1b06b6501
creates user without email nor username
2016-12-26 12:45:48 +01:00
rgarcia
b8e175d306
adds formatting to document numbers
2016-12-26 12:18:36 +01:00
rgarcia
ba88f4d7cd
takes into account asincronos processing
2016-12-26 12:04:14 +01:00
rgarcia
42b0ff2696
optimize census call to return after finding a valid element
2016-12-26 11:51:28 +01:00
rgarcia
af7d71ccfd
Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets
2016-12-26 11:14:56 +01:00
kikito
84418bd671
Fixes issue in has_orders concern
2016-12-25 22:58:21 +01:00
kikito
adaa4731aa
Uses complete path for partial
2016-12-25 12:57:15 +01:00
kikito
f1a550bdb0
Allows rendering budget investment header when the @heading variable is not set up
2016-12-25 12:57:01 +01:00
kikito
2815b28cd1
changes header message to include assigned heading link
2016-12-25 12:56:31 +01:00
kikito
9af8eb8d52
Changes i18n namespace for errors
2016-12-25 12:55:39 +01:00
kikito
53233c365a
Adds a new reason for not being ballotable
2016-12-25 12:55:03 +01:00
kikito
e15377b7d8
Load @assigned_heading in addition to loading @heading
2016-12-25 12:54:48 +01:00
kikito
ef0acaf20f
Only creates ballot when budget balloting
2016-12-25 12:54:32 +01:00
kikito
3fd1993f74
only creates ballots when budget balloting
2016-12-25 12:54:07 +01:00
kikito
03ef20bfde
Merges orders_helper functionality inside has_orders concern
...
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
Juanjo Bazán
8b4f519d71
adds booth assignation to admin poll
2016-12-23 19:06:55 +01:00
Juanjo Bazán
89979e549f
adds search to Booth model
2016-12-23 19:06:55 +01:00
rgarcia
ddeca6f06d
fixes specs
2016-12-23 19:05:25 +01:00
kikito
bbb8ac830c
Fixes erroneous i18n param in view
2016-12-23 18:37:02 +01:00
kikito
de1ade0eb8
Fixes erroneous link in view
2016-12-23 18:36:42 +01:00
Alberto Garcia Cabeza
082c483269
removes unnecessary method on questions controller
2016-12-23 18:31:45 +01:00
Fernando Blat
704dffe7c5
Merge pull request #39 from medialab-prado/28-question-page-comments
...
Comments in legislation question page
2016-12-23 18:20:27 +01:00
Amaia Castro
33266e41fe
Merge branch 'master' into legislation-module-stable
2016-12-23 16:00:55 +01:00
Amaia Castro
de5df61359
Legislation question comments spec
2016-12-23 15:40:52 +01:00
kikito
615217e36e
Fixes errors in header view
2016-12-23 15:37:55 +01:00
kikito
a589d8a76d
Simplifies ballot.add_investment using automatic denormalization
2016-12-23 15:37:32 +01:00
kikito
f125941bbf
Tweaks unselected error in ballot/line
2016-12-23 15:22:19 +01:00
