Software Publico / Noosfero

21 Aug, 2012

2 commits

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

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 Dir »

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

19 Aug, 2012

1 commit

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

18 Aug, 2012

1 commit

573331b0 Detroying activity when article is removed ... Browse Dir »
```
Also:
- Added migration to remove action_trackers with target nil
- Updated db/schema

(ActionItem2400)
```
Daniela Feitosa
2012-08-18 07:35:02 -0300

17 Aug, 2012

6 commits

873120ce Added new db/schema.rb ... Browse Dir »
```
Also replaced "if !" by "unless"
```
Daniela Feitosa
2012-08-17 20:43:43 -0300
687f3e11 Merge commit 'refs/merge-requests/211' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/211
```
Daniela Feitosa
2012-08-17 20:07:08 -0300
f158caf4 Added s_ on string with context for .po Browse Dir »

Daniela Feitosa
2012-08-17 19:47:54 -0300
fc9435fa Merge commit 'refs/merge-requests/210' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/210
```
Daniela Feitosa
2012-08-17 17:41:07 -0300
65e9fc03 Merge commit 'refs/merge-requests/185' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/185
```
Daniela Feitosa
2012-08-17 18:36:47 +0000
fe9d073f Merge commit 'refs/merge-requests/205' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/205
```
Daniela Feitosa
2012-08-17 15:30:22 +0000

15 Aug, 2012

5 commits

9886ddd6 Don't show open price of 0% Browse Dir »

Braulio Bhavamitra
2012-08-15 22:58:33 +0000
1af7590f Fix use of production cost in product search Browse Dir »

Braulio Bhavamitra
2012-08-15 00:45:31 -0300
2e90d757 Added context to translate facet item ... Browse Dir »
```
Enterprise status should be "active" and "not active", not "enabled" and "disabled"
```
Daniela Feitosa
2012-08-15 00:45:17 -0300
7bd5c3f5 Fix use of google static map api v3 ... Browse Dir »
```
Also move view to template
```
Braulio Bhavamitra
2012-08-15 00:45:04 -0300
6da1fe92 Do not index address for profiles (private data) Browse Dir »

Braulio Bhavamitra
2012-08-15 00:44:51 -0300

13 Aug, 2012

1 commit

8838b42c Fixing users that were supposed to be activated Browse Dir »

Rodrigo Souto
2012-08-13 14:54:00 -0300

10 Aug, 2012

1 commit

d3fc2e6b Don't abort the batch because of invidual emails ... Browse Dir »
```
ActionItem2318
```
Antonio Terceiro
2012-08-10 11:02:53 -0300

09 Aug, 2012

1 commit

c31733ce Merge commit 'refs/merge-requests/193' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/193
```
Daniela Feitosa
2012-08-09 02:24:12 -0300

08 Aug, 2012

2 commits

3e98d8f0 Merge commit 'refs/merge-requests/187' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/187

Conflicts:
	app/models/environment.rb
	public/stylesheets/application.css
	test/factories.rb
	test/fixtures/roles.yml
	test/unit/article_test.rb
```
Daniela Feitosa
2012-08-08 16:15:14 -0300

2b429040 Removed link from templates option ... Browse Dir »

The templates are not visible, so new user won't be able to see them
Also styling the checkbox "is_template" on profile edition

(ActionItem2378)

2012-08-08 10:02:22 -0300

07 Aug, 2012

3 commits

96098b34 [multiple-templates] Minor fix on community name setter ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:33 -0300
3fc192fc [multiple-templates] Adding manage_environment_templates permission ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:31 -0300
fdf61a5a [multiple-templates] Adding templates field and relations to profile ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:31 -0300

03 Aug, 2012

1 commit

8c2f7656 Grouping activities of images upload ... Browse Dir »
```
Also, removed comments from images on profile, because now the gallery
is the target of activity

(ActionItem1826)
```
Daniela Feitosa
2012-08-03 11:44:42 -0300

24 Jul, 2012

1 commit

8e0ac476 Subscribe users to be notified about new comments on article ... Browse Dir »
```
(ActionItem2375)
```
Joenio Costa
2012-07-24 00:47:39 +0000

22 Jul, 2012

1 commit

4f4bf0c5 Merge commit 'refs/merge-requests/191' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/191
```
Daniela Feitosa
2012-07-22 02:13:34 -0300

20 Jul, 2012

2 commits

1d3ad7ef Setup multitenancy before querying profile domains ... Browse Dir »
```
This fixes ActionItem2344
```
Antonio Terceiro
2012-07-20 19:11:21 -0300
78a0bcf5 Merge branch 'master' into AI2371 ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
```
Antonio Terceiro
2012-07-20 15:02:12 -0300

19 Jul, 2012

3 commits

e87c9d99 Fixing tests ... Browse Dir »
```
Also removed not used monkey patch
Removed comments on CSS file
```
Daniela Feitosa
2012-07-19 12:19:57 -0300

75524307 Merging AI1826 with master ... Browse Dir »

Conflicts:
	app/models/article.rb
	app/models/profile.rb
	app/models/uploaded_file.rb
	public/javascripts/application.js
	public/stylesheets/application.css
	test/unit/article_test.rb
	test/unit/category_finder_test.rb
	test/unit/enterprise_test.rb

2012-07-19 09:19:22 -0300

ba6034cc Fixes on AI1826 ... Browse Dir »
```
Added back add_member_in_community activity
Fixed creation of notifications for communities
```
Daniela Feitosa
2012-07-19 09:06:14 -0300

18 Jul, 2012

8 commits

4897e7c7 [licenses] Minor fixes ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 13:48:36 -0300
af5fb41d [licenses] Adding default licenses ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 13:47:48 -0300
94e57dec [licenses] Default licenses (todo) ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 11:28:24 -0300
a7e994f9 [licenses] Creating manage_environment_licenses permission ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 11:20:00 -0300
ef74a656 [licenses] Creating Linsese model and its relations ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 11:15:11 -0300

91bf3f94 Some enhancements on solr ... Browse Dir »

Removed whitespaces
Recovered schema.rb without plugins fields
Included info about solr support of multitenancy on solr.yml.dist

2012-07-18 10:38:00 -0300

2468db59 Merge branch 'merge-requests/173' into solr Browse Dir »

Daniela Feitosa
2012-07-18 05:48:36 -0300
ec368658 Small enhancement on if ... Browse Dir »
```
(ActionItem2370)
```
Daniela Feitosa
2012-07-18 05:21:11 -0300

17 Jul, 2012

1 commit

f79e0f99 Merge commit 'refs/merge-requests/180' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/180
```
Daniela Feitosa
2012-07-17 10:58:18 -0300