NoosferoGov / noosfero

15 Mar, 2012

1 commit

df397df0 Remove timeout and fix solr:reindex Browse Dir »

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

09 Mar, 2012

1 commit

a162da01 Fix solr start and stop Browse Dir »

Rafael Martins
2012-03-09 11:06:59 -0300

07 Mar, 2012

1 commit

873fdd2e Use test configution in cucumber solr env. Browse Dir »

Rafael Martins
2012-03-07 10:40:49 -0300

20 Feb, 2012

1 commit

2d03f297 Update solr to version 3.5 and improve schema Browse Dir »

Rafael Martins
2012-02-20 11:02:43 -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

0f829cb7 Fix for cucumber environment gems spec (wrongly merged) Browse Dir »

Rafael Martins
2012-02-19 19:27:59 -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

27 Jan, 2012

3 commits

f8e8c607 Merge remote branch 'origin/master' into rails-2.3.5 ... Browse Dir »
```
Conflicts:
	app/helpers/application_helper.rb
	debian/changelog
	vendor/plugins/monkey_patches/touch/init.rb
```
Antonio Terceiro
2012-01-27 19:41:52 +0000
b1c0c2a9 Fix Portuguese and Armenian Browse Dir »

Antonio Terceiro
2012-01-27 17:17:16 +0000
0661c78e Add locale files ... Browse Dir »
```
Those were obtained from the `rails-2.3` branch of
https://github.com/svenfuchs/rails-i18n
```
Antonio Terceiro
2012-01-27 16:43:19 +0000

24 Jan, 2012

1 commit

9d8ebf69 Signup interface improvements ... Browse Dir »
```
(ActionItem2070)
```
Caio Almeida
2012-01-24 14:21:44 -0200

16 Jan, 2012

2 commits

0d62704c Revert "Signup interface improvements" ... Browse Dir »
```
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
```
Caio Almeida
2012-01-16 14:15:18 -0300
5ee0d0ee Signup interface improvements Browse Dir »

Caio Almeida
2012-01-16 14:14:45 -0300

11 Jan, 2012

2 commits

fb40cfbd Fix dangling symlink vendor/rails if necessary Browse Dir »

Antonio Terceiro
2012-01-11 12:42:20 -0200
a231b1b9 Support both Debian stable and unstable/testing Browse Dir »

Antonio Terceiro
2012-01-11 12:36:34 -0200

04 Jan, 2012

1 commit

8665815d Move improper cache expiring to a sweeper Browse Dir »

Antonio Terceiro
2012-01-04 14:01:32 -0200

24 Dec, 2011

2 commits

81eb23f2 Add MapBalloonController ... Browse Dir »
```
Map balloons are now loaded by Ajax and have their own controller and
views.
```
Braulio Bhavamitra
2011-12-24 11:18:21 +0000
bfc1f50f Remove browse controller routes Browse Dir »

Braulio Bhavamitra
2011-12-24 11:17:43 +0000

22 Dec, 2011

3 commits

245398e9 Add acts_as_faceted lib for declaring facets Browse Dir »

Braulio Bhavamitra
2011-12-22 01:56:20 +0000

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

This reverts commit 4e223943ab159d8fa7faf4b042ec3121d74ed32e.

Conflicts:

	app/controllers/my_profile/profile_members_controller.rb
	config/solr.yml.dist
	features/step_definitions/noosfero_steps.rb
	lib/tasks/test.rake
	test/functional/profile_members_controller_test.rb
	test/unit/category_finder_test.rb

2011-12-22 00:34:12 +0000

22bc741d Revert "Removing solr config file" ... Browse Dir »
```
This reverts commit 1112620ea084317eb0f97ab0ad92c2019c1be248.
```
Braulio Bhavamitra
2011-12-22 00:27:52 +0000

21 Dec, 2011

1 commit

851115af Fixing the position of the optional format Browse Dir »

Antonio Terceiro
2011-12-21 18:10:05 -0200

12 Dec, 2011

1 commit

48840ab2 Remove dependencies from config/environments/*.rb Browse Dir »

Antonio Terceiro
2011-12-12 08:04:52 -0200

09 Dec, 2011

1 commit

36691882 Merge branch 'master' into rails-2.3.5 ... Browse Dir »
```
Conflicts:
	debian/changelog
	test/unit/dates_helper_test.rb
```
Antonio Terceiro
2011-12-09 08:33:30 -0200

29 Nov, 2011

1 commit

15e73216 Documenting cucumber's dependencies and updading HACKING doc ... Browse Dir »
```
(ActionItem2203)
```
Joenio Costa
2011-11-29 11:45:54 -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

10 Oct, 2011

1 commit

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

17 Aug, 2011

1 commit

1112620e Removing solr config file ... Browse Dir »
```
(ActionItem1958)
```
Daniela Feitosa
2011-08-17 08:29:09 -0300

16 Aug, 2011

3 commits

a56214cf Revert "Fix cucumber installation and tests" ... Browse Dir »

This reverts commit ba869eb36522034b60d819fb4d83bd0b0a751033.

Conflicts:

	config/solr.yml.dist
	lib/tasks/cucumber.rake

There are some problems with solr
(ActionItem1958)

2011-08-16 18:51:39 -0300

7338101a Revert "Changed list of possible gems version" ... Browse Dir »
```
This reverts commit 3ff810f83cd374943972a0630c30389f783fa077.

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

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

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

2 commits

3ff810f8 Changed list of possible gems version Browse Dir »

Daniela Feitosa
2011-08-11 15:24:41 -0300
ba869eb3 Fix cucumber installation and tests ... Browse Dir »
```
Now cucumber gems should install fine with RAILS_ENV=cucumber
gems:install in Debian Lenny and its task start/stop solr
```
Braulio Bhavamitra
2011-08-11 15:20:09 -0300

08 Aug, 2011

1 commit

a837f96c Adding Plugin hotspot 'parse_content' ... Browse Dir »

also:
- fix noosfero/i18n: error_messages_for should works as documented in
  Rails API (accept param :header_message => '...')
- new helper method to display errors in a dialog box
- now Plugins knows what is URL to admin itself
- defining paths to cucumber steps and setup files in config/cucumber.yml
- allow plugins to have documentation in same way as Noosfero core

(ActionItem2056)

2011-08-08 15:47:35 -0300