Omar Junior / Noosfero

16 Mar, 2014

1 commit

c3453051 Make a plugin to display statistics from Environment and Profiles ... Browse Dir »

- Removed EnvironmentStatisticsBlock from core. Environment's admins
  should enable the statistics block for its environment

Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

(ActionItem2851)

2014-03-16 20:48:37 -0300

07 Mar, 2014

3 commits

d0561132 Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

c34cadf1 Fixed failing tests Browse Dir »

Daniela Feitosa
2014-03-07 10:25:18 +0000
ebdbd8ac Removed unused method ... Browse Dir »
```
It's not used anymore since:
ca5ebf95375cd5dbb80a047dc79f4c31e36df899
```
Daniela Feitosa
2014-03-07 10:11:05 +0000

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse Dir »
```
Ai2943 Container Block Fixes

Fix broken edition for container block with the new css for sideboxes view.
```
Daniela Feitosa
2014-03-05 17:53:53 +0000

02 Mar, 2014

1 commit

5ff853b4 Merge branch 'AI2925-add_tittle_field_on_link_list_block' of https://gitlab.com/… ... Browse Dir »
```
…unb-gama/noosfero into AI2925-add_tittle_field_on_link_list_block

Conflicts:
	app/views/box_organizer/_link_list_block.rhtml
```
Daniela Feitosa
2014-03-02 13:38:51 +0000

01 Mar, 2014

2 commits

c1fce26e Removed unnecessary assertion on test ... Browse Dir »
```
(ActionItem2909)
```
Daniela Feitosa
2014-03-01 15:40:24 +0000
a508d544 fix: failing test on first and last day of a month Browse Dir »

Daniela Feitosa
2014-03-01 15:32:57 +0000

28 Feb, 2014

1 commit

f15193c3 Merge branch 'ActionItem2909-SortUsersAlphabetically' of https://gitlab.com/unb-… ... Browse Dir »
```
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
```
Daniela Feitosa
2014-02-28 22:09:05 +0000

13 Feb, 2014

3 commits

a24f068a array-ext: add test to uniq_by method Browse Dir »

Rodrigo Souto
2014-02-13 22:41:24 -0300
5c115a98 macros: add macro tests Browse Dir »

Rodrigo Souto
2014-02-13 20:51:04 -0300

ca5e7eb8 Revert "macro: fix attributes after nokogiri change and write some tests" ... Browse Dir »

This reverts commit 25018e09d903cb9a6cb064ea447888fe2e1c1d39.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

2014-02-13 20:34:03 -0300

10 Feb, 2014

2 commits

1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

Rodrigo Souto
2014-02-10 22:13:58 -0300
0c8b3cbe Merge branch 'noosfero_0.46.0' into stable Browse Dir »

Rodrigo Souto
2014-02-10 22:12:52 -0300

08 Feb, 2014

1 commit

e381bcc6 Destroy roles when environment is destroyed ... Browse Dir »
```
(ActionItem2987)
```
Daniela Feitosa
2014-02-08 15:30:01 +0000

29 Jan, 2014

2 commits

4f784bd7 template-tests: add is_template to fix templates tests Browse Dir »

Rodrigo Souto
2014-01-29 18:00:18 -0300

79d66909 comment: remove comment_as_thread method ... Browse Dir »

This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899
and was mistakenly included on this merge
4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix
70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't
removed.

2014-01-29 20:32:15 +0000

28 Jan, 2014

5 commits

25018e09 macro: fix attributes after nokogiri change and write some tests Browse Dir »

Rodrigo Souto
2014-01-28 21:34:24 +0000
5e853854 person-test: remove unnecessary tests Browse Dir »

Rodrigo Souto
2014-01-28 18:51:13 +0000
a42fb86d unit_test: correct misspelled words on person_test ... Browse Dir »
```
ActionItem1011
```
Ana Losnak
2014-01-28 18:42:18 +0000
eb5062af profile_editor: add extra optional fields for person ... Browse Dir »
```
Signed-off-by: Ana Losnak <analosnak@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>

ActionItem1011
```
Ana Losnak
2014-01-28 18:42:02 +0000
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

23 Jan, 2014

4 commits

4b01e9da Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into … ... Browse Dir »
```
…sub_organizations_improvements
```
Joenio Costa
2014-01-23 22:03:46 -0300
6d7a0824 Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-01-23 19:15:27 -0300
6261e6cf add title field to link list block ... Browse Dir »
```
(ActionItem2925)
```
Francisco Marcelo A. Lima Júnior
2014-01-23 15:25:04 -0500
cf94bc1e container_block: do not show its boxes at add_block view Browse Dir »

Victor Costa
2014-01-23 13:56:21 -0300

22 Jan, 2014

4 commits

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

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000
8caf11c4 product-categories-block: add 'catalog_only' option and define it as default Browse Dir »

Rodrigo Souto
2014-01-22 20:20:34 +0000
f7c88798 block: add support for custom display modes for blocks Browse Dir »

Rodrigo Souto
2014-01-22 20:17:48 +0000
43535f4f boxes-helper: add params to context passed to the block Browse Dir »

Rodrigo Souto
2014-01-22 20:04:18 +0000

21 Jan, 2014

4 commits

764f2771 clone-block: replace enabled=false by display=:never Browse Dir »

Rodrigo Souto
2014-01-21 20:02:46 +0000
e80da508 Merge commit 'refs/merge-requests/339' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/339

Conflicts:
	app/models/block.rb
	public/designs/icons/tango/style.css
	test/unit/block_test.rb
```
Rodrigo Souto
2014-01-21 16:45:31 -0300
e59c8ae2 product-categories-block: not visible when products are disabled on the environment Browse Dir »

Rodrigo Souto
2014-01-21 19:34:30 +0000

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

20 Jan, 2014

2 commits

362d23e0 Move to vote plugin all modifications on core related to vote_fu ... Browse Dir »
```
(ActionItem2786)
```
Victor Costa
2014-01-20 18:44:17 -0300
bf559b5f box: pass holder class as type for extra blocks hotspot ... Browse Dir »
```
(ActionItem2958)
```
Rodrigo Souto
2014-01-20 19:21:05 +0000

19 Jan, 2014

1 commit

25f34b4d article_versions: list of versions on a new page ... Browse Dir »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000

18 Jan, 2014

3 commits

8e720312 Replacing rev by version Browse Dir »

Daniela Feitosa
2014-01-18 21:11:45 +0000
d7da0420 Added methods to return data from specific version ... Browse Dir »
```
(ActionItem2822)
```
Daniela Feitosa
2014-01-18 16:32:20 +0000
bf80644c Add new template to display versioned article ... Browse Dir »
```
Also included revision number on cache key

Signed-off-by: Daniela Feitosa

(ActionItem2822)
```
Ana Losnak
2014-01-18 16:32:19 +0000