Charles Oliveira / noosfero

12 May, 2015

1 commit

ea5d6c29 merging with master Browse File »

Leandro Santos
2015-05-12 21:45:22 -0300

23 Mar, 2015

1 commit

cdb34d51 Replace fixed option to introduce new edit modes for blocks ... Browse File »

It resolves issue #38

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-03-23 15:30:12 -0300

11 Mar, 2015

1 commit

7e6b77ee Fix box organizer tests Browse File »

Victor Costa
2015-03-11 15:21:34 -0300

10 Mar, 2015

1 commit

40f79235 Block store: change the way to manage blocks ... Browse File »

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

2015-03-10 18:07:44 -0300

27 Feb, 2015

1 commit

c8b8706f fixing merge bug Browse File »

Leandro Santos
2015-02-27 10:17:20 -0300

25 Feb, 2015

1 commit

97944aa9 hotspot for stable Browse File »

Leandro Santos
2015-02-25 12:15:38 -0300

28 Jan, 2015

1 commit

d9a3fdb3 Merge branch 'master' into stable ... Browse File »

Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb

2015-01-28 15:22:56 -0300

21 Jan, 2015

1 commit

5d28b4b3 Add ability to mark blocks as fixed ... Browse File »

Fixed blocks can't be modified by regular users, but only by
administrators. The main use case is defining a few blocks in the user
or community templates, so that users and communities can't remove or
change them.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

2015-01-21 16:20:44 -0200

16 Dec, 2014

2 commits

2aace982 Merge branch 'AI3279-block_store' into stable ... Browse File »

Conflicts:
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/layout_helper.rb

2014-12-16 13:21:30 -0300

dfad044a Merge branch 'master' into AI3279-block_store ... Browse File »

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin/environment_design_controller.rb
	app/helpers/layout_helper.rb
	app/models/block.rb
	script/quick-start

2014-12-16 10:19:11 -0300

22 Jul, 2014

1 commit

9ec2cf52 improve feature to add or move blocks Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-07-22 10:55:11 -0300

17 Jun, 2014

1 commit

e77ff7f1 Merge branch 'rails3' into rails3_stable Browse File »

Victor Costa
2014-06-17 10:41:19 -0300

15 Jun, 2014

1 commit

c3d1e14e Revert "putting back all references to People, Member and Friends blocks" ... Browse File »
```
This reverts commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98.
```
Joenio Costa
2014-06-15 21:51:18 -0300

14 Jun, 2014

1 commit

f8bd2430 putting back all references to People, Member and Friends blocks ... Browse File »
```
the PeopleBlock plugin that comes with these blocks is enabled by
default in any Noosfero's environment

(ActionItem2859)
```
Joenio Costa
2014-06-14 00:46:20 -0300

11 Jun, 2014

1 commit

eb7194d9 invert logic Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-06-11 20:47:15 -0300

09 Jun, 2014

1 commit

40be915c add enable/disable blocks feature Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-06-09 14:05:21 -0300

05 Jun, 2014

1 commit

e6ca4fb7 Merge branch 'master' into AI2859-people_block ... Browse File »

Conflicts:
	app/controllers/admin/environment_design_controller.rb
	app/models/friends_block.rb
	app/models/members_block.rb
	test/functional/environment_design_controller_test.rb
	test/unit/members_block_test.rb

2014-06-05 15:57:38 -0300

17 Mar, 2014

1 commit

88b02d90 Fix cloning blocks at environment_design ... Browse File »
```
(ActionItem3046)
```
Victor Costa
2014-03-17 13:53:01 -0300

21 Jan, 2014

2 commits

e80da508 Merge commit 'refs/merge-requests/339' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…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

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

…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

06 Jan, 2014

1 commit

d4f19d98 Added people_block plugin Browse File »

Francisco Marcelo A. Lima Júnior
2014-01-06 18:54:16 -0300

04 Jul, 2013

1 commit

dd55c842 Clone blocks Browse File »

Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso
2013-07-04 22:14:54 +0000

14 Jun, 2013

1 commit

082a5c33 Enable side blocks on product catalog ... Browse File »
```
Also adds the ProductCategoriesBlock to list the catalog anywhere.

ActionItem896
```
Aurélio A. Heckert
2013-06-14 19:02:13 -0300

01 Jun, 2013

1 commit

5a86933d Translate disable_products_for_enterprises_enabled env setting ... Browse File »

The disable_* settings for environment are incoherent with the
user interface and with the code itself. This changes correct
only one incoherent setting as an example how to do with all
others.

2013-06-01 09:54:17 -0300

24 Apr, 2013

1 commit

1451d7e5 Merge commit 'refs/merge-requests/259' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/259

Conflicts:
	app/controllers/admin/environment_design_controller.rb
```
Rodrigo Souto
2013-04-24 21:36:25 -0300

15 Jan, 2013

1 commit

af3c320b adding hotspots to make possible add other blocks Browse File »

Leandro Nunes dos Santos
2013-01-15 14:06:26 -0300

20 Oct, 2012

1 commit

a39440b0 Fixed problem with form submit Browse File »

Daniela Feitosa
2012-10-20 17:30:29 -0300

11 May, 2011

2 commits

40b3903a Merge branch 'stable' Browse File »

Joenio Costa
2011-05-11 23:00:52 -0300

1a8aab81 Fans Block ... Browse File »

This is an enterprise block that shows all people that added the
enterprise as "favorite".

(ActionItem356)

2011-05-11 17:46:22 -0300

28 Apr, 2011

1 commit

40cccd78 Allow environment admin add RawHTMLBlock to profiles Browse File »

Joenio Costa
2011-04-28 19:49:03 -0300

18 Jan, 2011

1 commit

634dc3b5 Search content of a profile ... Browse File »

* new controller profile_search
* new block profile_search_block
* added on style.css background images for mimetypes icons
* new route profile/foo/search?q=bar

(ActionItem1734)

2011-01-18 18:09:42 -0300

09 Jul, 2010

1 commit

1e4063df Create a block to make the products highlighted: ... Browse File »

* This block must be available to Enterprises and the enterprise
  administrator could choose what products will be highlighted
* The environment could have this block and in this case the products
  are choosen randomically

(ActionItem1576)

2010-07-09 00:42:07 -0300

29 Jun, 2010

1 commit

553f852e Creating a block to make some images highlighted on environment and enterprises ... Browse File »
```
The user could choose which image It want to see at the moment, each image
may also be associated with a link

(ActionItem1564)
```
Leandro Santos
2010-06-29 16:28:57 -0300

13 Jan, 2010

1 commit

e85ae8ae Block to display images from gallery ... Browse File »
```
(ActionItem1357)
```
Joenio Costa
2010-01-13 15:27:42 -0300

02 Dec, 2009

1 commit

d7ab4a9d Georeferencing ... Browse File »

  * The user can set his location in the map by dragging
    a marker or by setting his address in the form.
  * After setting his location, the map is added to
    the location block.
  * The user can configure the zoom level and the map
    type that will be shown in the location block.

ActionItem1256

2009-12-02 17:05:26 -0300

25 May, 2009

1 commit

0de6b0fe ActionItem1043: allowing to edit the limit of profile list block Browse File »

Antonio Terceiro
2009-05-25 23:47:12 -0300

21 May, 2009

1 commit

cbcb5e58 ActionItem1049: general review while working on the new icon theme Browse File »

Antonio Terceiro
2009-05-21 09:19:14 -0300

20 Mar, 2009

1 commit

47bbb6bf ActionItem936: RSS reader block Browse File »

Joenio Costa
2009-03-20 16:38:15 -0300

01 Dec, 2008

2 commits

7ad7c0aa Merge commit 'fdbbe06c634e5a3753cc008e0cc75ca740151a6d ' Browse File »

Joenio Costa
2008-12-01 15:06:29 -0300
fdbbe06c ActionItem856: adding block for disabled enterprise message and css Browse File »

Daniela Feitosa
2008-12-01 12:08:20 -0300