rgarcia
|
1a46b4d4cb
|
fixes conflicts with master
|
2017-05-31 10:36:38 +02:00 |
|
Juanjo Bazán
|
1ae55a59f6
|
Merge pull request #1560 from bertocq/feature/admin_administrators_management
Administrators management in admin area
|
2017-05-30 10:44:50 +02:00 |
|
Bertocq
|
e9ea72113b
|
Add spec scenario for current user trying to remove himself from administrators list
|
2017-05-25 11:28:36 +02:00 |
|
Bertocq
|
4ab92731b6
|
Add expectations for newsletter users and non-newsletter users on email zip download scenario
|
2017-05-24 12:56:03 +02:00 |
|
Bertocq
|
9ba29fef8c
|
Add feature scenario for Newsletter admin section, including email zip download
|
2017-05-24 12:23:05 +02:00 |
|
Bertocq
|
0df7235cc8
|
Add feature spec for new Administrators management in Admin area
|
2017-05-23 22:47:37 +02:00 |
|
decabeza
|
5e0d5fc8c3
|
Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation
|
2017-05-22 18:43:49 +02:00 |
|
Juanjo Bazán
|
23c05dcac5
|
adds supports column to admin's budget investments list
|
2017-04-28 13:45:24 +02:00 |
|
Alberto Garcia Cabeza
|
54a90bbdc9
|
updates texts on specs
|
2017-04-17 19:21:04 +02:00 |
|
Amaia Castro
|
9e5324cc1b
|
Merge branch 'master' into site-customization
|
2017-04-07 17:29:33 +02:00 |
|
Amaia Castro
|
c1de2dced4
|
Custom content blocks for top_links and footer
|
2017-04-06 17:00:05 +02:00 |
|
Amaia Castro
|
8143fe1037
|
Site customization: images uploads
|
2017-04-06 17:00:04 +02:00 |
|
Amaia Castro
|
54fab919e5
|
Show custom pages in public site
|
2017-04-06 16:59:58 +02:00 |
|
Amaia Castro
|
255b57cc85
|
Admin for custom pages
|
2017-04-06 16:25:07 +02:00 |
|
Alberto
|
6bbcc71ecb
|
Merge branch 'master' into polls
|
2017-04-06 14:16:49 +02:00 |
|
Juanjo Bazán
|
83e2df7410
|
adds signature sheets for budget investments
|
2017-04-05 12:59:42 +02:00 |
|
Amaia Castro
|
5caa31dba1
|
Merge branch 'master' into legislation-module-stable
|
2017-03-25 13:34:49 +01:00 |
|
Juanjo Bazán
|
d2129bf926
|
fixes spec
|
2017-03-23 13:06:09 +01:00 |
|
Amaia Castro
|
d95f902fdf
|
Merge branch 'master' into legislation-module-stable
|
2017-03-07 23:19:26 +01:00 |
|
rgarcia
|
712d5f2d9a
|
displays only valuation tags for filtering
|
2017-03-07 18:19:53 +01:00 |
|
Juanjo Bazán
|
d68be1f6f0
|
adds automatic recount to admin poll and paginates recounts
|
2017-02-14 19:44:19 +01:00 |
|
Juanjo Bazán
|
75d088b472
|
fixes specs
|
2017-02-14 15:01:04 +01:00 |
|
Juanjo Bazán
|
0bd87c7e43
|
extracts results from admin's poll/show
|
2017-02-14 14:26:46 +01:00 |
|
Fernando Blat
|
04ad8bb6c7
|
Refactor JS and add update test
|
2017-02-10 09:48:28 +01:00 |
|
Juanjo Bazán
|
35540cdcf1
|
adds poll results to admin
simple page shows results by question, white and null results
|
2017-02-06 17:12:54 +01:00 |
|
Juanjo Bazán
|
01a52cc61a
|
fixes ambiguous match error in specs
|
2017-01-31 19:09:58 +01:00 |
|
Juanjo Bazán
|
a05297ea1a
|
adds Recounting tab to Poll's admin show view
|
2017-01-31 13:40:53 +01:00 |
|
Juanjo Bazán
|
547168be3f
|
adds recounts to poll_officer view in admin zone
Admin can see recounts and final recounts made by poll_officer next to
their officing shifts
|
2017-01-31 12:38:53 +01:00 |
|
Raimond Garcia
|
b0bc97eb37
|
Merge pull request #1378 from consul/recounting
Final recounts info to Admin
|
2017-01-30 21:54:35 +01:00 |
|
Juanjo Bazán
|
4ee50c86c0
|
adds final recounts info to admins
|
2017-01-30 20:42:30 +01:00 |
|
kikito
|
cca6758f71
|
Removes poll::question.summary from specs
|
2017-01-30 18:41:24 +01:00 |
|
Juanjo Bazán
|
72ac75abeb
|
adds final recounting to poll officers' zone
|
2017-01-30 17:44:39 +01:00 |
|
kikito
|
5d13bdc15d
|
Removes 'manage' from admin permissions in Polls
|
2017-01-30 11:29:49 +01:00 |
|
Juanjo Bazán
|
cf6ca50a3b
|
adds optional officer_assignment_id to poll::voters
|
2017-01-27 18:39:25 +01:00 |
|
Juanjo Bazán
|
e634e80113
|
adds system recounting to admin booth_assignments
|
2017-01-27 15:19:03 +01:00 |
|
kikito
|
2be88cb316
|
Adds missing validation to poll::question. Fixes specs
|
2017-01-25 10:46:57 +01:00 |
|
kikito
|
15b531f068
|
Fixes failing specs
|
2017-01-24 18:10:41 +01:00 |
|
Fernando Blat
|
f7a6f8399b
|
Add pending translations
|
2017-01-23 14:58:12 +01:00 |
|
Juanjo Bazán
|
113f9b32d7
|
Merge branch 'master' into polls
|
2017-01-19 16:51:19 +01:00 |
|
Amaia Castro
|
a2a61341fe
|
Merge branch 'master' into legislation-module-stable
|
2017-01-11 22:54:41 +01:00 |
|
rgarcia
|
53c5ea7e90
|
fixes specs
|
2017-01-10 21:30:38 +01:00 |
|
rgarcia
|
f2d23b56e0
|
fixes conflicts with budgets
|
2017-01-09 13:33:01 +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 |
|
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 |
|
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 |
|