consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,720 Commits 1 Branch 0 Tags
a1bbc82c8d57fbde6ff8da090a81a6f75fc6f5d0
Commit Graph

219 Commits

Author SHA1 Message Date
decabeza
a1bbc82c8d Changes allegations dates label 2018-09-20 17:33:04 +02:00
Marko Lovic
5ff85d33d6 Fix submit button text for Admin Notifications admin form 
In Madrid, the button text didn't change depending on whether the form
is for the "new" page or for the "edit" page.

In consul, the buttons texts were "create admin notification" and
"update admin notification" instead of "create notification" and "update
notification".

Also change translation key from "submit" to "submit_button" to
match other instances.
 2018-09-19 12:05:18 +02:00
Raimond Garcia
4f2ed27f8c Merge pull request #2865 from consul/backport_1585-make_banners_translatable 
[Backport] Make banners translatable
 2018-09-10 16:41:33 +02:00
Alberto
21f36e6be5 Merge branch 'master' into feature/1-nav-content-blocks 2018-09-05 12:41:07 +02:00
Marko Lovic
bfd9032e9d Extract translation partial to be shared within admin 
Refactor: behaviour should be 100% the same
 2018-08-27 18:24:24 +02:00
decabeza
108e458678 Adds description to all admin settings 2018-07-31 13:25:39 +02:00
Raimond Garcia
2c79197a05 Merge pull request #2809 from wairbut-m2c/backport/translatable-content-for-admin 
Basic content for I18n on Admin panel
 2018-07-27 18:01:00 +02:00
Ziyan Junaideen
f78d81bc81 ES admin i18n 2018-07-27 20:14:03 +05:30
Alberto
fb19aafee7 Merge pull request #2778 from wairbut-m2c/backport/investments-moderation 
Allow budget investments to be moderated
 2018-07-27 12:34:17 +02:00
Angel Perez
b8b0f64e64 Rename emails key with mailers key 2018-07-26 19:07:28 -04:00
Angel Perez
ca57a65aae Add missing I18n keys for InformationTexts#index view 2018-07-26 19:07:22 -04:00
Angel Perez
983dcf0247 Move 'Custom information texts' menu option under 'Site content' 2018-07-26 19:07:04 -04:00
María Checa
9d580e15f5 Adds activity tab for system emails 2018-07-26 17:55:06 +02:00
María Checa
eb8c021451 Adds button to send pending proposal notifications 2018-07-26 17:55:06 +02:00
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
Bertocq
eb0919d978 Add Preview Pending action to Admin System Emails 
Some system emails need to be manually reviewed before being sent. This
new action allows admins to see a preview of all Pending to be sent
Proposal Notification Digest messages.
 2018-07-25 20:20:33 +02:00
Bertocq
b9c6da245a Add System emails menu & list to admin panel 
We need a section to list all System Emails to view the templates and
preview an example of what would be sent.
 2018-07-25 20:19:58 +02:00
Bertocq
3fd97b0a9b Rename Newsletter & Notification to User Messages 
We're increasing the features around messaging users, menu name has to
be generic enough.
 2018-07-25 20:18:58 +02:00
Alberto
177eedf8e4 Merge pull request #2580 from consul/admin_notifications 
Admin notifications
 2018-07-25 20:05:19 +02:00
Bertocq
812002dd7b Add admin notification related translations 2018-07-25 18:34:33 +02:00
María Checa
e9d73eb687 Fix max_per_heading filter in Admin budget investments list 
Also changed the name of the param to `min_total_supports`, which is more descriptive on what it actually does.

Backport of 75f20d5 and 07f0806 from AyuntamientoMadrid/consul fork
 2018-07-25 15:44:51 +02:00
Marko Lovic
601e3058d8 Add visible_to_valuators and author username to admin investments CSV 
Backport based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
 2018-07-25 15:10:56 +02:00
Marko Lovic
5413c34458 Restructure and rename translations 
Based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
 2018-07-25 15:10:09 +02:00
Angel Perez
4da23716bb Allow admins to moderate investments 2018-07-20 18:42:34 -04:00
Alberto
bc5d263a53 Merge pull request #2761 from wairbut-m2c/backport_1384-add-max-heading-number-budget-group-list 
Backport 1384 add max heading number budget group list
 2018-07-20 13:17:38 +02:00
Bertocq
1f0ee32998 Add max headings label on Group list 2018-07-13 11:46:09 +02:00
iagirre
0d9da5398b Fix banners in user pages 
Banners were not been shown in certain pages; now
they are.

Spec to check if the banner is been shown correctly
added. Before it was in admins specs, now it has it's
own spec out of admins folder.
 2018-07-12 10:17:25 -04:00
iagirre
bf69a7bba7 Specs added to test the change of background and font color with color-picker and text-field 2018-07-12 10:16:47 -04:00
iagirre
6d6da8affc Add form fields to set the colours and the sections for the banner 
Add migrations to store the information in the database
 2018-07-12 10:16:47 -04:00
Alberto
1de0cf083f Merge pull request #2717 from consul/allow-author-notifications-to-be-moderated 
Allow author notifications to be moderated
 2018-07-03 11:21:26 +02:00
iagirre
0fb7d13229 Add admin UI to Restore/Confirm moderation of notifications 
Add the admin UI needed to restore the hidden proposal notifications
when hidden by moderator. The admin can restore them or confirm
the moderation made by moderator, just like proposals.
 2018-07-02 18:19:19 +02:00
iagirre
f58bc5d886 Add the menu entry for prop. notifications 
A new menu for the sidebar has been added, so that the moderator
can access to the index from the menu.
 2018-07-02 18:17:56 +02:00
decabeza
0a58e72edb Adds ballot booths menu on admin 2018-07-02 17:57:27 +02:00
María Checa
a4cda8a9f6 Add new translations 2018-06-27 18:32:54 +02:00
María Checa
564d1b32e2 Add new translations 2018-06-27 16:45:53 +02:00
decabeza
56ee33d947 Removes content pending to backport 2018-06-08 19:46:07 +02:00
decabeza
4fca07172c Reorders and improve i18n for legislation processes form 2018-06-08 18:45:52 +02:00
decabeza
573a7e7c13 Moves content blocks info to index view 2018-06-08 18:45:45 +02:00
decabeza
a669bd86a8 Improves layout and i18n for admin newsletters 2018-06-08 18:38:21 +02:00
decabeza
28234b333f Improves legislation questions form 2018-06-08 18:32:12 +02:00
decabeza
57ff65692f Improves i18n texts 2018-06-08 18:29:47 +02:00
Alberto
f9940980b0 Merge pull request #2645 from wairbut-m2c/admin-form-improvements-backport 
Admin form improvements
 2018-06-07 17:44:38 +02:00
Alberto
6d2c094931 Merge pull request #2469 from wairbut-m2c/chore/i18n-cleaning 
I18n maintenance
 2018-06-07 17:42:05 +02:00
decabeza
1fb3c16efe Adds see results button on budget investment admin 2018-06-06 17:41:30 +02:00
Alberto
a05f6ac61a Merge pull request #2641 from consul/homepage 
Add customization of homepage from admin section
 2018-06-01 19:18:44 +02:00
Alberto
ec58ada817 Merge pull request #2650 from aamarill/2586-split_admin_settings 
Split admin settings
 2018-06-01 19:18:14 +02:00
rgarcia
b672a4550d Add option to configure feed items displayed in homepage 2018-05-29 19:58:04 +02:00
decabeza
50fd540797 Adds styles and missing i18n for admin homepage 2018-05-28 18:17:26 +02:00
iagirre
2821985552 Change 'Calculate Winners button' to budget_investments index. 
Move the button so that it appears in the Winners tab of the
budget_investments index.

When the budget is in "Balloting projects", "Reviewing Ballots"
or "Finished budget" phases, the button will appear as a button
(clickable). If there are no winners calculated yet, the text
will be "Calculate winner investments"; if there are, the text
will be "Recalculate winner investments".

If the budget is in another phase, the button will be
disabled and a message will appear: 'The budget has to stay on
phase "Balloting projects", "Reviewing Ballots" or
"Finished budget" in order to calculate winners projects'
 2018-05-28 15:12:28 +02:00
Adan Amarillas
1d974c41e3 Add missing i18n keys to locales 2018-05-24 12:27:07 -07:00