Omar Junior / Noosfero

27 Nov, 2013

1 commit

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

22 Nov, 2013

1 commit

53d447a8 Lists all roles a user has in a community Browse File »

Larissa Reis
2013-11-22 16:46:14 -0300

05 Nov, 2013

1 commit

3133eb48 Merge branch 'stable' ... Browse File »

Conflicts:
	script/quick-start
	test/unit/application_helper_test.rb
	test/unit/environment_statistics_block_test.rb
	test/unit/environment_test.rb

2013-11-05 19:10:53 -0300

31 Oct, 2013

3 commits

04962ef3 Merge branch 'parse-everything' into stable Browse File »

Rodrigo Souto
2013-10-31 18:35:27 -0300
ad864378 environment_tests: fix tests due to new enable feature save as default behaviour Browse File »

Rodrigo Souto
2013-10-31 20:57:07 +0000

419bcf2a filter_html: parse only sources that have macros ... Browse File »

This solves every problem related with Hpticot breaking pages since the
parse was happening on the MainBlock too. But this does not changes the
fact tha Hpricot is currently dead and we should move on to nokogiri.

(ActionItem2873)

2013-10-31 17:40:53 -0300

10 Oct, 2013

1 commit

688b3512 environment_features: passing false on enable/disable in cases where should not save the environment Browse File »

Rodrigo Souto
2013-10-10 21:25:13 -0300

16 Jul, 2013

2 commits

af128233 [macro-support-review] Final adjustments Browse File »

Rodrigo Souto
2013-07-16 11:59:03 -0300
a52480d8 [macro-support-review] Adding index on article name Browse File »

Rodrigo Souto
2013-07-16 10:43:13 -0300

15 Jul, 2013

2 commits

62be815f [macro-support-review] Adding identifier method for macro Browse File »

Rodrigo Souto
2013-07-15 19:23:25 -0300
07caf3d4 [macro-support-review] Refactoring macros infra-structure Browse File »

Rodrigo Souto
2013-07-15 19:14:08 -0300

08 Jul, 2013

1 commit

d0a55e25 merging with stable Browse File »

Leandro Nunes dos Santos
2013-07-08 16:50:24 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse File »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300

09 May, 2013

1 commit

7d51ce8b Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/298

Added html_safe that was missing on the block_helper new method

Conflicts:
	app/views/box_organizer/_highlights_block.rhtml
	test/unit/application_helper_test.rb

2013-05-09 15:36:19 -0300

17 Apr, 2013

1 commit

527ee379 Merge branch 'stable' ... Browse File »

Basically html_safe in some places that the stable branch had.

Conflicts:
	app/models/article_block.rb
	app/models/tags_block.rb

2013-04-17 17:12:26 -0300

12 Apr, 2013

1 commit

3599b17b Restricting template alternatives to those inside the current environment ... Browse File »
```
ActionItem2608
```
Visita
2013-04-12 19:40:37 -0300

03 Apr, 2013

2 commits

256b8bf2 Merge commit 'refs/merge-requests/275' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/275

Conflicts:
	test/unit/application_helper_test.rb
```
Rodrigo Souto
2013-04-03 21:51:17 -0300
c4fe95aa Fixing conflicting link_to_article method signature Browse File »

Rodrigo Souto
2013-04-03 21:46:20 -0300

28 Mar, 2013

1 commit

76ea3016 move display_short_format to the generic ApplicationHelper Browse File »

Aurélio A. Heckert
2013-03-28 22:38:01 -0300

25 Mar, 2013

1 commit

28513273 support to add css class without replace original on button_bar Browse File »

Aurélio A. Heckert
2013-03-25 18:43:46 -0300

20 Feb, 2013

1 commit

260f0d79 Adding macro support for TinyMCE articles and a plugin called CommentGroupMacro … ... Browse File »
```
…that uses the macro support
```
Leandro Nunes dos Santos
2013-02-20 11:15:09 -0300

06 Feb, 2013

1 commit

4de6c173 Filter useful folders to upload images and pre-select a gallery ... Browse File »
```
closes ActionItem2567
```
Aurélio A. Heckert
2013-02-06 17:09:46 -0300

04 Nov, 2012

1 commit

339df62d Enhancements on privacy settings ... Browse File »
```
Added tests
Added background on edition of profile to be easier to know which field
the checkbox is related

(ActionItem1717)
```
Daniela Feitosa
2012-11-04 17:11:49 -0200

08 Aug, 2012

1 commit

6ffa3e97 Removed template option when environment doesn't have any ... Browse File »
```
(ActionItem2378)
```
Daniela Feitosa
2012-08-08 14:34:14 -0300

20 Feb, 2012

1 commit

8260f403 Fixes for unit tests (after merge) ... Browse File »

* A few syntax problems
* Removed tests for removed models
* Replaced 'browse' with 'search' controller
* Created EnterpriseHomepageHelperTest
* Fixes to work with Solr

2012-02-20 00:33:09 -0200

27 Jan, 2012

1 commit

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

26 Jan, 2012

2 commits

47b1c180 Fixing broken tests with gravatar ... Browse File »
```
(ActionItem2125)
```
Daniela Feitosa
2012-01-26 00:59:39 -0200
c76b4bb6 Merge commit 'refs/merge-requests/60' of git://gitorious.org/noosfero/noosfero i… ... Browse File »
```
…nto merge-requests/60

Conflicts:
	test/unit/application_helper_test.rb

(ActionItem2125)
```
Daniela Feitosa
2012-01-26 00:59:13 -0200

23 Jan, 2012

1 commit

2cd9bf00 Merge branch 'stable' Browse File »

Daniela Feitosa
2012-01-23 20:49:18 -0200

18 Jan, 2012

1 commit

b95442c7 Discard view_paths added by Noosfero's plugins ... Browse File »
```
(ActionItem2244)
```
Joenio Costa
2012-01-18 18:01:49 -0200

11 Jan, 2012

1 commit

9b39bfdc Tests for Gravatar Support ... Browse File »
```
Adds gravatar_support.feature (selenium tests) and new path for cucumber
```
Aurelio A. Heckert
2012-01-11 19:03:48 -0200

10 Jan, 2012

1 commit

2454d82e Merge branch 'stable' Browse File »

Daniela Feitosa
2012-01-10 20:33:54 -0200

04 Jan, 2012

1 commit

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

23 Dec, 2011

1 commit

bbb0c343 Fixes on redesigned catalog ... Browse File »

* Reusing code to add zoom to product's images
* Changing strings to allow translation
* Removing whitespaces

(ActionItem2111)

2011-12-23 00:48:28 -0200

07 Dec, 2011

1 commit

309bdd2d fixing some translations, and tests about leave button(related to ActionItem2136) Browse File »

João M. M. da Silva + Paulo Meirelles
2011-12-07 20:49:28 +0300

27 Nov, 2011

1 commit

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

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

31 Oct, 2011

1 commit

f42d8db4 Allow theme config for Gravatar default image ... Browse File »
```
closes ActionItem2124
```
Aurelio A. Heckert
2011-10-31 17:28:38 -0200

10 Oct, 2011

2 commits

619223c6 Bsc Plugin ... Browse File »

* 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

5d77e0b5 Merge commit 'refs/merge-requests/7' of git://gitorious.org/noosfero/noosfero Browse File »

Joenio Costa
2011-10-10 09:43:46 -0300

09 Aug, 2011

1 commit

7214021c Making tests more understandable :) ... Browse File »
```
(ActionItem2033)
```
Daniela Feitosa
2011-08-09 19:04:04 -0300