Commit Graph

7983 Commits

Author SHA1 Message Date
María Checa
ecaf7192c5 Merge branch '1647-locale_site_customization' of https://github.com/MariaCheca/consul into 1647-locale_site_customization 2017-07-03 12:59:09 +02:00
María Checa
3e2cbabc9c Locales helper improvement
Added a rescue block in `name_for_locale()` to ensure the application doesn't crash in case it receives an invalid locale.
2017-07-03 12:55:22 +02:00
María Checa
da2b55942a Added specs for custom pages
New test to check pages are rendered in their matching locale.
2017-07-03 12:53:12 +02:00
Raimond Garcia
b3638e601b Merge pull request #1715 from entantoencuanto/issue#1674-processes_controller_finder_compatibility
Avoid set_process on legislation/processes controller member actions
2017-07-03 12:07:58 +02:00
María Checa
599c805c77 Update schema.rb 2017-07-02 23:28:29 +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
6f24c68ab5 Improved pages index
Locale can be seen as text instead of the code.
2017-07-02 23:12:47 +02:00
María Checa
67145c0771 Added new locales 2017-07-02 22:14:41 +02:00
María Checa
ff4455212f Reverted unnecessary change 2017-07-02 22:14:33 +02:00
María Checa
dca346bd4c Fixed tests
Added new custom pages attribute to tests to make them run properly.
2017-07-02 22:13:40 +02:00
María Checa
8894ec4f7c Pages form improvements
Added `locale` validation to model and improved its form select tag performance.
2017-07-02 21:28:13 +02:00
María Checa
ed7b7f0361 Added scope to pages model
New scope to use when listing pages to show only the ones with current locale.
2017-07-02 14:54:11 +02:00
María Checa
f3b8d70d12 Added new locale to pages form 2017-07-02 14:50:57 +02:00
María Checa
720a2af046 Update pages controller and views
Added new attribute `locale` to pages index list and form.
2017-07-02 14:49:56 +02:00
María Checa
d5560ddabd Created migration to add locale to site_customization_pages 2017-07-02 14:47:13 +02:00
Eduardo Martinez Echevarria
9324b02ce1 Avoid set_process on legislation/processes controller member actions 2017-07-01 12:39:16 +02:00
Bertocq
d31e0ed79b Bring set_process back to legislation process controller, still needed until is correctly loaded 2017-07-01 02:05: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
87fc8e8fdd Update db/schema.rb 2017-06-30 15:49:10 +02:00
Eduardo Martinez Echevarria
331976e3b5 Make explicit the creation of legislation processes as published in db/seeds 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
a599a0b91e Set legislation processes visibility depending on publication 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
0bc318c823 Add tests to check visibility of processes depending on published attribute 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
3e5c5d7e49 Define some actions on legislation processes as member actions 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
dfa9c988ad Add checkbox to set published in process admin management 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
bf5dec2602 Add published column to legislation_processes table 2017-06-30 15:08:23 +02:00
Raimond Garcia
08fc256b8c Merge pull request #1640 from entantoencuanto/issue#1575-tag-administration
Issue #1575 tag administration
2017-06-30 10:43:55 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
Bertocq
76ac788823 Improve Readme with PRs-welcome badge, plus PR guide link
Why:

* Try to make the repo more friendly for first time contributors and any contributor on general

How:

* Adding a PRs-welcom badget that links to the issues list filtered by PRs-welcome label
* Adding a Link to on the Contributing guide to a free course about Pull Request and Contributions on Github.
2017-06-29 18:32:26 +02:00
Raimond Garcia
f24256c13f Merge pull request #1711 from consul/annotation-legislation
Annotation on legislation
2017-06-29 13:33:03 +02:00
decabeza
fe069b6be9 changes hex to hsla colors 2017-06-28 16:33:02 +02:00
BertoCQ
11e2950eae Merge pull request #1709 from consul/chore/rubocop_fixes
Rubocop fixes
2017-06-28 16:24:45 +02:00
Bertocq
c4ba35bf63 Revert rubocop autocorrections and add it to exclusion list on rubocop_todo file 2017-06-28 14:33:34 +02:00
Bertocq
c16b0cba4d Disable Style/EmptyMethod rubocop rule after debate agreement 2017-06-28 14:12:51 +02:00
Bertocq
904e3fdcfa Fix all Style/HashSyntax rubocop issues and remove from rubocop_todo list 2017-06-28 14:12:51 +02:00
Bertocq
c9bc028524 Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file 2017-06-28 14:12:51 +02:00
Bertocq
775da2d581 Remove all Layout/EmptyLines issues on code and file list from rubocop_todo 2017-06-28 14:12:51 +02:00
Bertocq
2fa92937d2 Fix all Style/BracesAroundHashParameters rubocop issues and remove them from rubocop_todo list 2017-06-28 14:12:51 +02:00
decabeza
ef1a416b50 improves color palette for annotation weights 2017-06-28 13:40:44 +02:00
decabeza
a97130934a fixes text on publish comment button 2017-06-28 13:40:37 +02:00
BertoCQ
d2a06f99bf Merge pull request #1679 from consul/feature/add_population_to_budget_heading
Add Population field to Budget Headings
2017-06-28 10:55:02 +02:00
Bertocq
c96d58df75 Add population value to dev seed budget headings 2017-06-27 23:28:22 +02:00
Bertocq
97a7cb71d0 Add population value to Budget Heading factory 2017-06-27 23:25:28 +02:00
Bertocq
57f476c2fa Merge branch 'master' into feature/add_population_to_budget_heading 2017-06-27 18:43:24 +02:00
Raimond Garcia
db43b4876c Merge pull request #1701 from consul/chore/rubocop_todo_cleanup
Rubocop todo list cleanup: The Space Party 🚀
2017-06-27 15:27:17 +02:00
Raimond Garcia
2ad4959c42 Merge pull request #1706 from consul/refactor_test
Refactor comments partial
2017-06-27 15:25:41 +02:00
Raimond Garcia
e5fc7de074 Merge pull request #1707 from consul/railsup
Rails version up to 4.2.9
2017-06-27 15:17:37 +02:00
Raimond Garcia
cce9041279 Merge pull request #1708 from consul/help-text
Help texts on forms
2017-06-27 15:16:37 +02:00
Juanjo Bazán
10d418efd8 rails up to 4.2.9 2017-06-27 11:37:37 +02:00
decabeza
af7807ce9f Updates custom note class to foundation help-text 2017-06-27 10:29:36 +02:00