Thiago Ribeiro / Noosfero

07 Oct, 2013

1 commit

c95a33e7 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.

Conflicts:
	app/controllers/public/catalog_controller.rb

2013-10-07 16:37:53 -0300

11 Jul, 2013

1 commit

5e9787c8 Merge commit 'refs/merge-requests/291' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/291
```
Rodrigo Souto
2013-07-11 13:14:56 -0300

07 May, 2013

1 commit

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

24 Apr, 2013

1 commit

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

Conflicts:
	app/controllers/admin/environment_design_controller.rb
```
Rodrigo Souto
2013-04-24 21:36:25 -0300

20 Apr, 2013

1 commit

2d5abd83 mergin with master Browse Dir »

root
2013-04-20 21:31:06 -0300

22 Mar, 2013

1 commit

1bec32a8 Fixing pre-population on add members Browse Dir »

Rodrigo Souto
2013-03-22 20:23:05 +0000

20 Mar, 2013

1 commit

ee97d763 Test for destroy article with referer Browse Dir »

Caio Formiga
2013-03-20 20:27:37 +0000

18 Mar, 2013

1 commit

2aeb1041 Changing redirect after destroy to referer or article parent Browse Dir »

Caio Formiga
2013-03-18 20:06:45 +0000

13 Mar, 2013

1 commit

0c1d441e Fixing some funcitonal tests and moving solr server start to plugin Browse Dir »

Rodrigo Souto
2013-03-13 21:14:16 +0000

27 Feb, 2013

3 commits

5954b097 Concentrating find_by_contents on application controller Browse Dir »

Rodrigo Souto
2013-02-27 20:29:56 -0300
de5477c7 Merge branch 'stable' into pluginize-solr ... Browse Dir »
```
Conflicts:
	app/models/comment.rb
	app/views/layouts/application-ng.rhtml
	test/unit/category_test.rb
```
Rodrigo Souto
2013-02-27 16:57:56 -0300
9360007a Solr on the way... Browse Dir »

Rodrigo Souto
2013-02-27 16:55:59 -0300

15 Jan, 2013

1 commit

af3c320b adding hotspots to make possible add other blocks Browse Dir »

Leandro Nunes dos Santos
2013-01-15 14:06:26 -0300

20 Dec, 2012

1 commit

9c58ba96 Allowing upload out of a folder ... Browse Dir »
```
(ActionItem2521)
```
Daniela Feitosa
2012-12-20 13:42:06 -0200

30 Nov, 2012

1 commit

4d520921 Redefining tasks status named_scopes Browse Dir »

Rodrigo Souto
2012-11-30 12:35:34 -0200

27 Nov, 2012

1 commit

483f5d55 Merge remote branch 'diguliu/features' into work-assignment ... Browse Dir »
```
Conflicts:
	test/functional/cms_controller_test.rb
	test/unit/article_test.rb
```
Daniela Feitosa
2012-11-27 15:00:21 -0200

07 Nov, 2012

1 commit

8f28228d [work-assignment] Removing author from database Browse Dir »

Rodrigo Souto
2012-11-07 21:06:20 +0000

04 Nov, 2012

3 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
2a7c4de5 Adding option to move content parent on edition page Browse Dir »

Rodrigo Souto
2012-11-04 17:43:15 -0200
27eb1487 Done Browse Dir »

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

01 Nov, 2012

4 commits

836970b6 Fixing tests ... Browse Dir »
```
Features:
  * Move Article
  * Language Selection
  * Work Assignment Plugin
```
Rodrigo Souto
2012-11-01 18:52:11 -0200
45e5189b Merge branch 'work-assignment' into features ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/functional/cms_controller_test.rb
	test/unit/article_test.rb
```
Rodrigo Souto
2012-11-01 18:51:32 -0200
56e1b119 Merge branch 'move-article-folder' into features ... Browse Dir »
```
Conflicts:
	app/helpers/forms_helper.rb
	app/sweepers/article_sweeper.rb
```
Rodrigo Souto
2012-11-01 18:50:29 -0200
2a585833 Merge branch 'language-selection' into features ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/environment_test.rb
```
Rodrigo Souto
2012-11-01 18:49:32 -0200

29 Oct, 2012

2 commits

61d0aa09 Setting author on upload Browse Dir »

Rodrigo Souto
2012-10-29 20:09:26 +0000
766d3c97 [work-assignment] Defining download and upload restrictions Browse Dir »

Rodrigo Souto
2012-10-29 20:08:39 +0000

25 Oct, 2012

1 commit

99d66a60 Adding (real) authors to articles Browse Dir »

Rodrigo Souto
2012-10-25 18:04:03 +0000

24 Oct, 2012

4 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
4ef79c2d Merge branch 'master' into move-article-folder ... Browse Dir »
```
Conflicts:
	app/helpers/forms_helper.rb
```
Rodrigo Souto
2012-10-24 19:57:03 +0000
b1cfe255 Improving design of new content view and helper Browse Dir »

Rodrigo Souto
2012-10-24 16:55:55 -0200
8ffa32e9 Removing send_mail method from profile_members_controller ... Browse Dir »
```
(ActionItem2388)
```
Joenio Costa
2012-10-24 11:33:46 -0300

20 Oct, 2012

1 commit

a39440b0 Fixed problem with form submit Browse Dir »

Daniela Feitosa
2012-10-20 17:30:29 -0300

03 Oct, 2012

1 commit

14a71887 Adding option to move content parent on edition page Browse Dir »

Rodrigo Souto
2012-10-03 16:33:00 -0300

04 Sep, 2012

1 commit

95b2c3fc [language-selection] Avoiding crash on article without profile Browse Dir »

Rodrigo Souto
2012-09-04 20:22:40 +0000

23 Aug, 2012

1 commit

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

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

21 Aug, 2012

1 commit

5853fd51 UI to mark comments as ham ... Browse Dir »

Additionally, I have made the "Mark as SPAM" and "Remove" links in the
page view comment listing work through AJAX, so that now it is much more
practical to remove comments or mark them as spam.

ActionItem2306

2012-08-21 15:43:11 -0300

20 Jul, 2012

2 commits

98738460 Allow blank search ... Browse Dir »
```
(solr brings everything with an empty query string)
```
Antonio Terceiro
2012-07-20 17:05:35 -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

15 Jun, 2012

1 commit

e9d95cb7 Restrict media search to files Browse Dir »

Antonio Terceiro
2012-06-15 20:41:07 +0000

26 May, 2012

1 commit

420c09be Merge branch 'master' of git://gitorious.org/noosfero/noosfero into merge_req_25-05 ... Browse Dir »
```
Conflicts:
	INSTALL
	test/unit/article_test.rb
```
Rafael Martins
2012-05-26 16:49:54 +0000