BertoCQ
48cc2f03a2
Merge pull request #1724 from consul/feature/add_investment_selected_checbox
...
Add investment selected checbox & improve view
2017-07-05 13:11:48 +02:00
Bertocq
343da2d58e
Improve admin investment view with selection/compatibility/winner flags on top
2017-07-05 11:26:59 +02:00
Bertocq
16f295ea0b
Fix english translation for Heading, typo from Spanish
2017-07-04 23:54:04 +02:00
Bertocq
e35817f240
Add selected checkbox on admin investment form
2017-07-04 23:48:18 +02:00
Raimond Garcia
e7e5b3c4a3
Merge branch 'master' into 1647-locale_site_customization
2017-07-04 12:11:07 +02:00
Bertocq
10c299d19f
Add to public Budget Results page winners, discarded and incompatible listing
2017-07-04 01:34:25 +02:00
Bertocq
688ec05ea2
Replace winner column for incompatible on admin investment list filter by selected
2017-07-04 01:34:24 +02:00
Bertocq
646b3657ee
Add investment status on admin budget investment detail show page
2017-07-04 01:34:24 +02:00
Bertocq
afc77f68fb
Add incompatible checkbox on admin investment edit form
2017-07-04 01:34:24 +02:00
Bertocq
c8b36719aa
Add missinng translation for admin budget investments winners filter label
2017-07-03 13:59:59 +02:00
María Checa
36d51b380b
Merge branch 'master' into 1647-locale_site_customization
2017-07-02 23:19:40 +02:00
María Checa
67145c0771
Added new locales
2017-07-02 22:14:41 +02:00
María Checa
f3b8d70d12
Added new locale to pages form
2017-07-02 14:50:57 +02:00
Raimond Garcia
d2ea4cac86
Merge pull request #1714 from entantoencuanto/issue#1674-enabled_legislation_process
...
Issue#1674 enabled legislation process
2017-06-30 18:24:59 +02:00
Bertocq
194d5de1b3
Fix english translation, was on spanish
2017-06-30 16:31:42 +02:00
Eduardo Martinez Echevarria
3e5c5d7e49
Define some actions on legislation processes as member actions
2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79
Merge branch 'master' into issue#1575-tag-administration
2017-06-29 19:09:54 +02:00
Bertocq
57f476c2fa
Merge branch 'master' into feature/add_population_to_budget_heading
2017-06-27 18:43:24 +02:00
decabeza
af7807ce9f
Updates custom note class to foundation help-text
2017-06-27 10:29:36 +02:00
Raimond Garcia
f41d3637cf
Merge pull request #1678 from consul/feature/1601#budget_winner_investments_button
...
Add button to Calculate Budget Winner investments
2017-06-26 17:41:08 +02:00
taitus
fee9e99d37
Add translation to published milestone. Fix test
2017-06-26 13:52:25 +02:00
taitus
64ff75c384
Add displaying no_milestones text on admin
2017-06-26 13:48:25 +02:00
Bertocq
9f05cda5c3
Add text translations for new population field on Budget Heading for admin panel
2017-06-25 15:47:46 +02:00
Bertocq
47c0b25f9c
Add text translations for both admin budget winners calculate and calculated texts
2017-06-25 15:47:04 +02:00
Bertocq
154cdac332
Add calculate_winners on Admin Budget controller, route and ability for admins
2017-06-25 15:47:04 +02:00
taitus
c58371a5fe
Add milestones to investments show.
2017-06-24 22:38:48 +02:00
taitus
87eeb45584
Rename Seguimiento to Hito.
2017-06-24 22:38:48 +02:00
taitus
f220952883
Add CRUD Milestone on Admin::BudgetInvestment. Rename Checkpoint to Milestone.
2017-06-24 22:38:48 +02:00
decabeza
44b5403db5
improves styles and texts of share proposal view
2017-06-23 18:19:43 +02:00
Eduardo Martinez Echevarria
e60ffa3c00
Remove featured attribute management on admin/tags
2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
8dd52110db
Use category scope instead of condition on kind on Tag
2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
debc98ac99
Add category scope and category? method to ActsAsTaggableOn::Tag
2017-06-23 17:34:55 +02:00
Raimond Garcia
6667494629
Merge pull request #1670 from consul/feature/1601#generate_budget_heading_winners
...
Add Budget Investments filter by winners
2017-06-21 17:53:01 +02:00
Bertocq
4fd3eb643a
Add translations for Admin Budget Investments list filter by winner
2017-06-21 01:33:45 +02:00
Bertocq
04b8ac36ad
Remove trailing whitespaces on french yml files
2017-06-20 01:01:01 -07:00
Juanjo Bazán
315c57929a
allows managers to create users without email
...
allows managers to create users without email
hides email preferences from account page for email-less users
prevents email delivery to users with no email
adds spec for user creation from management
adds specs for user's email requirement
adds spec for no deliveries if no email
2017-06-19 13:02:48 +02:00
rgarcia
0323f8ea36
adds en.yml translations for crowdin
2017-06-17 12:03:07 +02:00
rgarcia
6a5354dac4
refactors rails.nl.yml
2017-06-17 11:40:30 +02:00
Raimond Garcia
eb829837dc
Merge pull request #1615 from waagsociety/dutch
...
Dutch
2017-06-17 10:56:31 +02:00
Raimond Garcia
ba5216b725
Merge pull request #1552 from cldha/master
...
Add French translation
2017-06-17 10:56:09 +02:00
rgarcia
3a50cc3a99
Enables GraphQL UI in production
2017-06-15 12:12:41 +02:00
Juanjo Bazán
9ab0f9cf8b
Merge branch 'master' into amiedes-api-dev-PRs-2
2017-06-14 12:46:58 +02:00
kikito
782a68e9d3
Merge branch 'master' into amiedes-api-dev-PRs-2
2017-06-14 09:58:17 +02:00
Bertocq
33e825672c
Rename label for legislation process active checkbox to enabled on both translations and form
2017-06-13 23:56:31 +02:00
Bertocq
e55328caf4
Rename legislation process final_version_publication phase name to more descriptive result_publication
2017-06-13 22:04:36 +02:00
Bertocq
0c27f1ffde
Rename Legislation Process final_publication_date field to more descriptive result_publication_date
2017-06-13 22:04:36 +02:00
kikito
a580e60786
refactor public_for_api acts_as_taggable scopes
2017-06-13 16:14:24 +02:00
Raimond Garcia
300634443c
Merge pull request #1645 from consul/login-by-username
...
Allow users to login using username
2017-06-13 13:23:49 +02:00
kikito
1701111bf5
Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2
2017-06-13 12:07:28 +02:00
Juanjo Bazán
3f11dbe1d5
allows login using username or email
2017-06-12 17:26:38 +02:00
