[Git][noosfero/noosfero][master] 4 commits: Fix product categories listing problem

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
7b11b05e by Karine Valença at 2017-09-20T02:19:22+00:00
Fix product categories listing problem

Signed-off-by: Karine Valença <valenca.karine at gmail.com>

- - - - -
cc7b16bd by Gabriel Silva at 2017-09-20T02:19:22+00:00
Adds hostspot to add custom category types

- Refactors categories page to use a generic structure
- Removes Product Category references from core

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
95f75e6e by Gabriel Silva at 2017-09-20T06:17:35+00:00
Changes categories page style

- New Style for category lists
- Fixes extra labels on New and Edit pages

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
684a9812 by Rodrigo Souto at 2017-09-26T11:41:24+00:00
Merge branch 'mr_noosfero_1055' into 'master'

Fixes/Improves categories admin pages

See merge request noosfero/noosfero!1126
- - - - -


30 changed files:

- app/controllers/admin/categories_controller.rb
- app/controllers/box_organizer_controller.rb
- app/helpers/application_helper.rb
- app/helpers/categories_helper.rb
- app/models/categories_block.rb
- app/models/category.rb
- app/views/box_organizer/_categories_block.html.erb
- app/views/categories/_category.html.erb
- app/views/categories/_form.html.erb
- app/views/categories/index.html.erb
- app/views/cms/_blog.html.erb
- app/views/memberships/new_community.html.erb
- app/views/profile_editor/edit.html.erb
- app/views/shared/_change_image.html.erb
- app/views/shared/_lead_and_body.html.erb
- app/views/shared/_show_thumbnail.html.erb
- + db/migrate/20170805065330_adds_default_type_to_categories.rb
- db/schema.rb
- features/admin_categories.feature
- features/blog.feature
- features/categories_block.feature
- lib/noosfero/plugin.rb
- plugins/newsletter/views/newsletter_plugin_admin/index.html.erb
- plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb
- − plugins/products/lib/ext/categories_helper.rb
- plugins/products/lib/products_plugin/base.rb
- + plugins/products/test/integration/category_list_test.rb
- plugins/products/views/products_plugin/page/_form.html.erb
- plugins/recent_content/features/add_recent_content.feature
- public/stylesheets/category.scss


The diff was not included because it is too large.


View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/9eb72466c9f015f58d3266cc3c417b5f1240b4b2...684a981226403b2834ceaf045008777c6ef09506

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/9eb72466c9f015f58d3266cc3c417b5f1240b4b2...684a981226403b2834ceaf045008777c6ef09506
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170926/779377eb/attachment.html>