Charles Oliveira / noosfero

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

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

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

19 May, 2012

1 commit

8151ee67 Fix tests and mock Solr when not necessary ... Browse Dir »
```
Mocking Solr disable indexing and search,
so it speeds tests that don't need solr.
Tests that need searches have to call TestSolr.enable
```
Braulio Bhavamitra
2012-05-19 14:49:13 +0000

16 May, 2012

2 commits

46ef775e Any community members can edit - controller ... Browse Dir »
```
(ActionItem2345)
```
Antonio Terceiro
2012-05-16 13:37:11 -0300
1a60ef56 Moving methods to the protected section Browse Dir »

Antonio Terceiro
2012-05-16 13:37:10 -0300

16 Mar, 2012

1 commit

3fbcccd5 Merge branch 'master' into solr_with_0.36.1 ... Browse Dir »

Conflicts:
	INSTALL
	app/helpers/application_helper.rb
	app/views/account/signup.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/search/_product.rhtml
	debian/control
	debian/noosfero.install
	debian/noosfero.links
	features/step_definitions/noosfero_steps.rb
	script/production

2012-03-16 13:54:12 -0300

15 Mar, 2012

1 commit

6de8cf43 File edit_location javascript and some fixes Browse Dir »

Rafael Martins
2012-03-15 17:13:25 -0300

08 Mar, 2012

1 commit

71066d56 Consistent interface for Noosfero::Plugin::Manager ... Browse Dir »
```
I had to change a lot of plugin hotspot tests that depended on
heavy/evil mocking and stubbing to pass.

(ActionItem2315)
```
Antonio Terceiro
2012-03-08 21:55:55 -0300

25 Feb, 2012

1 commit

11762ec8 Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/controllers/application.rb
	debian/changelog
	plugins/bsc/lib/bsc_plugin.rb
	plugins/shopping_cart/lib/shopping_cart_plugin.rb

2012-02-25 11:43:10 -0200

24 Feb, 2012

2 commits

152c4ed6 Always shows fields for localization even if not enabled Browse Dir »

Braulio Bhavamitra
2012-02-24 22:31:33 -0200
83607363 [geolocalization] ... Browse Dir »
```
Change Google API version to V3 and implements city and state validations for Brazil case.
```
Isaac Canan
2012-02-24 22:31:21 -0200

19 Feb, 2012

1 commit

2a082d0b Merge remote branch 'noosfero-bsc/solr-merge' ... Browse Dir »

Conflicts:
	INSTALL
	app/models/environment_finder.rb
	config/environments/cucumber.rb
	debian/control
	features/step_definitions/noosfero_steps.rb
	test/unit/forum_helper_test.rb

2012-02-19 16:37:27 -0200

09 Feb, 2012

1 commit

fbfc620f Including article name in delete confirmation message ... Browse Dir »

  * Included alert confirmation to delete link on content viewer and
    cms.
  * Removed the destroy page, since it was useless.

Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br>

(ActionItem1524)

2012-02-09 18:37:46 -0200

31 Jan, 2012

2 commits

38643752 Drop temporary plugin view_paths integration Browse Dir »

Antonio Terceiro
2012-01-31 23:10:07 +0300
8b4dbf41 Adding content type and view_path hotspots Browse Dir »

Carlos Morais
2012-01-31 23:10:05 +0300

04 Jan, 2012

1 commit

2ae57e72 Merge branch 'master' into rails-2.3.5 ... Browse Dir »
```
Conflicts:
	features/step_definitions/noosfero_steps.rb
```
Antonio Terceiro
2012-01-04 19:09:45 +0000

30 Dec, 2011

2 commits

8c66d377 Fixed problem with NaN on progressbar Browse Dir »

Daniela Feitosa
2011-12-30 16:56:39 -0200

87ef45c5 Added feature to describe the costs of a product ... Browse Dir »

   * new table production_costs
     * environment and enterprises can have them
   * new table price_details
     * products have price details with a cost and a price
   * updated db/schema
   * included method to display the total value of inputs
   * included partials to display and edit price details
   * allowing users to create new cost from select
   * manage_products.js to separate js codes from application.js
   * numbers_only_javascript
     * created a partial with the js needed to allow only numbers on some fields
  * price composition bar is updated when an user edit some price

(ActionItem1413)

2011-12-30 16:44:36 -0200

22 Dec, 2011

1 commit

025330d8 Revert "Revert "Fixing method with new solr search"" ... Browse Dir »
```
This reverts commit 4a1e090a5e3d20bb88fe587183699a00fe27d356.
```
Braulio Bhavamitra
2011-12-22 00:34:29 +0000

11 Dec, 2011

1 commit

48b1de6d Remove warnings in functional tests Browse Dir »

Antonio Terceiro
2011-12-11 22:57:09 -0200

27 Nov, 2011

1 commit

d35779c0 Merge branch 'master' into rails-2.3.5 ... Browse Dir »

Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb

2011-11-27 14:00:08 -0200

12 Oct, 2011

1 commit

22b5ba96 Fixing some functional tests ... Browse Dir »
```
- textile doesn't needs to be sanitized
```
Joenio Costa
2011-10-12 16:34:18 -0300

11 Oct, 2011

1 commit

3c89860d Report abuse ... Browse Dir »
```
Libs added
* jquery-validation
* colorbox
* recaptcha

(ActionItem2074)
```
Rodrigo Souto
2011-10-11 06:59:51 -0300

10 Oct, 2011

2 commits

619223c6 Bsc Plugin ... Browse Dir »

* Refactoring profile management to use tokeninput
  * Also, adding support of tokeninput to the core
* Adding attributes validated and cnpj to enterprise
* Environment option to define enterprise as validated by defaul
* Making profile namedscopes consider subclasses too
* Adapting enterprise icon and identification to meet Bsc expectations
* Adapting profile info actions to meet Bsc expectations
* Adapting control panel buttons to meet Bsc expectations
* Adapting core product to meed Bsc expectations
* Adding and fixing plugin hotspots

(ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)

2011-10-10 16:25:02 -0300

4fe87ea2 Adding recaptcha to comments and article suggestion ... Browse Dir »
```
(ActionItem2075)
```
Caio SBA
2011-10-10 14:48:28 -0300

16 Aug, 2011

2 commits

4e223943 Revert "Merge branch 'merge-requests/25'" ... Browse Dir »

This reverts commit 6409d6cc8e989f473f17b882d05367c4b9153528, reversing
changes made to 313f8a54d53a4fdfa651f02197813026e1660e3b.

Conflicts:

	features/step_definitions/noosfero_steps.rb
	test/unit/category_finder_test.rb

There are some problems with solr
(ActionItem1958)

2011-08-16 18:45:04 -0300

4a1e090a Revert "Fixing method with new solr search" ... Browse Dir »
```
This reverts commit 2220fe167d588fa1ca900dcef497a875c22b989c.

There are some problems with solr
(ActionItem1958)
```
Daniela Feitosa
2011-08-16 18:34:13 -0300

13 Aug, 2011

1 commit

00641c73 Merge branch 'merge-requests/30' ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	test/functional/cms_controller_test.rb
```
Daniela Feitosa
2011-08-13 02:00:45 -0300

11 Aug, 2011

1 commit

2220fe16 Fixing method with new solr search ... Browse Dir »
```
(ActionItem1958)
```
Daniela Feitosa
2011-08-11 18:28:34 -0300