Juanjo Bazán
|
113f9b32d7
|
Merge branch 'master' into polls
|
2017-01-19 16:51:19 +01:00 |
|
rgarcia
|
c918c9e081
|
adds specs for many tags in a budget investment
|
2017-01-19 10:03:38 +01:00 |
|
Juanjo Bazán
|
555cc4529b
|
removes focus
|
2017-01-17 13:33:45 +01:00 |
|
rgarcia
|
dc2bfbdc97
|
fixes specs
|
2017-01-16 19:49:04 +01:00 |
|
rgarcia
|
5f7269a070
|
displays unfeasible budgets link from home
|
2017-01-16 03:09:08 +01:00 |
|
rgarcia
|
fa9cb00c65
|
displays appropriate permission messages in accepting phase
|
2017-01-15 20:37:44 +01:00 |
|
Raimond Garcia
|
69c043a886
|
Merge pull request #1356 from consul/budget-emails
Budget emails
|
2017-01-15 19:15:39 +01:00 |
|
rgarcia
|
0f1a98da7d
|
fixes conflicts with master
|
2017-01-15 19:04:12 +01:00 |
|
rgarcia
|
537de8c46c
|
Merge branch 'master' into budget-emails
|
2017-01-15 18:58:20 +01:00 |
|
Alberto Garcia Cabeza
|
9741ee859a
|
updates i18n and specs
|
2017-01-15 14:02:08 +01:00 |
|
rgarcia
|
42604e27b9
|
Displays tag cloud in all phases
|
2017-01-15 09:55:01 +01:00 |
|
rgarcia
|
7aba8ef299
|
adds specs
|
2017-01-14 17:02:45 +01:00 |
|
rgarcia
|
11a8086599
|
adds specs
|
2017-01-14 16:12:45 +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 |
|
rgarcia
|
6d71cd985c
|
displays appropriate vote info depending on phase
|
2017-01-13 21:15:08 +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 |
|
rgarcia
|
17946b292b
|
fixes specs
|
2017-01-13 16:37:39 +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 |
|
rgarcia
|
dbf8b86518
|
fixes specs
|
2017-01-13 11:37:06 +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
|
68b2f6d9c4
|
Fixes specs.
|
2017-01-13 07:44:57 +01:00 |
|
Juanjo Bazán
|
05ca715dee
|
Merge pull request #1341 from consul/budgets-settings
Sets spending proposal's settings to nil
|
2017-01-10 21:47:20 +01:00 |
|
rgarcia
|
53c5ea7e90
|
fixes specs
|
2017-01-10 21:30:38 +01:00 |
|
Juanjo Bazán
|
053a3e7b41
|
makes user page to show only active feature comments
|
2017-01-10 21:28:04 +01:00 |
|
Juanjo Bazán
|
76d818dd1b
|
adds Budget::Investment comments specs
|
2017-01-10 14:31:28 +01:00 |
|
Juanma
|
fcebfe4440
|
Fixes specs.
|
2017-01-10 12:34:02 +01:00 |
|
Juanjo Bazán
|
a5338a4455
|
removes problematic html_safe link from flash notice
No need for it now that investments are public
|
2017-01-09 18:16:59 +01:00 |
|
Juanjo Bazán
|
e2118f701b
|
removes hardcoded age, favours setting
|
2017-01-09 16:05:27 +01:00 |
|
rgarcia
|
cc891b4f30
|
fixes specs
|
2017-01-09 14:10:07 +01:00 |
|
rgarcia
|
f2d23b56e0
|
fixes conflicts with budgets
|
2017-01-09 13:33:01 +01:00 |
|
rgarcia
|
b84ec0857c
|
fixes specs
|
2017-01-09 11:02:15 +01:00 |
|
Alberto Garcia Cabeza
|
d5ffabac55
|
fixes specs for management budget investments
|
2017-01-08 22:17:37 +01:00 |
|
Alberto Garcia Cabeza
|
8722699cd8
|
fixes typos and spec for budgets investments
|
2017-01-08 22:17:14 +01:00 |
|
rgarcia
|
3ba57bbab2
|
adds valuator tags
|
2017-01-08 13:24:05 +01:00 |
|
rgarcia
|
fd28f6c2b3
|
adds tags to investment
|
2017-01-08 11:37:02 +01:00 |
|
kikito
|
28e6a10382
|
Hides balloting controls when not in the balloting phase
|
2017-01-05 15:17:49 +01:00 |
|
rgarcia
|
c3380d18fa
|
fixes conflicts with budgets
|
2017-01-05 13:14:09 +01:00 |
|
Juanjo Bazán
|
a5b4a79f62
|
Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
|
2017-01-05 13:06:48 +01:00 |
|
Juanjo Bazán
|
0e9cec2ca6
|
adds spec for recount/officers lists in booth_assignment show
|
2017-01-05 13:00:48 +01:00 |
|
kikito
|
5f108944a8
|
final attempt at fixing travis
|
2017-01-05 12:49:53 +01:00 |
|
kikito
|
5eec8c7da2
|
attempts to fix travis again
|
2017-01-05 12:32:36 +01:00 |
|
kikito
|
2a792a5499
|
attempts to fix failing spec in travis
|
2017-01-05 12:05:40 +01:00 |
|
kikito
|
9e2afeb503
|
removes deprecated spec (valuators are not shown in valuation table)
|
2017-01-05 11:26:46 +01:00 |
|
rgarcia
|
dde1d34172
|
fixes conflicts with master
|
2017-01-05 01:56:35 +01:00 |
|
Juanjo Bazán
|
70b86170a2
|
adds booth_assignment show with officers and recounts info
|
2017-01-04 21:00:36 +01:00 |
|
Alberto Garcia Cabeza
|
a42c1387cf
|
fixes specs
|
2017-01-04 19:38:49 +01:00 |
|
kikito
|
e9acf295b8
|
removes filter specs after removing filtering from valuation
|
2017-01-04 17:00:56 +01:00 |
|
Juanjo Bazán
|
909dce00e0
|
adds recounting spec
|
2017-01-04 13:52:11 +01:00 |
|