Omar Junior / Noosfero

21 Jun, 2012

1 commit

03c856bb Merge commit 'refs/merge-requests/173' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/173
```
Daniela Feitosa
2012-06-21 13:33:25 -0300

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

24 May, 2012

1 commit

92e9abd2 Merging stoa features (basic, signup and invitation) ... Browse Dir »
```
Conflicts:
	test/functional/account_controller_test.rb
```
Rodrigo Souto
2012-05-24 14:55:19 -0300

22 May, 2012

1 commit

e1a0da01 Restrict altBeautify fix and disabled searches Browse Dir »

Braulio Bhavamitra
2012-05-22 18:56:09 +0000

20 May, 2012

2 commits

5268427c Only search for products from enabled enterprises ... Browse Dir »
```
Also, add a facet to filter enabled/not enabled enterprises
```
Braulio Bhavamitra
2012-05-20 23:52:53 +0000
cae48f79 Merge remote-tracking branch 'noosfero/master' into solr-searches ... Browse Dir »
```
Conflicts:
	app/views/layouts/_javascript.rhtml
	features/step_definitions/noosfero_steps.rb
	features/support/paths.rb
```
Braulio Bhavamitra
2012-05-20 18:38:41 +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

3 commits

ed2a58fd Allow disabling the need for e-mail confirmations ... Browse Dir »
```
This is specially useful in development/test setups where you don't have
a working MTA.
```
Antonio Terceiro
2012-05-16 14:59:58 -0300
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

13 May, 2012

1 commit

64ec5b85 Fix browser language detection ... Browse Dir »
```
FastGettext.locale= returns its argument instead of returning the locale
that was actually detected.

(ActionItem2297)
```
Antonio Terceiro
2012-05-13 23:46:05 -0300

26 Apr, 2012

1 commit

5e1975c6 Added locale on caches ... Browse Dir »
```
- Environment homepage cache

(ActionItem2336)
```
Daniela Feitosa
2012-04-26 00:01:56 -0300

17 Apr, 2012

1 commit

ee116023 Added some functional tests and small fixes for SearchController Browse Dir »

Rafael Martins
2012-04-17 15:43:27 -0300

15 Apr, 2012

2 commits

6fb4a4fb Fix for display_results of tagged articles Browse Dir »

Rafael Martins
2012-04-15 19:31:14 -0300
9103171c Merge branch 'solr-searches' of https://github.com/coletivoEITA/noosfero-ecosol into ecosol-solr ... Browse Dir »
```
Conflicts:
	app/models/enterprise.rb
```
Rafael Martins
2012-04-15 19:21:37 -0300

05 Apr, 2012

1 commit

8e197eb4 Fix category filtering and other minors Browse Dir »

Braulio Bhavamitra
2012-04-05 10:53:04 +0000

03 Apr, 2012

2 commits

dad628a9 Refactor search ordering, boost, indexing and CSS Browse Dir »

Braulio Bhavamitra
2012-04-03 18:40:42 -0300
b814464f ActionItem 2287: Create, edit and assign roles Browse Dir »

Caio Almeida
2012-04-03 01:21:54 -0300

22 Mar, 2012

1 commit

af8e08a4 [stoa] Fixing signup css Browse Dir »

Rodrigo Souto
2012-03-22 17:37:36 -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

2 commits

20f951d7 Bugfix map ballon and facet sorting Browse Dir »

Rafael Martins
2012-03-15 17:13:25 -0300
6de8cf43 File edit_location javascript and some fixes Browse Dir »

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

09 Mar, 2012

1 commit

884e842c Comment-related hotspots ... Browse Dir »
```
(ActionItem2316)
```
Antonio Terceiro
2012-03-09 10:17:37 -0300

08 Mar, 2012

2 commits

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
e66d26ee Store origin IP address for every comment ... Browse Dir »
```
I am also already adding a "spam" flag to the table, which we will use
next.

(ActionItem2309)
```
Antonio Terceiro
2012-03-08 18:40:32 +0000

07 Mar, 2012

1 commit

974bc048 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	app/views/shared/block.rhtml
	debian/changelog
	debian/control
	script/production
```
Daniela Feitosa
2012-03-07 01:38:07 -0300

29 Feb, 2012

1 commit

2cb24382 Adding button to remove network activities ... Browse Dir »

  * Also making activity removal be available for users who has
    permissions to edit the profile instead of the owner of the
    activity.

(ActionItem2055)

2012-02-29 23:13:10 -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

4 commits

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

Braulio Bhavamitra
2012-02-24 22:31:33 -0200
5d43b171 updating application controller to support layouts from themes Browse Dir »

Daniela Feitosa
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
4e00577f Changes on SearchControllerTest to adapt to new searching method Browse Dir »

Rafael Martins
2012-02-24 22:30:33 -0200

22 Feb, 2012

2 commits

3ba40f31 Fix: profile search problem with filters Browse Dir »

Rafael Martins
2012-02-22 23:06:14 -0200
a5e74081 Fix for event search not finding year or month Browse Dir »

Rafael Martins
2012-02-22 22:11:41 -0200

20 Feb, 2012

1 commit

3fc7f548 Fixes and tweaks for searching Browse Dir »

Rafael Martins
2012-02-20 03:19:57 -0200

19 Feb, 2012

3 commits

50def845 Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse Dir »

Conflicts:
	app/controllers/application.rb
	app/controllers/public/browse_controller.rb
	app/helpers/application_helper.rb
	app/helpers/display_helper.rb
	app/models/environment_finder.rb
	app/models/product.rb
	app/views/layouts/_javascript.rhtml
	app/views/layouts/application-ng.rhtml
	public/javascripts/application.js
	public/stylesheets/application.css
	test/functional/browse_controller_test.rb
	test/functional/search_controller_test.rb
	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake

2012-02-19 20:02:34 -0200

fc05f367 Small fix for BrowseController Browse Dir »

Rafael Martins
2012-02-19 19:29:16 -0200

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

15 Feb, 2012

1 commit

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

Removed whitespace
```
Daniela Feitosa
2012-02-15 03:23:30 -0200

14 Feb, 2012

1 commit

f1d1facc Merge commit 'refs/merge-requests/131' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/131
```
Daniela Feitosa
2012-02-14 18:02:59 -0200