Thiago Ribeiro / Noosfero

22 Jan, 2014

1 commit

6abd4658 rails3: fix mass-assignment errors on functional tests Browse File »

Victor Costa
2014-01-22 16:40:47 -0300

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

05 Dec, 2013

1 commit

8d5373b9 Merge commit 'refs/merge-requests/413' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/413
```
Rodrigo Souto
2013-12-05 15:01:52 -0300

21 Nov, 2013

1 commit

c3e49384 Removed whitespaces ... Browse File »
```
Also allowing the expire of cache from old layouts
```
Daniela Feitosa
2013-11-21 14:30:07 +0000

20 Nov, 2013

2 commits

9b3332e5 Merge branches 'ActionItem2738' and 'ActionItem2738_merge' into ActionItem2738_merge Browse File »

Leandro Nunes dos Santos
2013-11-20 15:44:19 -0300
2abc4514 merging with next colivre branch Browse File »

Leandro Nunes dos Santos
2013-11-20 09:38:03 -0300

04 Nov, 2013

1 commit

9f1c4507 Render the container block box at container view ... Browse File »

Render container block box and do not override children boxes
makes drag and drop functional.

Also fix article block to not use direct box attribute
and use owner method instead.

2013-11-04 17:08:41 -0300

01 Aug, 2013

1 commit

cf841a42 Fix partially ArticleBlock unit test Browse File »

Leandro Santos
2013-08-01 09:08:40 -0300

16 May, 2013

1 commit

1c68caa0 Makes FilePresenter to work with all noosfero tests II ... Browse File »
```
ActionItem2373
```
Aurélio A. Heckert
2013-05-16 08:53:13 -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

10 Apr, 2013

1 commit

086f3729 Fixing escapes due to debian security release 2.3.5-1.2+squeeze8 ... Browse File »
```
(ActionItem2630)
```
Rodrigo Souto
2013-04-10 16:24:05 -0300

28 Mar, 2013

1 commit

8664a324 code beauty to article_block Browse File »

Aurélio A. Heckert
2013-03-28 22:50:06 -0300

18 Mar, 2013

2 commits

c4c81bc9 Better support for blogs on ArticleBlocks ... Browse File »

This commit has the participation of Lucas Prado Melo

It includes:
* Make blog pagination link to absolute path
* Configure blog display on block view
* List blogs on article block selection
* Auto select the first text article (if there is one)
* Testing!

2013-03-18 18:09:14 -0300

02eedc73 Enable Blog in the ArticleBlock ... Browse File »
```
ActionItem2381
```
Aurelio A. Heckert
2013-03-18 10:41:47 -0300

09 Feb, 2012

1 commit

e2fcf1a6 Making BlogArchiveBlock consider view permissions ... Browse File »

  * Needed to rewrite the signature of all the method 'content' of all
  blocks.

  Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br>

(ActionItem1549)

2012-02-09 16:45:18 -0200

06 Jul, 2010

1 commit

25cd3e95 Article block do not show pagination links with images ... Browse File »

	* Added an option to the Article#to_html named :gallery_view.
	  This option is used to contextualize the html that should be
	  generated.

(ActionItem1545)

2010-07-06 22:37:29 -0300

17 May, 2010

1 commit

be52cafc Merge branch 'stable' Browse File »

Antonio Terceiro
2010-05-17 20:18:07 -0300

14 May, 2010

1 commit

13d40bdb Allowing uploaded files to be added on article block ... Browse File »
```
* Moved article_to_html to ApplicationHelper

(ActionItem1526)
```
Daniela Feitosa
2010-05-14 10:05:17 -0300

30 Apr, 2010

1 commit

1091ed79 Merge branch 'stable' ... Browse File »
```
Conflicts:
	test/unit/article_block_test.rb
```
Antonio Terceiro
2010-04-30 08:40:14 -0300

28 Apr, 2010

2 commits

bf6363a6 Displaying title on article block ... Browse File »
```
(ActionItem1492)
```
Daniela Feitosa
2010-04-28 14:47:19 -0300
0cdd5cb4 Add article block on environment context. Closes ActionItem1460 Browse File »

Leandro Santos
2010-04-28 13:58:59 -0300

05 Feb, 2010

1 commit

bdec1641 Better usability when adding a block. ... Browse File »

  * Reviewed all block desciptions; changed them to a single, short phrase
    describing the purpose of the block and removed the "term" block since
    it's not necessary in the context
  * Making better use of the space in "add block" popup

2010-02-05 12:44:29 -0300

28 May, 2009

2 commits

6c8063ab ActionItem1049: fixing tests Browse File »

Antonio Terceiro
2009-05-28 20:18:44 -0300
5e3d54c1 ActionItem1049: adding to_i in article_bloc Browse File »

Daniela Feitosa
2009-05-28 17:15:06 -0300

05 Sep, 2008

1 commit

548e53dd ActionItem615: enhancing sidebox manipulation ... Browse File »

    * Added more options to move blocks: a button for "move this block
      to the oposite side".
    * Added help button for each block.
      + Wrote help for all blocks, plus enhancing the existing help in
      some blocks.
    * Adapted tests to the new bahaviour and added some tests.

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2463 3f533792-8f58-4932-b0fe-aaf55b0a4547

2008-09-05 11:06:33 +0000

09 Jul, 2008

1 commit

69cc2e43 ActionItem543: changing default title of blocks ... Browse File »
```
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2184 3f533792-8f58-4932-b0fe-aaf55b0a4547
```
AntonioTerceiro
2008-07-09 17:18:02 +0000

04 Jul, 2008

1 commit

2084ef47 ActionItem490: "finishing" products block ... Browse File »
```
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2152 3f533792-8f58-4932-b0fe-aaf55b0a4547
```
AntonioTerceiro
2008-07-04 17:54:52 +0000

28 Mar, 2008

1 commit

0af76ab3 ActionItem231: fixed reference to unexisting (e.g. removed) article. ... Browse File »
```
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1614 3f533792-8f58-4932-b0fe-aaf55b0a4547
```
AntonioTerceiro
2008-03-28 00:39:07 +0000

24 Jan, 2008

1 commit

8238d31d ActionItem152: removing the optional parameter from content method ... Browse File »
```
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1262 3f533792-8f58-4932-b0fe-aaf55b0a4547
```
AntonioTerceiro
2008-01-24 17:11:10 +0000

18 Jan, 2008

2 commits

9ce6f648 ActionItem152: adding a new block type and playing with block editor ... Browse File »
```
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1238 3f533792-8f58-4932-b0fe-aaf55b0a4547
```
AntonioTerceiro
2008-01-18 23:59:57 +0000
84334464 ActionItem152: adding ArticleBlock; first try ... Browse File »
```
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1236 3f533792-8f58-4932-b0fe-aaf55b0a4547
```
AntonioTerceiro
2008-01-18 21:12:13 +0000