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

2374 Commits

Author SHA1 Message Date
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
5c726e0949 Add Admin System Emails view & first system email 
Admins need to be able to see what a particular System Email looks like
with dummy data.

Also adding the first system email to be managed: the proposal
notification digest.

In case the current admin doesn't have any Notifications from
 ProposalNotifications there will be a crash. We'll solve this in later
 PR's with a system to "inject" sample text in email templates without
 having to generate records in the database.
 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
Alberto
7b8003dcb9 Merge pull request #2790 from wairbut-m2c/backport-1421-investments_csv_fixes 
Add visible_to_valuators and author_username to admin investments CSV
 2018-07-25 18:41:29 +02:00
Bertocq
a883e842ba Make admin notifications seed data translatable 2018-07-25 18:35:34 +02:00
Bertocq
812002dd7b Add admin notification related translations 2018-07-25 18:34:33 +02:00
Bertocq
f695a7faf3 Add AdminNotification management at admin panel 
In the same fashion Newsletters is managed, with the only difference that
the preview is using the notification partial in the same way the index
of notifications.
 2018-07-25 18:33:45 +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
Alberto
61589122ef Merge pull request #2723 from wairbut-m2c/backport_2400_combine_free_text_search_and_filters 
Combine text search and filters for Investments on Admin panel
 2018-07-25 14:42:19 +02:00
Alberto
c63fd5ada1 Merge pull request #2776 from consul/ui-custom 
UI custom
 2018-07-23 11:39:19 +02:00
decabeza
7533ce21ab Unifies spanish investment projects i18n 2018-07-20 18:50:19 +02:00
decabeza
e101458891 Removes custom content on seeds 2018-07-20 18:49:54 +02: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
Angel Perez
10efcb2029 Change I18n strings for warning when dismissing recommendations 2018-07-15 21:28:59 -04:00
Angel Perez
54853745f0 Fix typos for Settings locales (English) 2018-07-15 21:28:58 -04:00
Angel Perez
463c753880 Recommendations are automatically disabled if dismissed by user 2018-07-15 21:28:58 -04:00
Angel Perez
a58f6a2662 Enable 'Recommended proposals' setting for users 2018-07-15 21:28:57 -04:00
Angel Perez
522c206f6d Enable 'Recommended debates' setting for users 2018-07-15 21:28:57 -04:00
decabeza
bdb3f30e40 Adds recommendations on proposals index 2018-07-15 21:28:57 -04:00
decabeza
36a5ff39b8 Adds recommendations on debates index 2018-07-15 21:28:57 -04:00
decabeza
ecb0041b7f Adds recommended index partial and styles 2018-07-15 21:28:56 -04:00
Alberto
38916deb0b Merge pull request #2765 from consul/budgets-polls-ui 
Polls UI
 2018-07-13 20:01:40 +02:00
decabeza
230f1b1fde Removes unused i18n keys 2018-07-13 19:15:52 +02:00
decabeza
6738582029 Removes unused i18n keys 2018-07-13 19:15:13 +02:00
decabeza
bbaec57c8a Adds message in budget investment show if project is winner 2018-07-13 18:37:16 +02:00
decabeza
1116340f99 Removes participate in other polls button 2018-07-13 18:27:32 +02:00
iagirre
f871868a2b Max headings are updated when editing heading 
The max headings label is updated automatically
when updating the heading. It is done via AJAX
and a refresh isn't needed.
 2018-07-13 11:46:09 +02:00
Bertocq
1f0ee32998 Add max headings label on Group list 2018-07-13 11:46:09 +02:00
Angel Perez
15f9a52035 Correct typo on English locale for banners 2018-07-12 10:17:25 -04: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
c5c611837d Merge pull request #2732 from consul/legislation-help-gif 
Legislation help gif
 2018-07-11 17:44:12 +02:00
decabeza
5dd1cdf6d3 Adds missing i18n 2018-07-11 14:37:35 +02:00
Raimond Garcia
f700f33197 Merge pull request #2711 from javierv/fix_flaky_ckeditor_specs 
Fix flaky specs using CKEditor
 2018-07-09 10:28:55 +02:00
decabeza
2b958de992 Fixes valuation budget investments ui 2018-07-05 18:14:08 +02:00
Alberto
95f66aefe6 Merge pull request #2726 from consul/officing-no-vote 
Officing not to vote
 2018-07-05 17:07:10 +02:00
decabeza
2f922e1adb Adds button to officing voters if person decided not to vote 2018-07-05 14:12:22 +02:00
decabeza
16ff5c4400 Hides sidebar menus if officer has no shifts assigned 2018-07-04 17:22:03 +02:00
Raúl Fuentes
85f3f06255 Delete unused key 2018-07-04 12:32:52 +02: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
Alberto
ff4c72987f Merge pull request #2716 from consul/admin-booths-menu 
Adds ballot booths menu on admin
 2018-07-03 11:20:42 +02:00
Javier Martín
54c82a53d7 Precompile CKEditor plugins in use. 
As stated in #1196, compiling everything related to CKEditor made
compilations slower. However, not compiling any plugins meant Travis had
to compile them while running a test. It often resulted in a test
failing because the time Travis took to compile the plugins the
application uses exceeded Capybara's wait time.
 2018-07-02 18:39:13 +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
88a8aaa083 Add hide button in the user interface 
The little menu with the hide notification link and block user link
has been added to each proposal notification.

JS for adding the fade efect has also been added.
 2018-07-02 18:19:08 +02:00