NoosferoGov / noosfero

02 Apr, 2014

2 commits

a739edce Merge branch 'article-version' of https://gitlab.com/juniorsilva1001/noosfero in… ... Browse File »
```
…to juniorsilva1001/noosfero-article-version

Conflicts:
	app/views/content_viewer/versioned_article.rhtml
	db/schema.rb
	public/stylesheets/application.css
```
Rodrigo Souto
2014-04-02 19:52:23 +0000

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

67f6ebd9 content-viewer-controller: user_is_a_bot consider possible empty user_agent Browse File »

Rodrigo Souto
2014-04-01 18:30:30 +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 Feb, 2014

1 commit

1221eda4 versions-diff: included js to radio_button control and adjusts on look-and-feel ... Browse File »
```
AI2822
```
Junior Silva
2014-02-20 19:56:28 -0300

31 Jan, 2014

1 commit

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

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300

30 Jan, 2014

1 commit

2253cc66 diff-article-versions: display differences between two article versions ... Browse File »
```
AI2822
```
Junior Silva
2014-01-30 17:59:39 -0300

24 Jan, 2014

1 commit

0597ba64 Merge remote-tracking branch 'danifeitosa/AI2822-fixes' into article-version ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	db/schema.rb
```
Junior Silva
2014-01-24 18:14:16 -0300

21 Jan, 2014

1 commit

79890fca article-version: versioned_article: using diff to show differences between versions of article ... Browse File »
```
AI2822
```
Junior Silva
2014-01-21 16:12:57 -0300

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

5 commits

8e720312 Replacing rev by version Browse File »

Daniela Feitosa
2014-01-18 21:11:45 +0000
658ecf81 Trying to make it prettier :) Browse File »

Daniela Feitosa
2014-01-18 16:32:20 +0000
d7da0420 Added methods to return data from specific version ... Browse File »
```
(ActionItem2822)
```
Daniela Feitosa
2014-01-18 16:32:20 +0000
bf80644c Add new template to display versioned article ... Browse File »
```
Also included revision number on cache key

Signed-off-by: Daniela Feitosa

(ActionItem2822)
```
Ana Losnak
2014-01-18 16:32:19 +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

17 Jan, 2014

1 commit

20c5b0d1 Changing tests to check diff posts and using strings instead files Browse File »

Junior Silva
2014-01-17 18:43:11 -0300

15 Jan, 2014

2 commits

527a4b0d Moved logic from controller to model ... Browse File »
```
- Also included new db/schema
- Removed unused partial

(ActionItem2513)
```
Daniela Feitosa
2014-01-15 05:54:40 +0000

b3fb1448 forum_use_terms: add user term to forums ... Browse File »

(ActionItem2513)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-01-15 00:40:00 +0000

14 Jan, 2014

1 commit

f1173601 article-version: implementing testing for feature ... Browse File »
```
AI2822
```
Junior Silva
2014-01-14 17:25:24 -0300

10 Jan, 2014

1 commit

0f3a6312 versioned_article: using diff to show differences between versions of ... Browse File »
```
article

AI2822
```
Junior Silva
2014-01-10 19:34:33 -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

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

1 commit

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

04 Sep, 2013

1 commit

067a2a2d articles, profiles: stop using ajax for some logged-in stuff Browse File »

Lucas Melo
2013-09-04 14:28:34 -0300

29 Jul, 2013

1 commit

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

16 Jul, 2013

3 commits

f36e4843 Fixing comments counter ... Browse File »
```
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 File »

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

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

bb5134e1 [macro-support-review] Renaming manager first to dispatch_first ... Browse File »
```
Also renaming dispatch_plugins to fetch_plugins and first_plugin to
fetch_first_plugin
```
Rodrigo Souto
2013-07-13 14:31:06 -0300

08 May, 2013

1 commit

825c88ca Create FilePresenter infra ... Browse File »

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

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

19 Jan, 2013

1 commit

e6581456 Do not redirect gest from restricted pages ... Browse File »
```
ActionItem2540
```
Aurélio A. Heckert
2013-01-19 17:38:38 +0000

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

11 Sep, 2012

1 commit

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

Conflicts:
	debian/changelog
	etc/noosfero/varnish-noosfero.vcl
	lib/noosfero.rb
```
Daniela Feitosa
2012-09-11 17:38:00 -0300