Commit Graph

4747 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
b8f60b48fe changes time tags to span 2016-12-27 16:30:56 +01:00
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
kikito
d8b2e703ca marks spec as pending 2016-12-27 13:15:22 +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
Juanjo Bazán
4e1bb62654 Merge pull request #1307 from consul/signature-sheets-polish
creates users with email nil to avoid index constraint
2016-12-26 14:40:11 +01:00
rgarcia
316f9a0370 creates users with email nil to avoid index constraint 2016-12-26 14:28:45 +01:00
Juanjo Bazán
ab70f25519 Merge pull request #1300 from consul/signature-sheets
Signature sheets
2016-12-26 13:18:56 +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
1bb307580f makes translations aware of pluralisation 2016-12-26 12:03:39 +01:00
rgarcia
42b0ff2696 optimize census call to return after finding a valid element 2016-12-26 11:51:28 +01:00
Raimond Garcia
19d9f7d162 Merge pull request #1305 from consul/budgets-user
Budgets user
2016-12-26 11:28:14 +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
2c396f83a7 makes spec less likely to fail by increasing the number of random stuff generated in a random sorting 2016-12-25 23:45:58 +01:00
kikito
526a6e2097 i18n 2016-12-25 23:18:58 +01:00
kikito
84418bd671 Fixes issue in has_orders concern 2016-12-25 22:58:21 +01:00
kikito
c6648ec39a Fixes investment_spec and adds one more check for selected 2016-12-25 21:04:19 +01:00
kikito
46901a8117 Refactors ballots_spec by removing repeated lines 2016-12-25 20:58:57 +01:00
kikito
9081810a92 Removes parameters using automatic denormalization 2016-12-25 20:38:27 +01:00
kikito
a0d79992df refactors repetitive declarations out of ballots_spec 2016-12-25 20:29:43 +01:00
kikito
f9045cf95a refactors repetitive declarations in specs 2016-12-25 20:01:28 +01:00
kikito
b1e45bfe2d refactor spec to reutilize user variable 2016-12-25 19:29:13 +01:00
kikito
3ac7d88737 Makes spec/features/budgets/ballots_spec pass 2016-12-25 12:58:22 +01:00
kikito
7089d965d5 Removes unused common actions 2016-12-25 12:57:57 +01:00
kikito
4b92cf3acf Removes unused error messages from 18n 2016-12-25 12:57:46 +01:00
kikito
32710f57e1 Organization instead of organisation 2016-12-25 12:57:34 +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
2fab251593 adds i18n entries 2016-12-25 12:53:27 +01:00
kikito
8e4bd43069 Makes the selected trait also mark projects feasible and valuation_finished 2016-12-24 14:43:12 +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
rgarcia
ddeca6f06d fixes specs 2016-12-23 19:05:25 +01:00
rgarcia
37462b79cd removes unused translations 2016-12-23 18:37:39 +01:00
kikito
767c537883 Fixes 1 spec in investments_spec 2016-12-23 18:37:14 +01:00