NoosferoGov / noosfero

17 May, 2016

1 commit

71faccf7 Merge branch 'master' into staging ... Browse Dir »
```
Conflicts:
	app/views/shared/not_found.html.erb
```
Victor Costa
2016-05-17 13:22:32 -0300

16 May, 2016

1 commit

776ca7bc html_safe: Always return button_bar value to template Browse Dir »

Braulio Bhavamitra
2016-05-16 11:47:10 -0300

05 May, 2016

2 commits

d7794fe7 merge with master Browse Dir »

Leandro Santos
2016-05-05 17:51:14 -0300
ea29ebc4 fix html escape of comment title Browse Dir »

Leandro Santos
2016-05-05 17:07:26 -0300

25 Apr, 2016

1 commit

13e6bd4a Merge branch 'master' into staging ... Browse Dir »

Conflicts:
	.travis.yml
	app/controllers/my_profile/tasks_controller.rb
	app/helpers/application_helper.rb
	app/views/profile_editor/_pending_tasks.html.erb
	app/views/tasks/processed.html.erb
	test/functional/tasks_controller_test.rb

2016-04-25 10:15:32 -0300

18 Apr, 2016

1 commit

dab58951 Fixing html_safe for noosfero core ... Browse Dir »

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

2016-04-18 07:50:07 -0300

08 Mar, 2016

1 commit

4d9daa44 Merge branch 'master' into staging Browse Dir »

Rodrigo Souto
2016-03-08 09:56:13 -0300

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

2016-02-25 17:34:52 +0000

22 Feb, 2016

2 commits

951fcb57 Fix article comments ordering bug ... Browse Dir »
```
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
```
Eduardo Vital
2016-02-22 17:07:02 -0300

45c0df82 Add feature: Article Followers ... Browse Dir »

- Every article can be followed so the user can receive notifications without
  having to comment on it

Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Caio SBA <caio@colivre.coop.br>
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Signed-off-by: Evandro Jr <evandrojr@gmail.com>

2016-02-22 10:37:49 -0300

17 Nov, 2015

1 commit

92fbfd94 Merge branch 'master_rails4' into staging ... Browse Dir »

Conflicts:
	Gemfile
	Rakefile
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/tasks_controller.rb
	app/controllers/public/profile_controller.rb
	app/mailers/user_mailer.rb
	app/models/article.rb
	app/models/person.rb
	app/models/product_category.rb
	app/models/task.rb
	config/application.rb
	config/routes.rb
	lib/acts_as_having_settings.rb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/helpers.rb
	lib/noosfero/api/session.rb
	lib/noosfero/api/v1/articles.rb
	lib/noosfero/api/v1/contacts.rb
	lib/noosfero/api/v1/search.rb
	lib/noosfero/api/v1/users.rb
	test/functional/tasks_controller_test.rb
	test/unit/api/articles_test.rb
	test/unit/api/helpers_test.rb
	test/unit/api/people_test.rb
	test/unit/api/search_test.rb
	test/unit/api/session_test.rb
	test/unit/api/users_test.rb
	test/unit/person_notifier_test.rb
	test/unit/task_test.rb
	vendor/plugins/access_control/lib/acts_as_accessible.rb

2015-11-17 09:23:22 -0300

24 Jul, 2015

1 commit

fafb323e rails4: fix most functional tests Browse Dir »

Braulio Bhavamitra
2015-07-24 17:55:22 -0300

26 Feb, 2015

1 commit

0d3ca253 fix conflit with master Browse Dir »

Leandro Santos
2015-02-26 10:38:14 -0300

25 Feb, 2015

1 commit

7ce466a9 Rename Comment::Notifier to CommentNotifier Browse Dir »

Antonio Terceiro
2015-02-25 18:34:10 -0300

24 Feb, 2015

2 commits

bd5cf3a6 Abstract core to use standard and replaceable helpers Browse Dir »

Braulio Bhavamitra
2015-02-24 13:10:41 -0300
0531c6a2 merging with master Browse Dir »

Leandro Santos
2015-02-24 11:37:25 -0300

22 Feb, 2015

1 commit

eed38cd8 Move to modal api Browse Dir »

Braulio Bhavamitra
2015-02-22 20:13:00 -0300

29 Jan, 2015

1 commit

da3e25aa Revert "Merge branch 'fix_lazy_queries' into stable" ... Browse Dir »

This reverts commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785, reversing
changes made to a0ef4f259127426b96f8a8ba2bbb2c18c67bf980.

This reverts commit b8304468ef6de86accdfd442c889f30b2fdd9539, reversing
changes made to ed4938b5272fb57a714c84c3443c7d329c9407aa.

This reverts commit 77ee15d0896424d4c02de0a61ad8922e5b38304c, reversing
changes made to b52c66dba90218f9dd21b10dee85e293ccf52aa7.

This reverts commit a0ef4f259127426b96f8a8ba2bbb2c18c67bf980, reversing
changes made to 5c4d0723fb8977e29f0e208e6d3c609933281cec.

2015-01-29 08:51:51 -0300

23 Dec, 2014

2 commits

1cd31972 Merge branch 'sanitize_comment' into stable Browse Dir »

Victor Costa
2014-12-23 11:00:08 -0300
c7b916ab Sanitize comment title and body Browse Dir »

Victor Costa
2014-12-23 10:58:55 -0300

30 Oct, 2014

1 commit

ae2c7ab3 Include relation models in comment children Browse Dir »

Victor Costa
2014-10-30 17:09:30 -0300

13 Aug, 2014

1 commit

13f3dd76 Merge branch 'AI3250-fix_comment_form_captcha' into 'master' ... Browse Dir »
```
Ai3250 fix comment form captcha

http://noosfero.org/Development/ActionItem3250

See merge request !280
```
Antonio Terceiro
2014-08-13 19:20:14 +0000

31 Jul, 2014

1 commit

5164ee04 Fix recaptcha colorbox panel in comment form Browse Dir »

Victor Costa
2014-07-31 10:44:51 -0300

30 Jul, 2014

1 commit

3cf0e32c Rename views of plain text emails from html.erb to text.erb ... Browse Dir »
```
With html.erb the content_type is wrongly set to text/html.
```
Victor Costa
2014-07-30 11:20:23 -0300

10 Jul, 2014

1 commit

31323dca Fix comment_form_extra_contents hotspot Browse Dir »

Victor Costa
2014-07-10 09:33:04 -0300

03 Jul, 2014

1 commit

35f39301 view-page: fix comment references Browse Dir »

Rodrigo Souto
2014-07-03 21:02:08 +0000

14 May, 2014

1 commit

65e255c9 rails3: fix menu for comment actions Browse Dir »

Victor Costa
2014-05-14 16:55:50 -0300

13 May, 2014

1 commit

a39c63db Replace instance_eval by instance_exec to avoid api break ... Browse Dir »
```
http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead
```
Rodrigo Souto
2014-05-13 20:38:15 +0000

13 Feb, 2014

1 commit

ef0730cc rails3: fix unit tests Browse Dir »

Victor Costa
2014-02-13 17:14:51 -0300

11 Feb, 2014

2 commits

1f0194be Merge branch 'master' into rails3-merge ... Browse Dir »

Conflicts:
	app/views/profile_themes/add_css.rhtml
	app/views/profile_themes/add_image.rhtml
	app/views/profile_themes/css_editor.rhtml
	app/views/profile_themes/edit.rhtml
	app/views/profile_themes/new.rhtml
	app/views/themes/add_css.html.erb
	app/views/themes/add_css.rhtml
	app/views/themes/add_image.html.erb
	app/views/themes/add_image.rhtml
	app/views/themes/css_editor.html.erb
	app/views/themes/css_editor.rhtml
	app/views/themes/edit.html.erb
	app/views/themes/edit.rhtml
	app/views/themes/index.html.erb
	app/views/themes/new.html.erb
	app/views/themes/new.rhtml
	test/factories.rb
	test/functional/profile_themes_controller_test.rb

2014-02-11 18:00:35 -0300

e9fea38f Merge branch 'master' into rails3-merge ... Browse Dir »

Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

2014-02-11 17:35:19 -0300

10 Feb, 2014

1 commit

bfaf1bdd Added hotspots for comments Browse Dir »

Daniela Feitosa
2014-02-10 10:13:28 +0000

31 Jan, 2014

1 commit

4badf6ba comment-reply-feature: add reply title and fix test Browse Dir »

Rodrigo Souto
2014-01-31 18:25:13 +0000

29 Jan, 2014

1 commit

9883b50d rails3: fix comment_controller Browse Dir »

Victor Costa
2014-01-29 10:24:34 -0300

28 Jan, 2014

1 commit

caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

22 Jan, 2014

1 commit

057e255f rails3: rename *.rhtml to *.html.erb Browse Dir »

Victor Costa
2014-01-22 11:25:50 -0300

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

06 Jan, 2014

1 commit

3e8bfd50 application-helper: refactor gravatar logic Browse Dir »

Rodrigo Souto
2014-01-06 19:27:45 +0000

05 Dec, 2013

1 commit

0b0ad50d Added a way to include a comment action outside menu Browse Dir »

Victor Costa
2013-12-05 11:21:39 -0300

06 Sep, 2013

1 commit

15e4262a rails3: fix comment_notifier Browse Dir »

Rodrigo Souto
2013-09-06 02:43:22 +0000