Commit Graph

887 Commits

Author SHA1 Message Date
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Juanjo Bazán
40f6ca5886 adds poll shift management to admin 2016-12-27 17:47:15 +01:00
Alberto Garcia Cabeza
0d5d082e68 fixes specs 2016-12-26 19:15:05 +01:00
Juanjo Bazán
f0156c5b5a adds admin search/add/remove question to poll 2016-12-26 16:19:35 +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
Juanjo Bazán
8b4f519d71 adds booth assignation to admin poll 2016-12-23 19:06:55 +01:00
rgarcia
ddeca6f06d fixes specs 2016-12-23 19:05:25 +01:00
Alberto Garcia Cabeza
dc27514fa7 updates texts on specs 2016-12-23 14:41:42 +01:00
Alberto Garcia Cabeza
151db53a9b fixes specs 2016-12-22 19:06:11 +01:00
rgarcia
0deba76db1 adds specs 2016-12-21 18:46:38 +01:00
Juanjo Bazán
298c9cb76a adds better spec for poll dates 2016-12-21 14:00:21 +01:00
Juanjo Bazán
bc690748fd adds dates validation to polls 2016-12-21 13:50:15 +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
Alberto Garcia Cabeza
10c44a077b updates specs 2016-12-16 15:19:04 +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
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
Juanjo Bazán
ca98206ca3 fixes spec 2016-12-07 19:27:44 +01:00
Alberto Garcia Cabeza
7ef9bafbf9 fixes specs of remove link on debates and proposals description 2016-12-07 18:42:56 +01:00
Juanjo Bazán
6aa96c4471 removes mentions to enquiries and deprecated code 2016-12-07 14:48:44 +01:00
Juanjo Bazán
ad2dd7d267 adds officer-polls relation and spec 2016-12-06 14:51:53 +01:00
Juanjo Bazán
891516a0b9 changes officer assignments to polls via new model/relation 2016-12-06 14:33:06 +01:00
Juanjo Bazán
60e7ac20e7 tweaks admin/polls pages and specs 2016-12-06 13:51:14 +01:00
Alberto Miedes Garcés
6175990533 Admin geozones: index, create
Modified Geozone factory and seeds to be more complete
2016-12-04 21:19:36 +01:00
Juanjo Bazán
0d9fb9e8a8 fix flaky spec 2016-12-04 00:23:19 +01:00
Juanjo Bazán
9d2bf95172 fix js flaky specs 2016-12-03 23:43:50 +01:00
Juanjo Bazán
418b0a4801 adds extra expectations to spec
to include items from the new admin menu
2016-12-02 14:29:37 +01:00
Juanjo Bazán
f67f058b57 adds complete Booth management to admin 2016-12-02 14:28:39 +01:00
Juanjo Bazán
6d1aca4d67 fixes new admin menu related specs 2016-12-02 14:26:18 +01:00
rgarcia
b76e1b5992 removes obsolete spec 2016-11-24 20:37:09 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
e12f183775 fixes typo 2016-11-19 14:03:10 +01:00
rgarcia
724dac4df2 cherry picks creating poll question from successful proposals 2016-11-18 21:09:28 +01:00
rgarcia
e21eb9d02c fixes admin poll question show spec 2016-11-18 20:30:26 +01:00
rgarcia
dd1e85d1c5 adds placeholder spec for comments 2016-11-17 22:48:12 +01:00
rgarcia
4955daf886 adds poll and poll question's specs 2016-11-17 22:48:00 +01:00
rgarcia
626a8e9154 updates specs for admin poll questions 2016-11-17 21:31:51 +01:00
rgarcia
9b46a7fe8f tmp commit adds specs for admin poll questions 2016-11-17 11:52:51 +01:00
Raimond Garcia
14af1a1961 Merge pull request #1259 from consul/accessibility
Accessibility
2016-11-15 11:39:40 +01:00
rgarcia
bb3c4c6399 adds consistency to ruby code style
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
Alberto Garcia Cabeza
5e487bb85f fixes specs 2016-11-14 18:06:39 +01:00
kikito
1f9945d0aa Implements answering questions 2016-11-14 13:36:00 +01:00