Charles Oliveira / noosfero

07 Oct, 2013

1 commit

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

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

19 Sep, 2013

1 commit

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

Conflicts:
	app/helpers/blog_helper.rb
```
Rodrigo Souto
2013-09-19 17:40:33 -0300

29 Jul, 2013

1 commit

043b4c32 Fixing memory overload on blog with native translation feature ... Browse Dir »
```
(ActionItem2471)
```
Rodrigo Souto
2013-07-29 16:47:24 -0300

16 Jul, 2013

3 commits

f36e4843 Fixing comments counter ... Browse Dir »
```
Fixing the js method and also correcting the controller orders to
calculate the total count.
```
Rodrigo Souto
2013-07-16 21:23:08 -0300
f9324b42 [macro-support-review] Fixing comments count Browse Dir »

Rodrigo Souto
2013-07-16 16:49:47 -0300

5004be38 Merge commit 'refs/merge-requests/343' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/343

Also replacing the load_comments method by a filter that receives a
scope.

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	app/models/comment.rb
	app/views/content_viewer/view_page.rhtml
	test/functional/content_viewer_controller_test.rb
	test/unit/comment_test.rb

2013-07-16 16:36:56 -0300

15 Jul, 2013

1 commit

9a88a3f3 adding pagination for article's comments Browse Dir »

Leandro Nunes dos Santos
2013-07-15 13:32:36 -0300

13 Jul, 2013

3 commits

f65bac2a Removing protected from application controller Browse Dir »

Rodrigo Souto
2013-07-13 14:53:34 -0300
bb5134e1 [macro-support-review] Renaming manager first to dispatch_first ... Browse Dir »
```
Also renaming dispatch_plugins to fetch_plugins and first_plugin to
fetch_first_plugin
```
Rodrigo Souto
2013-07-13 14:31:06 -0300
ba61c659 Merge commit 'refs/merge-requests/283' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/283

Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2013-07-13 14:10:04 -0300

12 Jul, 2013

9 commits

63ea40d3 [comments-refactor-review] Moving edit/update check to a filter Browse Dir »

Rodrigo Souto
2013-07-12 18:24:05 -0300
4891d3e9 [comments-refactor-review] Removing obsolete FIXME's ... Browse Dir »
```
About the FIXME on the helper, I guess it can't hurt to support css
class throught the options parameter.
```
Rodrigo Souto
2013-07-12 18:23:14 -0300
947607f0 [comments-refactor-review] Testing permissions to edit comment too Browse Dir »

Rodrigo Souto
2013-07-12 16:55:09 -0300
cff3d5b7 [comments-refactor-review] Removing unnecessary code Browse Dir »

Rodrigo Souto
2013-07-12 16:26:05 -0300
08b5be5b [comments-refactor-review] Encapsulating comment mark_as_spam check Browse Dir »

Rodrigo Souto
2013-07-12 16:23:29 -0300
5ae2a0b6 [comments-refactor-review] Encapsulating comment destroy check Browse Dir »

Rodrigo Souto
2013-07-12 16:17:37 -0300
aa6be22b [comments-refactor-review] Encapsulating comment moderation check Browse Dir »

Rodrigo Souto
2013-07-12 15:54:00 -0300
09e8041b [comments-refactor-review] Replacing plugins direct call with dispatch Browse Dir »

Rodrigo Souto
2013-07-12 15:31:03 -0300
9df90de8 Merge commit 'refs/merge-requests/282' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/282
```
Rodrigo Souto
2013-07-12 15:15:46 -0300

11 Jul, 2013

7 commits

f3bfbfc0 Merge commit 'refs/merge-requests/331' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/331
```
Rodrigo Souto
2013-07-11 17:37:43 -0300
90af49b9 Merge commit 'refs/merge-requests/323' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/323
```
Rodrigo Souto
2013-07-11 17:23:36 -0300
6871a9ec Merge commit 'refs/merge-requests/301' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/301
```
Rodrigo Souto
2013-07-11 14:31:19 -0300
5e9787c8 Merge commit 'refs/merge-requests/291' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/291
```
Rodrigo Souto
2013-07-11 13:14:56 -0300
e61a0cba Merge commit 'refs/merge-requests/287' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/287

Conflicts:
	app/models/environment.rb
```
Rodrigo Souto
2013-07-11 13:00:57 -0300
65708443 Merge commit 'refs/merge-requests/285' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/285
```
Rodrigo Souto
2013-07-11 12:38:08 -0300
81ca0e3a Merge commit 'refs/merge-requests/264' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/264

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/views/catalog/index.rhtml
```
Rodrigo Souto
2013-07-11 12:20:28 -0300

08 Jul, 2013

2 commits

c916579e Merge branch 'ActionItem2562' into ActionItem2520 Browse Dir »

Leandro Nunes dos Santos
2013-07-08 18:48:45 -0300
d0a55e25 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-07-08 16:50:24 -0300

28 Jun, 2013

1 commit

7989a4c7 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-06-28 09:13:53 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300

10 Jun, 2013

1 commit

36d9601b provide interface to manage trusted sites ... Browse Dir »
```
ActionItem2675
```
Lucas Melo
2013-06-10 16:03:56 -0300

01 Jun, 2013

1 commit

5a86933d Translate disable_products_for_enterprises_enabled env setting ... Browse Dir »

The disable_* settings for environment are incoherent with the
user interface and with the code itself. This changes correct
only one incoherent setting as an example how to do with all
others.

2013-06-01 09:54:17 -0300

27 May, 2013

1 commit

277adf7d Admin don't need to fill a captcha to report abuse ... Browse Dir »
```
closes ActionItem2387
```
Aurélio A. Heckert
2013-05-27 16:49:13 -0300

23 May, 2013

1 commit

4a36ce9e Setting default date range on events only on events action Browse Dir »

Rodrigo Souto
2013-05-23 11:21:59 -0300

22 May, 2013

1 commit

d05c0c85 Fixing search features ... Browse Dir »
```
Moving solr specifics to the plugin
```
Rodrigo Souto
2013-05-22 17:17:57 -0300

15 May, 2013

1 commit

1f808a1c show menu items after the user clicks on menu Browse Dir »

Victor Costa
2013-05-15 10:54:44 -0300

09 May, 2013

1 commit

331e4e98 Makes FilePresenter to work with all noosfero tests Browse Dir »

Aurélio A. Heckert
2013-05-09 23:27:13 -0300

08 May, 2013

1 commit

825c88ca Create FilePresenter infra ... Browse Dir »

The idea is never to give a Upload File to a view. That must
always work with a File Presenter providing overwrite methods
and specific views/partials.

ActionItem2373

2013-05-08 01:13:11 -0300

07 May, 2013

1 commit

b2a0c431 Merge branch 'master' into pluginize-solr ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	app/views/layouts/application-ng.rhtml
	lib/noosfero/plugin.rb
	script/noosfero-plugins
```
Rodrigo Souto
2013-05-07 13:36:10 -0300

24 Apr, 2013

1 commit

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

Conflicts:
	app/controllers/admin/environment_design_controller.rb
```
Rodrigo Souto
2013-04-24 21:36:25 -0300