14 Mar, 2016

1 commit

  • 605725ff   Fixing tests ... Browse Dir » 
    4 failures, 0 errors

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Alexandre Barbosa
     

29 Feb, 2016

1 commit

  • 3939a7eb   Fixing strings for html_safe ... Browse Dir » 
    Signed-off-by: Victor Costa <vfcosta@gmail.com>

 Conflicts:
	app/controllers/my_profile/profile_editor_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/blog_helper.rb
	app/helpers/boxes_helper.rb
	app/helpers/manage_products_helper.rb
	app/views/account/login.html.erb
	app/views/content_viewer/_article_toolbar.html.erb
	public/designs/themes/base/footer.html.erb
	test/functional/events_controller_test.rb
	test/functional/friends_controller_test.rb
    Carlos Purificação
     

26 Feb, 2016

1 commit

25 Feb, 2016

1 commit

  • ea20a3dc   Merge branch 'fix-article-comments-ordering' into 'master' ... Browse Dir » 
    Fix article comments ordering

Fix article's comments ordering bug (had wrong logic before correction) and pagination missing bug (js was overwriting pagination after ajax request).

References:

https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/630
https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/632

See merge request !792
    Rodrigo Souto
     

23 Feb, 2016

1 commit

  • 3af4b045   private-articles: creating dbm files do filter private files access thorugh web server ... Browse Dir » 
    Also rewriting the file visualization to work consistently with every
file type. Here is the overall basic behavior now:

  * If the request is passed with view=true, content is displayed
    as an article content.
    * If the file has an inline visualization (like images) it's already
      displayed.
    * If not, a download link is displayed.
  * If the request is passed with view=false, the file is provided
    straight, without any noosfero layout being loaded.

  * If the file is private:
    * And the user accesses its public filesystem path, apache (this is
      done by noosfero-apache) will redirect the request to rails
      path so that the rails server will provide it considering
      appropriate permissions.
    * And the user accesses its rails path, rails server will provide as
      well.
  * If the file is public:
    * And the user accesses its public filesystem path, apache will
      provide the file.
    * And the user accesses its rails path, rails server will redirect
      to its public filesystem path so that apache provides the file.
    Rodrigo Souto
     

22 Feb, 2016

6 commits

18 Feb, 2016

1 commit

22 Jan, 2016

1 commit

28 Dec, 2015

1 commit

14 Dec, 2015

1 commit

09 Dec, 2015

1 commit

08 Dec, 2015

1 commit

04 Dec, 2015

1 commit

  • 0c7ed580   Organization Ratings plugin improvements ... Browse Dir » 
    - Adds hostspot in Organization Rating task details
- Improvements on task and organization ratings layout
- Added one hotspot for task contents and another for ratings container content
- Rejected rating comments are only displayed to env admins and comment owners
- All task messages now refers to "a Report" instead of Comment:
  i.g. "Report waiting for approval" instead of "Comment waiting for approval"
- Also added css style to auto expand task div

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>

See merge request !737
    Gabriel Silva
     

18 Nov, 2015

1 commit

  • 7be7e7c6   Add custom field feature to core ... Browse Dir »
    1 
    Custom fields can be added to any profile through the admin panel
in the 'Fields' section. They have the same behaviour as the current
Noosfero's fields (active, signup, required and privacy).

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     

12 Nov, 2015

1 commit

03 Nov, 2015

3 commits

29 Oct, 2015

1 commit

28 Oct, 2015

2 commits

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
     

07 Oct, 2015

1 commit

06 Oct, 2015

2 commits

05 Oct, 2015

1 commit

03 Oct, 2015

1 commit

02 Oct, 2015

3 commits

29 Sep, 2015

1 commit

28 Sep, 2015

1 commit

26 Sep, 2015

3 commits