09 May, 2016

1 commit

  • 141c0c41   update calendar icon ... Browse Dir » 
    also:
* change '.event-dates' CSS rule to be more general on base theme
* update selected border style for LinkListBlock

Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
    Joenio Costa
     

27 Apr, 2016

1 commit

  • 31868a1a   Move products into a plugin ... Browse Dir » 
    This will many further improvements to the products, such as:
- Interaction with other plugins such as suppliers, stock and
currencies. The inteface can change in such a way that if done
usings hotspots would hurt usability and coherence.
- More autonomy to develop and integrate other features
(in the next months we will integrate batch edition and stock,
currencies might come next)
- More declouping from core and other components
    Braulio Bhavamitra
     

13 Apr, 2016

1 commit

  • d755b3b7   New feature archive articles ... Browse Dir » 
    - Avoid create comments, associate children articles and perform votes on archived articles
- Update db/schema

-Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
-Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com>
-Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

(cherry picked from commit 144d608f15e2864e8053d384e871699d314a9283)
    Michel Felipe
     

13 Oct, 2015

1 commit

  • 66c7b785   Block store: improve usability of adding/moving blocks ... Browse Dir » 
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>

Conflicts:
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/boxes_helper.rb
	app/helpers/layout_helper.rb
	app/views/layouts/_javascript.html.erb
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb
	test/functional/profile_design_controller_test.rb
    Victor Costa
     

19 Aug, 2015

1 commit

  • 121912b3   Merge branch 'shopping-cart-with-orders-and-delivery-plugins' ... Browse Dir » 
    Conflicts:
	Gemfile
	app/models/profile.rb
	plugins/shopping_cart/lib/shopping_cart_plugin.rb
	plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
	plugins/shopping_cart/po/de/shopping_cart.po
	plugins/shopping_cart/po/es/shopping_cart.po
	plugins/shopping_cart/po/fr/shopping_cart.po
	plugins/shopping_cart/po/hy/shopping_cart.po
	plugins/shopping_cart/po/pt/shopping_cart.po
	plugins/shopping_cart/po/ru/shopping_cart.po
	plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
	plugins/shopping_cart/views/cart.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
    Rodrigo Souto
     

17 Jun, 2015

1 commit

  • 5ddb93d8   Improved event display layout ... Browse Dir » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    André Guedes
     

14 Jun, 2015

1 commit

11 Jun, 2015

1 commit

12 May, 2015

1 commit

08 May, 2015

1 commit

22 Feb, 2015

1 commit

18 Aug, 2014

1 commit

28 Jul, 2014

1 commit

22 Jul, 2014

1 commit

28 Mar, 2014

1 commit

  • b15b9498   Link_List_Block_Improvements: Add Drag and Drop and auto-complete to LinkListBlock ... Browse Dir » 
    (ActionItem2582)

- Changed link list html structure from table to ul/li
- Added image that indicates draggable area
- Added Drag and Drop javascript
- Added button that delete the link
- Added auto complete to Address field
- Corrected syntax error on token_helper

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
    Fabio Teixeira
     

25 Dec, 2012

1 commit

23 Dec, 2012

1 commit

03 Dec, 2012

1 commit

15 Nov, 2012

1 commit

08 Nov, 2012

1 commit

06 Nov, 2012

1 commit

21 Aug, 2012

1 commit

  • 5853fd51   UI to mark comments as ham ... Browse Dir » 
    Additionally, I have made the "Mark as SPAM" and "Remove" links in the
page view comment listing work through AJAX, so that now it is much more
practical to remove comments or mark them as spam.

ActionItem2306
    Antonio Terceiro
     

20 Jul, 2012

1 commit

19 Jul, 2012

1 commit

  • 75524307   Merging AI1826 with master ... Browse Dir » 
    Conflicts:
	app/models/article.rb
	app/models/profile.rb
	app/models/uploaded_file.rb
	public/javascripts/application.js
	public/stylesheets/application.css
	test/unit/article_test.rb
	test/unit/category_finder_test.rb
	test/unit/enterprise_test.rb
    Daniela Feitosa
     

18 Jul, 2012

1 commit

15 Jun, 2012

1 commit

17 May, 2012

4 commits

19 Feb, 2012

1 commit

  • 50def845   Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse Dir » 
    Conflicts:
	app/controllers/application.rb
	app/controllers/public/browse_controller.rb
	app/helpers/application_helper.rb
	app/helpers/display_helper.rb
	app/models/environment_finder.rb
	app/models/product.rb
	app/views/layouts/_javascript.rhtml
	app/views/layouts/application-ng.rhtml
	public/javascripts/application.js
	public/stylesheets/application.css
	test/functional/browse_controller_test.rb
	test/functional/search_controller_test.rb
	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
    Rafael Martins
     

07 Feb, 2012

1 commit

24 Jan, 2012

1 commit

16 Jan, 2012

2 commits

24 Dec, 2011

2 commits

22 Dec, 2011

1 commit

  • c11ada20   Redesigned Catalog ... Browse Dir » 
       *  Moved JS to public/js/catalog.js
   *  Modified app/model/product for better readability
   *  New file with JS previously from app/views/catalog/index
   *  Bits of static CSS from app/views/catalog/index
   *  Reorganized bits of static CSS and moved JS into public
   *  Removed price composition features from browse_catalog
   *  Changed view to reflect removing Product price composition
   *  Changed Product to not return price composition yet
   *  This will work only after AI1413
        Changed feature to reflect the image id change
   *  Changed the image id to "product-image-link" to avoid conflict
   *  Changed product order on the catalog from id to name
   *  Moved some tests from unit to feature
   *  test/unit/enterprise_homepage_test had view tests
        New steps to support new features
   *  Commented some failing @selenium scenarios
   *  Added FIXME comments with probable reasons
   *     Commented out failing scenarios with known reasons
   *  Fixed a broken scenario on features/browse_enterprises
   *  Fixed features/admin_categories
   *  New step for clicking and sleep X seconds
        A few steps to support the updated feature
   *  Updated the browsing catalog feature
   *  Added a few id's on tags to help the testing
   *  Two images used on the catalog features
   *  Corrected small typo.
   *  New features for browsing catalgos, a new step to support the features and a small modification on the catalog view partial.
   *  New feature for browsing enterprises and testing the 'products' link
   *  A few changes on steps to support the new feature.
   *  New feature for browsing enterprise catalogs.
   *  Fixed a small typo on #product-list and the number of items per page.
   *  Fixed expected number of products per page and expected tag for product price.
   *  Removed one test from catalog that doesn't make sense on the new layout.
   *  Fixed enterprise_homepage_test; test cases with 'display' on the title will be moved to another context (controller or view).
   *  Commented one of the functional test cases: --- test_should_back_when_update_address_fail(MapsControllerTest)
   *  Remove separation lines between products
   *  Fixed 2 test cases on HighlightBlocksTest: * 'should_list_images_randomically' had only 3 mocked figures, but five are being handled; * 'should_not_list_non_existant_image' wasn't expecting a call for the non- existant image, but this call is made and should return nil.
   *  Fix price display and layout
   *  Fix oversized price line
   *  Fix bar css
   *  Fix height of catalog boxes
   *  Fix layout
   *  Fix unit getter
   *  Improve css for no-image
   *  Add no image label
   *  Beautiful catalog for enterprises
    Rafael Martins
     

15 Feb, 2011

1 commit

26 Jan, 2011

1 commit

  • e7464a3d   Multitask ... Browse Dir » 
    + Multi-processing tasks.
  + Graciously show/hide functions with the smooth slide of
  + Jquery. ^^
  + Using Unobtrusive Javascript.
  + Customized messages for each task type.
  + Button "Set all to approve/reject/skip".
  + Icons related to the task action.

  * Missing
    - Need to make selenium tests.

(ActionItem1527)
    Rodrigo Souto