07 Apr, 2016

1 commit

  • cd68aebb   Merge branch 'master_community_track' into 'master' ... Browse Dir » 
    fixes community track plugin

Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

See merge request !816
    Daniela Feitosa
     

05 Apr, 2016

2 commits

  • 8796893a   Merge branch 'email_template' into 'master' ... Browse Dir » 
    New feature: manage email templates

This MR depends on liquid ~> 3.0.3 and this version is not available on Debian Jessie, just in testing and unstable. So, I will upload ruby-liquid (3.0.4) to Noosfero Debian Jessie archive to satisfy it.

See merge request !814
    Rodrigo Souto
     
  • 11a81060   fixes community track plugin ... Browse Dir » 
    Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Marcos Pereira
     

04 Apr, 2016

1 commit

01 Apr, 2016

2 commits

31 Mar, 2016

3 commits

29 Mar, 2016

1 commit

  • 06162adb   Improve register performance ... Browse Dir » 
    - Send activation code with delayed job
- Avoid unecessary user save after update person

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Victor Costa
     

23 Mar, 2016

1 commit

  • 355a1dfc   task: keep filters applied to tasks after close action ... Browse Dir » 
    - Rename TasksHelper file
- Referencing TasksHelper in TaskController
- Refactoring task_action/url helper method
- Manage tasks feature
- Update SuggetstArticle step
- Adds functional test for keeping tasks filter

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Ábner Silva de Oliveira
     

15 Mar, 2016

1 commit

12 Mar, 2016

1 commit

03 Mar, 2016

1 commit

26 Feb, 2016

1 commit

  • 80ebad1f   Added filter section on profile members list ... Browse Dir » 
    - Adds use of filtered members to mailing queue executed by send_mail action

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

25 Feb, 2016

2 commits

  • 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
     
  • 1c3dc68d   Merge branch 'dbm-private-files' into 'master' ... Browse Dir » 
    Dbm private files

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.

The feature and debian package were tested and are still available for testing on: http://private-files.dev.colivre.net

See merge request !797
    Antonio Terceiro
     

23 Feb, 2016

2 commits

  • 2a045324   Adds tests to forum topic creation ... Browse Dir »
    1 
    Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Tallys Martins
     
  • 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

5 commits

16 Feb, 2016

1 commit

11 Feb, 2016

2 commits

  • ee2b501a   Merge branch 'suggest-article-crash' into 'master' ... Browse Dir » 
    Fixes crash when processing suggest an article task

- Removes an old line that was left behind during merge of support for
  different types of article. It was overriding the correct decision
  made by #article_type.
- Defines SuggestArticle#author_name the same as the sender so
  noosfero task page doesn't crash in case the processing of the task
  throws an error, since it will try to show the author name in the
  task error page.

  Fixes #166

See merge request !786
    Antonio Terceiro
     
  • a1e84d51   suggest_an_article: Fix crash when article type or author are blank ... Browse Dir » 
      - Removes an old line that was left behind during merge of support for
  different types of article. It was overriding the correct decision
  made by #article_type.
  - Defines SuggestArticle#author_name the same as the sender so
  noosfero task page doesn't crash in case the processing of the task
  throws an error, since it will try to show the author name in the
  task error page.

  Fixes #166
    Larissa Reis
     

05 Feb, 2016

1 commit

04 Feb, 2016

1 commit

29 Dec, 2015

1 commit

12 Dec, 2015

1 commit

01 Dec, 2015

3 commits

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

2 commits

28 Oct, 2015

1 commit

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