Amaia Castro
|
9e5324cc1b
|
Merge branch 'master' into site-customization
|
2017-04-07 17:29:33 +02:00 |
|
Juanjo Bazán
|
d988acb18b
|
Merge pull request #1483 from consul/polls
Polls
|
2017-04-07 13:06:10 +02:00 |
|
Alberto Garcia Cabeza
|
3d45c0ca1a
|
adds telegram handle to dev seeds and admin settings
|
2017-04-06 18:34:50 +02:00 |
|
Amaia Castro
|
b0b39d9f8a
|
Remove sandbox
Revert "Implement Sandbox"
This reverts commit e806a39820c2920d18b80dc560d05db36ecb6ede.
|
2017-04-06 17:00:05 +02:00 |
|
Fernando Blat
|
e126a2ded0
|
Add information about content blocks
|
2017-04-06 17:00:05 +02:00 |
|
Fernando Blat
|
d5669fbbae
|
Add settings translation
|
2017-04-06 17:00:05 +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 |
|
Martín González
|
b35683f75e
|
Implement Sandbox
|
2017-04-06 15:04:23 +02:00 |
|
Alberto
|
6bbcc71ecb
|
Merge branch 'master' into polls
|
2017-04-06 14:16:49 +02:00 |
|
Alberto
|
70bb08564f
|
Merge pull request #1481 from PopulateTools/add-telegram
Add telegram
|
2017-04-05 18:22:38 +02:00 |
|
Enrique García
|
548e67fbca
|
Merge pull request #1482 from consul/signatures
Signature sheets for budget investments
|
2017-04-05 14:07:36 +02:00 |
|
Juanjo Bazán
|
ee07dd5784
|
adds missing i18n files and keys
|
2017-04-05 13:32:28 +02:00 |
|
Amaia Castro
|
5ee2c9efa0
|
Add telegram to footer and to social share button
|
2017-04-05 13:07:08 +02:00 |
|
Juanjo Bazán
|
83e2df7410
|
adds signature sheets for budget investments
|
2017-04-05 12:59:42 +02:00 |
|
Juanjo Bazán
|
f9a09c3d02
|
Merge pull request #1480 from consul/i18n-pages
Adds i18n to more info pages
|
2017-04-04 18:40:00 +02:00 |
|
Alberto Garcia Cabeza
|
d401633c26
|
adds i18n to more info pages
|
2017-04-04 18:02:37 +02:00 |
|
Alberto Garcia Cabeza
|
533a7492a1
|
changes more information to more info
|
2017-04-04 18:01:30 +02:00 |
|
kikito
|
1d456b0459
|
updates capistrano to match the Gemfile
|
2017-04-04 13:20:45 +02:00 |
|
Juanjo Bazán
|
d6cb76e491
|
removes not needed code
Kaminari has been updated
|
2017-04-03 12:30:57 +02:00 |
|
Alberto Garcia Cabeza
|
8d92c936cc
|
removes unused i18n keys
|
2017-03-30 12:10:45 +02:00 |
|
Alberto Garcia Cabeza
|
672e6d1db7
|
removes old opendata page
|
2017-03-29 18:03:27 +02:00 |
|
Alberto Garcia Cabeza
|
37f4d0daa5
|
adds friendly urls
|
2017-03-29 18:02:55 +02:00 |
|
Alberto Garcia Cabeza
|
978b891011
|
adds i18n
|
2017-03-29 18:00:14 +02:00 |
|
Alberto
|
cfac1ebcc7
|
Merge pull request #1460 from consul/phases-renaming
renames budget phases
|
2017-03-23 13:15:08 +01:00 |
|
Juanjo Bazán
|
53290b3d0d
|
renames budget phases
|
2017-03-23 12:48:00 +01:00 |
|
Juanjo Bazán
|
3cd33ec3d5
|
Merge pull request #1456 from consul/accessibility-embed-videos
improves accessibility on proposals embed videos
|
2017-03-23 12:33:54 +01:00 |
|
Alberto Garcia Cabeza
|
60ea12de76
|
improves accessibility on proposals embed videos
|
2017-03-21 18:44:51 +01:00 |
|
Alberto
|
be02a77c65
|
Merge pull request #1455 from consul/scm-config
updates capistrano scm config
|
2017-03-21 18:39:52 +01:00 |
|
Alberto Garcia Cabeza
|
dadfdba1b1
|
adds date of birth form when manager creates new user
|
2017-03-20 11:59:22 +01:00 |
|
Alberto Garcia Cabeza
|
8f13c0e2ec
|
adds setting to add per page code on <head> and <body>
|
2017-03-16 17:04:36 +01:00 |
|
Juanjo Bazán
|
2d3e3586d1
|
updates capistrano scm config
|
2017-03-14 13:30:31 +01:00 |
|
kikito
|
dcb0e03cf4
|
small i18n change
|
2017-03-08 13:32:25 +01:00 |
|
Juanjo Bazán
|
a3b4b6b30d
|
Merge pull request #1433 from consul/budget-investments-delete
Budget investments delete
|
2017-03-07 11:22:01 +01:00 |
|
kikito
|
3dbdc8f455
|
Adds delete link to budget investment list in user activities
|
2017-03-06 19:24:10 +01:00 |
|
Alberto Garcia Cabeza
|
b5fd8cc8b2
|
fixes missing i18n
|
2017-03-06 14:04:17 +01:00 |
|
Alberto Garcia Cabeza
|
737d347c4a
|
changes alt text of header logo
|
2017-03-06 13:45:11 +01:00 |
|
Alberto Garcia Cabeza
|
580ed6e4c6
|
adds alternative text for share on WhatsApp links
|
2017-03-06 13:15:12 +01:00 |
|
Alberto Garcia Cabeza
|
bf3e301bb1
|
changes button text depending of poll status
|
2017-03-06 12:29:13 +01:00 |
|
Juanjo Bazán
|
e21dc04093
|
Merge branch 'master' into polls
|
2017-02-18 11:43:22 +01:00 |
|
rgarcia
|
0cd72894ff
|
fixes date order symbols and syntax of portuguese locale
|
2017-02-18 11:21:59 +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
|
47745f5e6d
|
removes unused route
|
2017-02-14 15:10:51 +01:00 |
|
Juanjo Bazán
|
0bd87c7e43
|
extracts results from admin's poll/show
|
2017-02-14 14:26:46 +01:00 |
|
Juanjo Bazán
|
bedb9f29e7
|
extracts recounting from admin's poll/show
|
2017-02-14 14:07:22 +01:00 |
|
Juanjo Bazán
|
19ec7f93b3
|
extracts officer_assignments from admin's poll/show
|
2017-02-14 13:47:33 +01:00 |
|
Juanjo Bazán
|
20e31133a8
|
extracts booth_assignment from admin's poll/show
|
2017-02-14 13:00:19 +01:00 |
|
Juanjo Bazán
|
0ae7bac5d5
|
makes main link in namespaces point to correct root_path
|
2017-02-12 22:33:54 +01:00 |
|