NoosferoGov / noosfero

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000

16 Dec, 2013

1 commit

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

Conflicts:
	db/schema.rb
```
Rodrigo Souto
2013-12-16 17:03:48 +0000

02 Dec, 2013

1 commit

bd4954d3 Merge branch 'master' into next-origin ... Browse Dir »

Conflicts:
	app/models/category.rb
	app/models/uploaded_file.rb
	test/functional/memberships_controller_test.rb
	test/functional/profile_controller_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2013-12-02 20:33:51 -0300

27 Nov, 2013

1 commit

96ad392a Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/manage_products.feature
```
Rodrigo Souto
2013-11-27 14:13:20 -0300

21 Nov, 2013

2 commits

a67cc855 Adding Community Track Plugin Browse Dir »

Leandro Nunes dos Santos
2013-11-21 17:43:37 +0000
acd66894 environment: destroy child profiles when destroyed ... Browse Dir »
```
Also includes migration to remove already orphaned profiles.

(ActionItem2906)
```
Rodrigo Souto
2013-11-21 13:57:40 -0300

16 Nov, 2013

1 commit

04e25fca Add option to disable enterprises list on user menu ... Browse Dir »
```
(ActionItem2903)
```
Daniela Feitosa
2013-11-16 17:39:17 +0000

14 Oct, 2013

1 commit

44627b4a use anti_spam plugin in suggest_articles ... Browse Dir »
```
ActionItem2691
```
Lucas Melo
2013-10-14 19:29:05 +0000

07 Oct, 2013

1 commit

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

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

24 Sep, 2013

1 commit

e227e0e3 rails3: upgrading delayed_job Browse Dir »

Rodrigo Souto
2013-09-24 16:25:46 +0000

18 Sep, 2013

1 commit

bc0150d2 Make session data delete possible with active_record_store ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Braulio Bhavamitra
2013-09-18 16:25:38 -0300

11 Jul, 2013

1 commit

dfdfb106 Adding migration to include manage trusted sites permission to admin role Browse Dir »

Rodrigo Souto
2013-07-11 18:34:09 -0300

06 Jun, 2013

1 commit

c50dc645 Converted article_versions published_at to datetime ... Browse Dir »
```
article and article_versions fields type must be the same

also removed plugins tables from schema.rb

(ActionItem2685)
```
Daniela Feitosa
2013-06-06 11:11:26 +0000

05 Jun, 2013

1 commit

f68764a1 Converting article's published_at to datetime Browse Dir »

Rodrigo Souto
2013-06-05 10:58:05 -0300

01 Jun, 2013

1 commit

5a86933d Translate disable_products_for_enterprises_enabled env setting ... Browse Dir »

The disable_* settings for environment are incoherent with the
user interface and with the code itself. This changes correct
only one incoherent setting as an example how to do with all
others.

2013-06-01 09:54:17 -0300

16 May, 2013

1 commit

90c77cdb Using find_each on abuse_complaint migration instead of all.each Browse Dir »

Rodrigo Souto
2013-05-16 15:38:39 -0300

29 Apr, 2013

1 commit

48ed4027 destroy AbuseComplaint when reported is destroyed ... Browse Dir »
```
ActionItem2451

Including: migration and test.
```
Lucas Melo
2013-04-29 19:14:21 -0300

05 Mar, 2013

1 commit

a5faae62 Replacing f in the migration by (0>1) Browse Dir »

Rodrigo Souto
2013-03-05 14:08:14 -0300

04 Mar, 2013

1 commit

8ac7cfd6 Removing nil values from products' highlighted attribute ... Browse Dir »
```
(ActionItem2599)
```
Rodrigo Souto
2013-03-04 19:47:43 -0300

17 Jan, 2013

1 commit

15d25a18 Removing index_articles_on_name Browse Dir »

Daniel Cunha
2013-01-17 10:32:51 -0300

11 Jan, 2013

2 commits

88785ea1 Removing wrong index and adding others Browse Dir »

Daniel Cunha
2013-01-11 23:30:52 -0300
f47c2f61 Aggressive Indexing Strategy 3 Browse Dir »

Daniel Cunha
2013-01-11 20:33:41 -0300

04 Nov, 2012

1 commit

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

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

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
3209ff35 Add the new permission to the 'admin' and 'moderator' roles in all environments ... Browse Dir »
```
(ActionItem2388)
```
Joenio Costa
2012-10-24 11:34:25 -0300

26 Aug, 2012

1 commit

87d27329 Store User-Agent and Referre on comments Browse Dir »

Antonio Terceiro
2012-08-26 19:43:36 -0300

23 Aug, 2012

1 commit

852b2fe7 [language-selection] Migration and model base Browse Dir »

Rodrigo Souto
2012-08-23 23:19:33 +0000

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

1 commit

873120ce Added new db/schema.rb ... Browse Dir »
```
Also replaced "if !" by "unless"
```
Daniela Feitosa
2012-08-17 20:43:43 -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

9babe35b Fixing migration to work on postgres Browse Dir »

Daniela Feitosa
2012-08-10 11:34:26 -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
017d5562 Updated db/schema with new profile fields ... Browse Dir »
```
(ActionItem2378)
```
Daniela Feitosa
2012-08-08 13:32:33 -0300

07 Aug, 2012

2 commits

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

19 Jul, 2012

1 commit

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