Thiago Ribeiro / Noosfero

25 Jun, 2013

1 commit

53e21f85 Fixed html escape on suborganization plugin ... Browse File »
```
(ActionItem2699)
```
Daniela Feitosa
2013-06-25 18:34:12 +0000

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

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

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

2 commits

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

Rodrigo Souto
2012-09-10 16:56:40 -0300
4398fe05 Generalizing partial_for_class to for tasks too Browse File »

Rodrigo Souto
2012-09-10 16:52:47 -0300

27 Aug, 2012

1 commit

575c695e [tolerance-time] Moving method to ApplicationHelper Browse File »

Rodrigo Souto
2012-08-27 18:32:35 +0000

21 Aug, 2012

3 commits

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

…into merge-requests/181

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/models/person.rb
	app/views/enterprise_registration/basic_information.rhtml
	lib/noosfero/plugin.rb
	public/stylesheets/application.css
	test/unit/person_test.rb
	test/unit/profile_test.rb

2012-08-21 15:06:48 -0300

117cdd09 Merge branch 'master' into tolerance-time ... Browse File »

Conflicts:
	app/helpers/application_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	test/functional/content_viewer_controller_test.rb

2012-08-21 17:35:27 +0000

45c48c56 [tolerance-time] Hotspot to expire or remove article and comment buttons Browse File »

Rodrigo Souto
2012-08-21 14:20:15 -0300

19 Aug, 2012

1 commit

a1ac0fb5 Merge branch 'stable' ... Browse File »
```
Conflicts:
	db/schema.rb
```
Daniela Feitosa
2012-08-19 23:49:20 -0300

17 Aug, 2012

1 commit

706f2ff6 Merge commit 'refs/merge-requests/208' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/208
```
Daniela Feitosa
2012-08-17 15:59:24 +0000

15 Aug, 2012

2 commits

65fdd587 Makes the comment box in wall grow ... Browse File »

  I did a little refactor in the already existent script to
  limited_text_area so the part that grows the textarea can be reused
  elsewhere, e.g. the comment box in the wall.

  Since I was modifying the limited_text_area function again, I re-did
  here the fix to the bug in Chrome browsers where the textarea would
  grow with every key press. So this merge request also fix the
  ActionItem2288.

(ActionItem2405)

2012-08-15 09:22:31 -0300

e62c8255 Fixed cancel button on "New content" on search_contents_menu ... Browse File »
```
It was opening with lightbox but the cancel button was a colorbox button

(ActionItem2415)
```
Daniela Feitosa
2012-08-15 00:46:09 -0300