NoosferoGov / noosfero

02 Apr, 2014

1 commit

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse File »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

01 Apr, 2014

1 commit

0ef66132 content-viewer-controller-test: adapt tests to new file_presenter infras Browse File »

Rodrigo Souto
2014-04-01 18:35:04 +0000

26 Mar, 2014

1 commit

84503cc0 view-page: do not count hits on bot access ... Browse File »
```
(ActionItem3063)
```
Rodrigo Souto
2014-03-26 19:00:38 +0000

20 Mar, 2014

1 commit

6e10728c Merge branch 'stable' ... Browse File »

Conflicts:
	app/views/themes/index.rhtml
	db/schema.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	test/unit/person_test.rb

2014-03-20 10:58:42 -0300

19 Mar, 2014

1 commit

c19a7b46 content-viewer: remove obsolete test Browse File »

Rodrigo Souto
2014-03-19 22:05:19 +0000

18 Mar, 2014

1 commit

a91ba23d Removed unused method ... Browse File »
```
Also included tests for meta tags and removed not-needed tests

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 18:40:07 +0000

28 Jan, 2014

1 commit

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

19 Jan, 2014

2 commits

35d7a6af Checking if perrmission to view article before version Browse File »

Daniela Feitosa
2014-01-19 23:53:43 -0300
25f34b4d article_versions: list of versions on a new page ... Browse File »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000

18 Jan, 2014

2 commits

8e720312 Replacing rev by version Browse File »

Daniela Feitosa
2014-01-18 21:11:45 +0000

4ab1ad9c Add links to articles versions. ... Browse File »

(ActionItem2822)

Signed-off-by: Daniela Feitosa
Signed-off-by: Ana Losnak <analosnak@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>

2014-01-18 16:32:19 +0000

03 Jan, 2014

1 commit

08480dd5 New hotspot to add extra content at article header Browse File »

Victor Costa
2014-01-03 14:25:15 -0300

16 Dec, 2013

1 commit

9c082693 Merge commit 'refs/merge-requests/425' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/425
```
Rodrigo Souto
2013-12-16 16:57:22 -0300

03 Dec, 2013

1 commit

4f861626 uploaded-file: don't display private images thumbnails and private images on slideshow ... Browse File »
```
AI2824
```
Junior Silva
2013-12-03 11:01:10 -0300

02 Dec, 2013

1 commit

f21d2a48 content_viewer tests: fix text view page expectations Browse File »

Rodrigo Souto
2013-12-02 15:37:04 -0300

27 Nov, 2013

1 commit

96ad392a Merge branch 'stable' ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/manage_products.feature
```
Rodrigo Souto
2013-11-27 14:13:20 -0300

22 Nov, 2013

2 commits

4befe13d content_viewer_test: explicitly test content_disposition type of uploaded_file Browse File »

Rodrigo Souto
2013-11-22 16:46:14 -0300
6475a4d3 Force a browser to save file as after clicking a uploaded file link ... Browse File »
```
(ActionItem2829)
```
Braulio Bhavamitra
2013-11-22 16:46:13 -0300

19 Sep, 2013

1 commit

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

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

25 Jul, 2013

1 commit

60c6ac65 Fix for escaped HTML in blog posts listing Browse File »

Antonio Terceiro
2013-07-25 18:55:43 -0300

23 Jul, 2013

1 commit

99e9e72f Fixing broken tests on content_viewer Browse File »

Rodrigo Souto
2013-07-23 16:27:32 -0300

16 Jul, 2013

1 commit

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

…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 File »

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

13 Jul, 2013

1 commit

ba61c659 Merge commit 'refs/merge-requests/283' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/283

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

12 Jul, 2013

2 commits

77501269 [comments-refactor-review] Fixing content viewwer controller test Browse File »

Rodrigo Souto
2013-07-12 20:53:35 -0300
6afc4db6 [comments-refactor-review] Cleaning up the code ... Browse File »
```
Removing obsolete FIXME's, trailing whitespaces and so.
```
Rodrigo Souto
2013-07-12 20:40:52 -0300

08 Jul, 2013

2 commits

c916579e Merge branch 'ActionItem2562' into ActionItem2520 Browse File »

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

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

28 Jun, 2013

1 commit

7989a4c7 merging with stable Browse File »

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

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse File »

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

14 May, 2013

1 commit

88070d96 fixing functional tests Browse File »

Victor Costa
2013-05-14 10:38:29 -0300

09 May, 2013

1 commit

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

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

17 Apr, 2013

2 commits

97fe0f50 Fixing master tests after merge with stable Browse File »

Rodrigo Souto
2013-04-17 22:16:28 -0300

527ee379 Merge branch 'stable' ... Browse File »

Basically html_safe in some places that the stable branch had.

Conflicts:
	app/models/article_block.rb
	app/models/tags_block.rb

2013-04-17 17:12:26 -0300

16 Apr, 2013

1 commit

d8c5b8ef Fixing content_viewwer translation link test Browse File »

Rodrigo Souto
2013-04-16 13:45:30 -0300

27 Mar, 2013

1 commit

5d0a0e66 Fixing test: content_viewer Browse File »

Rodrigo Souto
2013-03-27 15:22:24 +0000

20 Feb, 2013

2 commits

260f0d79 Adding macro support for TinyMCE articles and a plugin called CommentGroupMacro … ... Browse File »
```
…that uses the macro support
```
Leandro Nunes dos Santos
2013-02-20 11:15:09 -0300
3e4b7e40 improving comment manipulation and making possible to moderate comments by article Browse File »

Leandro Nunes dos Santos
2013-02-20 10:01:51 -0300

07 Oct, 2012

2 commits

0541cc4a Searching comments on page before editing it ... Browse File »

- Added render_not_found screen when comment id doesn't exist
- Displaying message when trying to edit a comment from other page
- Fixed a test on ToleranceTimePlugin

2012-10-07 20:13:06 -0300

fc8557c3 Merge commit 'refs/merge-requests/213' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/213

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/view_page.rhtml
	lib/noosfero/plugin.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/comment_test.rb

2012-10-07 01:08:23 -0300