consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

5383 Commits

Author SHA1 Message Date
decabeza
6f324c6931 Unifies styles and views for admin polls 2018-07-31 12:48:01 +02:00
decabeza
076f9dd474 Moves back link to root path from dashboard to header 2018-07-31 12:47:51 +02:00
Alberto
5546f5b125 Merge pull request #2817 from consul/custom-content 
Custom content
 2018-07-31 12:43:21 +02:00
decabeza
71d45093b6 Removes custom content on proposals 2018-07-30 19:35:12 +02:00
decabeza
e14b7b67fb Removes custom content on footer 2018-07-30 17:59:33 +02:00
decabeza
b43945ad33 Removes custom content on management and devise views 2018-07-30 17:58:13 +02:00
decabeza
f2ec836587 Removes custom content on mailers 2018-07-30 17:57:25 +02:00
decabeza
62343ba49b Removes custom content on top links 2018-07-30 17:56:23 +02:00
decabeza
52fa9d27ac Removes custom content on index views pages 2018-07-30 17:55:56 +02:00
decabeza
2543cf5d6c Removes custom content on help pages 2018-07-30 17:45:19 +02:00
Juan Salvador Pérez García
3d5390dfb0 Fixes #245 
Poll card now shows the responses to the poll in the public side
 2018-07-27 20:11:19 +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
Juan Salvador Pérez García
50f73abb0c Fixes #voodoorai2000 comments 
Fixes some comments from #voodoorai2000 for the PR to consul
 2018-07-27 16:30:03 +02:00
Alberto
65e4435822 Merge pull request #2137 from wairbut-m2c/iagirre-admin-menu-in-management 
Add admin menu in management view (if user is admin)
 2018-07-27 12:35:07 +02:00
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
16yuki0702
c14fbf8540 Fixed misunderstanding 2018-07-27 16:34:00 +09:00
16yuki0702
57dbb0220a Fix active item on admin menu 2018-07-27 15:45:42 +09:00
rgarcia
4c8b174274 Display only translations for the current language 
After creating a translation in spanish, it was also displaying it when selecting
the english locale.

This was due to the code picking the first translation available

With this commit, we are checking for an existing translation in the current locale
and displaying it if it exists
 2018-07-26 21:55:07 -04:00
rgarcia
12f6f06ade Fix exception when using locale as a parameter in the url 
When visiting, for example, /admin/site_customization/information_texts?locale=fr
we were getting an `UncaughtThrowError: uncaught throw :exception`
With the following payload
```
File "/aytomad/app/participa/participacion/releases/20180726231929/app/views/admin/site_customization/information_texts/_form_field.html.erb" line 5

File "/aytomad/app/participa/participacion/releases/20180726231929/app/helpers/globalize_helper.rb" line 35 in block in globalize
```

Substituting this line seems to solve it

Note that we had to remove the portuguese local too, as it was giving a different
exception due to this change. This problem, has been solved in the original
globalization PR
 2018-07-26 21:55:06 -04:00
Angel Perez
26deb02937 Show I18n key on label instead of translation 2018-07-26 20:49:12 -04:00
Angel Perez
ad252ca835 Translations can be updated correctly 2018-07-26 20:49:00 -04:00
rgarcia
82f496ccfa Fix globalization for information texts 
Refactoring and making similar specs to the milestones globalization specs
 2018-07-26 20:48:56 -04:00
Angel Perez
0e82fa72a2 Do not translate original I18n value on label 2018-07-26 19:09:01 -04:00
Angel Perez
079124e3dd Show current translation or I18n value for locale on textarea 2018-07-26 19:08:50 -04:00
Angel Perez
42eb784922 Add specs for basic Admin Globalize feature 2018-07-26 19:08:42 -04:00
Angel Perez
dd42b7ffbd Correctly highlight 'Custom information texts' option on menu if active 2018-07-26 19:08:02 -04: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
Angel Perez
26965b43ee Clean I18n codebase 2018-07-26 19:06:29 -04:00
Raúl Fuentes
6d6dc32c38 Complete basic I18n backend and frontend 2018-07-26 19:06:19 -04:00
Raúl Fuentes
c18479e3ac Add translations management pages 
In the admin section of the application, a new page
has been added so that the admins are able to manage
the selected texts for translate.

The texts have been divided in different "sections",
depending on the nature of themselves (budgets, polls,
proposals, management, etc.). Each section has become a tab
with a form associated to edit all the texts for her.

When a language is added, it's added for ALL the texts in the
application. That means that, if an admin adds french for debates,
the french form will appear for the rest of the texts. That doesn't
mean that they need to fill all the texts, only that the languages
work for all of them instead of individually.
 2018-07-26 19:05:58 -04:00
Ziyan Junaideen
9bad639bb5 i18n usage - typo + sub navigation using new keys 2018-07-26 22:55:49 +05:30
Ziyan Junaideen
a37b64dfb6 i18n desc for content block known keys + use in select in form 2018-07-26 22:55:49 +05:30
Ziyan Junaideen
494493214c Revert "Hiding help if there is a left/right content block" 
This reverts commit 6eeb7bfdaef9d370892fe0cc03635b45b29e2036.
 2018-07-26 22:55:49 +05:30
Ziyan Junaideen
4ee2c20253 Hiding help if there is a left/right content block 2018-07-26 22:55:49 +05:30
Ziyan Junaideen
7fb4d10989 Not showing top links if content block exist 2018-07-26 22:55:49 +05:30
Ziyan Junaideen
5b6a6b5324 Changed keys for locations 2018-07-26 22:55:49 +05:30
Ziyan Junaideen
b95aa5d912 Sub nav content positions 2018-07-26 22:55:49 +05:30
María Checa
f1e7b634ba Adds moderate actions to proposal system notifications 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
María Checa
15a07ad4eb Adds logic to show 'see results' button only for finished budgets 2018-07-26 14:31:42 +02:00
Alberto
db44dd1226 Merge pull request #2720 from wairbut-m2c/backport/moderation-index-positioning 
Fix moderation index views information positioning
 2018-07-26 14:18:11 +02:00
Alberto
b04b1bee46 Merge pull request #2801 from consul/proposal_authors_notifications 
Prevent authors from receiving their own proposals notification emails
 2018-07-26 14:12:14 +02:00
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
Alberto
52a2931fcb Merge pull request #2798 from consul/activity_fix 
Adds logic to handle activity actionable attributes
 2018-07-26 12:58:33 +02:00
María Checa
a62b5c1492 Removes author from Proposal#users_to_notify 2018-07-26 12:51:34 +02:00
Alberto
ad7166166c Merge pull request #2796 from consul/remove_see_results_button 
Removes permissions for admins to access unfinished budget results
 2018-07-26 12:16:26 +02:00
María Checa
22210c46d0 Adds logic to handle activity actionable attributes 2018-07-26 11:46:35 +02:00
Alberto
25feaafce5 Merge pull request #2794 from consul/fix_notifiable_delegation 
Try if notifiable has notifiable methods
 2018-07-26 11:33:23 +02:00