Commit Graph

7804 Commits

Author SHA1 Message Date
Martín González
1dd17b493a Simplify markup 2016-12-28 12:33:19 +01:00
Martín González
0e12f5cd9b Legislation admin index markup 2016-12-28 12:32:31 +01:00
Alberto Garcia Cabeza
d8cc888d60 changes table headings and selected button css 2016-12-28 12:17:08 +01:00
Juanjo Bazán
f5b032cfbe Merge branch 'master' into polls 2016-12-28 12:16:55 +01:00
Juanjo Bazán
5ffce7fb05 Merge pull request #1312 from consul/signature-sheets-polish
Signature sheets polish
2016-12-28 12:16:15 +01:00
rgarcia
122446ef62 find or create signatures in case of a timeout 2016-12-28 11:41:52 +01:00
rgarcia
113c4551aa makes signatures aware of spaces between numbers and letter 2016-12-28 11:40:36 +01:00
rgarcia
d554ec810a adds document counter to signature sheet 2016-12-28 11:40:20 +01:00
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
Juanjo Bazán
402d709930 adds menu item to main bar for poll officers 2016-12-27 18:48:36 +01:00
Juanjo Bazán
3fc4896529 adds unsettled geozones menu item to admin menu 2016-12-27 18:37:04 +01:00
Juanjo Bazán
7b6713f8bb fixes typo in method call 2016-12-27 18:26:27 +01:00
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
Amaia Castro
5e01b380cd Legislation Answer model 2016-12-27 18:21:50 +01:00
Alberto Miedes Garcés
90ff84b6ef Update API fields for Comment 2016-12-27 18:18:22 +01:00
Amaia Castro
573e281a8f Merge branch 'master' into legislation-module-stable 2016-12-27 18:07:11 +01:00
Alberto Garcia Cabeza
3121dd066e adds thead and button to select on budget investement index table 2016-12-27 18:02:35 +01:00
Juanjo Bazán
3ad648dd63 display correct submenu in admin menu 2016-12-27 17:47:54 +01:00
Juanjo Bazán
2aff1d71fe makes count uniq 2016-12-27 17:47:27 +01:00
Juanjo Bazán
40f6ca5886 adds poll shift management to admin 2016-12-27 17:47:15 +01:00
Juanjo Bazán
8a77861165 adds helper for booth and date selectors 2016-12-27 17:46:24 +01:00
Juanjo Bazán
a0118cb163 associates officer_assignments to officer 2016-12-27 17:45:01 +01:00
Juanjo Bazán
2f918e8eef adds validations to officer_assignments 2016-12-27 17:44:35 +01:00
Juanjo Bazán
a78fe197e9 favours user instead of officer 2016-12-27 17:42:45 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
Alberto Garcia Cabeza
5bf09ec569 replaces span tag to div on comments votes 2016-12-27 16:33:06 +01:00
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
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 Miedes Garcés
2311cd4b1d Renamed User::public_activity scope 2016-12-26 18:42:12 +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