NoosferoGov / noosfero

15 Jul, 2013

1 commit

07caf3d4 [macro-support-review] Refactoring macros infra-structure Browse File »

Rodrigo Souto
2013-07-15 19:14:08 -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

1 commit

4891d3e9 [comments-refactor-review] Removing obsolete FIXME's ... Browse File »
```
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

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

21 May, 2013

1 commit

e7b5205f Merge branch 'pluginize-solr' into merge-solr Browse File »

Rodrigo Souto
2013-05-21 19:45:04 -0300

09 May, 2013

1 commit

7d51ce8b Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/298

Added html_safe that was missing on the block_helper new method

Conflicts:
	app/views/box_organizer/_highlights_block.rhtml
	test/unit/application_helper_test.rb

2013-05-09 15:36:19 -0300

07 May, 2013

1 commit

b2a0c431 Merge branch 'master' into pluginize-solr ... Browse File »
```
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

17 Apr, 2013

1 commit

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

15 Apr, 2013

1 commit

09dd907e Just changing the tempalates named_scope to receive environment instead of environment_id Browse File »

Rodrigo Souto
2013-04-15 15:12:01 -0300

12 Apr, 2013

1 commit

3599b17b Restricting template alternatives to those inside the current environment ... Browse File »
```
ActionItem2608
```
Visita
2013-04-12 19:40:37 -0300

11 Apr, 2013

1 commit

dc107520 adding a menu to display comment actions Browse File »

Victor Costa
2013-04-11 13:55:46 -0300

10 Apr, 2013

1 commit

086f3729 Fixing escapes due to debian security release 2.3.5-1.2+squeeze8 ... Browse File »
```
(ActionItem2630)
```
Rodrigo Souto
2013-04-10 16:24:05 -0300

03 Apr, 2013

3 commits

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

Conflicts:
	test/unit/application_helper_test.rb
```
Rodrigo Souto
2013-04-03 21:51:17 -0300
c4fe95aa Fixing conflicting link_to_article method signature Browse File »

Rodrigo Souto
2013-04-03 21:46:20 -0300
b95e8647 Merge commit 'refs/merge-requests/254' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/254

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application-ng.rhtml
```
Rodrigo Souto
2013-04-03 21:10:42 -0300

28 Mar, 2013

1 commit

76ea3016 move display_short_format to the generic ApplicationHelper Browse File »

Aurélio A. Heckert
2013-03-28 22:38:01 -0300

25 Mar, 2013

1 commit

28513273 support to add css class without replace original on button_bar Browse File »

Aurélio A. Heckert
2013-03-25 18:43:46 -0300

18 Mar, 2013

1 commit

02eedc73 Enable Blog in the ArticleBlock ... Browse File »
```
ActionItem2381
```
Aurelio A. Heckert
2013-03-18 10:41:47 -0300

28 Feb, 2013

1 commit

cd53e5e5 On the way of search display options Browse File »

Rodrigo Souto
2013-02-28 22:00:28 +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

06 Feb, 2013

1 commit

4de6c173 Filter useful folders to upload images and pre-select a gallery ... Browse File »
```
closes ActionItem2567
```
Aurélio A. Heckert
2013-02-06 17:09:46 -0300

19 Jan, 2013

2 commits

225a6d41 Removing trailing whitespaces Browse File »

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

20 Dec, 2012

1 commit

aa1425d7 Removing unnecessary | from comments Browse File »

Daniela Feitosa
2012-12-20 12:23:32 -0200

13 Dec, 2012

1 commit

93116c6b Encapsulate stylesheets code Browse File »

Braulio Bhavamitra
2012-12-13 19:19:07 +0000

15 Nov, 2012

4 commits

a65d1a58 More enhancements on signup screen ... Browse File »
```
Changed strings to be more clear to user
Changed colors of images
```
Daniela Feitosa
2012-11-15 19:47:34 -0200
6adbff04 Added tip on template on signup Browse File »

Daniela Feitosa
2012-11-15 19:45:25 -0200
769f8d75 Added links on template options on signup Browse File »

Daniela Feitosa
2012-11-15 19:41:58 -0200
3a8c189a Redesigning signup screen Browse File »

Daniela Feitosa
2012-11-15 19:36:48 -0200

04 Nov, 2012

3 commits

2a7c4de5 Adding option to move content parent on edition page Browse File »

Rodrigo Souto
2012-11-04 17:43:15 -0200
2e89b866 Added labelled_checkbox ... Browse File »
```
(ActionItem1717)
```
Daniela Feitosa
2012-11-04 14:24:54 -0200
27eb1487 Done Browse File »

Caio Almeida
2012-11-04 14:24:53 -0200

25 Oct, 2012

1 commit

39a99d9d Fixed: Pending tasks were not being listed ... Browse File »
```
When trying to render "partial_for_class" there was the "stack level
too deep" error
```
Daniela Feitosa
2012-10-25 00:15:06 -0200

23 Oct, 2012

1 commit

c2e00580 Merge commit 'refs/merge-requests/231' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/231
```
Daniela Feitosa
2012-10-23 13:56:38 -0200

07 Oct, 2012

1 commit

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

10 Sep, 2012

1 commit

d0aadb3e Merge branch 'master' into custom-forms Browse File »

Rodrigo Souto
2012-09-10 16:56:40 -0300