Charles Oliveira / noosfero

07 Nov, 2012

2 commits

7af9fa59 Revert "Revert "Do not send email to template users"" ... Browse Dir »
```
This reverts commit b8920a1e95ef9e9d54527de691fbeb1b1921a27f.

Conflicts:

	app/models/user.rb
```
Daniela Feitosa
2012-11-07 20:57:38 -0200
ae3e67e3 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	debian/changelog
	lib/noosfero.rb
```
Daniela Feitosa
2012-11-07 20:55:45 -0200

06 Nov, 2012

1 commit

b8920a1e Revert "Do not send email to template users" ... Browse Dir »

This reverts commit 521420587c18163c55c790a2f5241489260cea38.

is_template is not defined on stable version yet:
"NoMethodError: undefined method `is_template?'"

2012-11-06 17:05:30 -0200

04 Nov, 2012

5 commits

c729594d Merge remote branch 'remotes/diguliu/language-selection' into language-selection ... Browse Dir »
```
Conflicts:
	app/sweepers/article_sweeper.rb
	db/schema.rb
	test/unit/environment_test.rb
```
Daniela Feitosa
2012-11-04 18:23:45 -0200
0df8e456 Not allow self and cyclical reference in article paternity Browse Dir »

Rodrigo Souto
2012-11-04 17:43:16 -0200
16dd16e5 tUpdating path before save Browse Dir »

Rodrigo Souto
2012-11-04 17:43:15 -0200
339df62d Enhancements on privacy settings ... Browse Dir »
```
Added tests
Added background on edition of profile to be easier to know which field
the checkbox is related

(ActionItem1717)
```
Daniela Feitosa
2012-11-04 17:11:49 -0200
27eb1487 Done Browse Dir »

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

01 Nov, 2012

1 commit

cd4a0e06 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	app/views/content_viewer/view_page.rhtml
	public/stylesheets/application.css
```
Daniela Feitosa
2012-11-01 08:15:50 -0200

29 Oct, 2012

1 commit

877d26ae Environment admin can configure the message after signup ... Browse Dir »

Added field sigup_welcome_text on environment
New tab on admin panel to edit the text
When the environment doesn't have a text, will use the default text
Added content_type to email

(ActionItem2497)

2012-10-29 02:07:56 -0200

27 Oct, 2012

1 commit

bba3d1e2 Allowing users to configure the page after login ... Browse Dir »

Added field redirection_after_login on profiles and environments
New db/schema
Added a select to choose option to redirect on admin panel and on profile
control panel

(ActionItem2369)

2012-10-27 15:25:59 -0200

25 Oct, 2012

2 commits

a80f69f8 Merge commit 'refs/merge-requests/236' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/236
```
Daniela Feitosa
2012-10-25 16:07:00 -0200
518ec830 Merge commit 'refs/merge-requests/233' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/233

Conflicts:
	test/integration/routing_test.rb
```
Daniela Feitosa
2012-10-25 00:39:00 -0200

24 Oct, 2012

2 commits

95080411 Merge branch 'master' into language-selection ... Browse Dir »
```
Conflicts:
	app/helpers/forms_helper.rb
	app/models/box.rb
	app/views/box_organizer/edit.rhtml
	db/schema.rb
	test/unit/box_test.rb
```
Rodrigo Souto
2012-10-24 20:04:13 +0000

2ab03d08 Fixes delayed feed fetch after change address ... Browse Dir »

  Sets fetched_at to nil after change external feed address so the feed
  is fetched right after the address change and without waiting the feed
  to be expired.

2012-10-24 13:17:46 -0200

23 Oct, 2012

2 commits

d0b4277a Fixing block and article delegate Browse Dir »

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

21 Oct, 2012

2 commits

7bac7ef7 adding some hotspots to make the openid plugin works. Browse Dir »

Leandro Nunes dos Santos
2012-10-21 18:42:30 -0200
cb2af988 Replacing lightbox by colorbox on profile_design ... Browse Dir »
```
"Add a block" button
"Edit" buttons on blocks

Also replaced radio_button_tag and label_tag by labelled_radio_button
```
Daniela Feitosa
2012-10-21 01:21:45 -0200

20 Oct, 2012

3 commits

7fbb381d Fixing Box tests Browse Dir »

Daniel Cunha
2012-10-20 17:27:28 -0300
c9a96b36 Improving Box tests Browse Dir »

Daniel Cunha
2012-10-20 17:27:28 -0300
ac098d93 Adding blocks whitelist for receive dropped draggable elements Browse Dir »

Daniel Cunha
2012-10-20 17:27:28 -0300

13 Oct, 2012

2 commits

a6ab9d6f Merge branch 'stable' Browse Dir »

Antonio Terceiro
2012-10-13 23:44:28 -0300
52142058 Do not send email to template users ... Browse Dir »
```
ActionItem2456
```
Antonio Terceiro
2012-10-13 23:43:24 -0300

07 Oct, 2012

1 commit

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

…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

01 Oct, 2012

2 commits

938c96a1 Changes UI of article's visibility ... Browse Dir »

  Changes from checkbox to radio box, with options private and public.

  Also removes confusing table about profile visibility in control
  panel.

StoaItem18

2012-10-01 12:39:32 -0300

5fb09b51 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	po/pt/noosfero.po
	public/javascripts/application.js
```
Antonio Terceiro
2012-10-01 01:33:21 -0300