NoosferoGov / noosfero

13 Feb, 2014

1 commit

59d5b8f6 rails3: adjust vote_fu to rails3 Browse Dir »

Victor Costa
2014-02-13 16:08:16 -0300

11 Feb, 2014

1 commit

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

04 Feb, 2014

2 commits

981b0c92 rails3: fix cms_controller tests Browse Dir »

Victor Costa
2014-02-04 16:53:21 -0300
e4246f5f rails3: set allowed tags for sanitization ... Browse Dir »
```
Also enable white list monkey patch to unescape html comments.
```
Victor Costa
2014-02-04 12:32:31 -0300

29 Jan, 2014

1 commit

79d66909 comment: remove comment_as_thread method ... Browse Dir »

This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899
and was mistakenly included on this merge
4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix
70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't
removed.

2014-01-29 20:32:15 +0000

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

27 Jan, 2014

1 commit

4d9c1b3f rails3: fix action_tracker ... Browse Dir »
```
- Change from returning to tap;
- Change from lambda to proc;
- Fix broken links.
```
Victor Costa
2014-01-27 17:40:35 -0300

23 Jan, 2014

3 commits

4b01e9da Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into … ... Browse Dir »
```
…sub_organizations_improvements
```
Joenio Costa
2014-01-23 22:03:46 -0300
82b30ccd rails3: fix html escape in json Browse Dir »

Victor Costa
2014-01-23 16:45:10 -0300
8cc32f38 rails3: fix render of access denied page Browse Dir »

Victor Costa
2014-01-23 16:43:17 -0300

21 Jan, 2014

1 commit

9c672bcf rails3: fix blog Browse Dir »

Victor Costa
2014-01-21 15:17:20 -0300

20 Jan, 2014

1 commit

171bb6e3 Move uniqueness validation from vote_fu to vote plugin ... Browse Dir »
```
(ActionItem2786)
```
Victor Costa
2014-01-20 18:44:42 -0300

17 Jan, 2014

4 commits

c052ed1e rails3: fix tests related to upload_file Browse Dir »

Victor Costa
2014-01-17 15:43:40 -0300
4ad91064 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000
72c34d1c rails3: fix observer creation for models in user_stamp Browse Dir »

Victor Costa
2014-01-17 13:30:49 -0300
0b31911b Make scope unions ... Browse Dir »
```
closes ActionItem2830
```
Aurélio A. Heckert
2014-01-17 11:25:35 -0200

15 Jan, 2014

2 commits

1e6dcfa7 rails3: replace acts_as_taggable_on_steroids by acts-as-taggable-on Browse Dir »

Victor Costa
2014-01-15 18:23:09 -0300
d2dc1474 Change vote plugin to remove votes when a voteable is removed Browse Dir »

Victor Costa
2014-01-15 12:55:46 -0300

10 Jan, 2014

1 commit

70c90e47 Fix: comments list when there is spam on thread ... Browse Dir »
```
(ActionItem2918)
```
Daniela Feitosa
2014-01-10 20:21:08 +0000

09 Jan, 2014

2 commits

bc9821dc rails3: update dispatcher reference Browse Dir »

Rodrigo Souto
2014-01-09 15:18:43 +0000

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

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000

03 Jan, 2014

2 commits

db23d209 Fix vote_fu search to handle polymorphic models Browse Dir »

Victor Costa
2014-01-03 14:45:30 -0300
edbc6fc1 Create infra to enable votes on articles and comments Browse Dir »

Victor Costa
2014-01-03 14:45:24 -0300

16 Dec, 2013

1 commit

b52015d9 Merge commit 'refs/merge-requests/376' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/376

Conflicts:
	db/schema.rb
```
Rodrigo Souto
2013-12-16 17:03:48 +0000

02 Dec, 2013

1 commit

bd4954d3 Merge branch 'master' into next-origin ... Browse Dir »

Conflicts:
	app/models/category.rb
	app/models/uploaded_file.rb
	test/functional/memberships_controller_test.rb
	test/functional/profile_controller_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2013-12-02 20:33:51 -0300

26 Nov, 2013

1 commit

f60a0173 action_tracker: show only non spam comments ... Browse Dir »
```
AI2784

Conflicts:
	vendor/plugins/action_tracker_has_comments/init.rb
```
Lucas Melo
2013-11-26 15:23:33 -0300

24 Nov, 2013

1 commit

2c2edc6e Removed whitespaces ... Browse Dir »
```
(ActionItem2899)
```
Daniela Feitosa
2013-11-24 05:21:44 +0000

22 Nov, 2013

2 commits

6b037511 named_scope_monkey_patch: move to solr plugin Browse Dir »

Rodrigo Souto
2013-11-22 16:46:13 -0300
7eb7d4bf solr_plugin: Convert scopes to solr filters Browse Dir »

Braulio Bhavamitra
2013-11-22 16:46:12 -0300

20 Nov, 2013

1 commit

ca5ebf95 Pagination of comments and replies on profile wall. ... Browse Dir »
```
The comments and replies are fetched only after the View all and More links are clicked.
```
Eduardo Tourinho Edington
2013-11-20 14:27:01 -0300

30 Oct, 2013

1 commit

d77120be Show object in exceptions notification of feed-updater and delayed_job Browse Dir »

Braulio Bhavamitra
2013-10-30 15:24:17 -0300

16 Oct, 2013

1 commit

286e4b52 rails3: fix person tests ... Browse Dir »
```
PS: tests failing due to birth_date lib and action_tracker problem
```
Rodrigo Souto
2013-10-16 15:42:16 +0000

08 Oct, 2013

1 commit

5de7fb8b Merge branch 'rails3' of gitorious.org:noosfero/noosfero into rails3 Browse Dir »

Rodrigo Souto
2013-10-08 18:54:56 -0300

04 Oct, 2013

1 commit

afaead97 Fixes ActionTracker crash on development mode ... Browse Dir »

  Loads action_tracker_has_comments plugin, that dynamically adds
  comments to ActionTracker::Record, before every request in development
  mode to avoid undefined method error.

(ActionItem2728)

2013-10-04 13:50:58 -0300

28 Sep, 2013

1 commit

a9898a1c rails3: fix uploaded_file tests ... Browse Dir »
```
PS1: the monkey_patch is not being loaded.
PS2: there are still some tests failing due to ActionTracker bug.
```
Rodrigo Souto
2013-09-28 01:23:26 -0300

24 Sep, 2013

2 commits

2cc91ce2 rails3: fix textile_article tests Browse Dir »

Rodrigo Souto
2013-09-24 23:41:25 +0000
e227e0e3 rails3: upgrading delayed_job Browse Dir »

Rodrigo Souto
2013-09-24 16:25:46 +0000

18 Sep, 2013

2 commits

bc0150d2 Make session data delete possible with active_record_store ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Braulio Bhavamitra
2013-09-18 16:25:38 -0300
4acbfa29 rails3: updating will_paginate library Browse Dir »

Rodrigo Souto
2013-09-18 00:28:35 +0000