Thiago Ribeiro / Noosfero

07 May, 2013

1 commit

b2a0c431 Merge branch 'master' into pluginize-solr ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	app/views/layouts/application-ng.rhtml
	lib/noosfero/plugin.rb
	script/noosfero-plugins
```
Rodrigo Souto
2013-05-07 13:36:10 -0300

24 Apr, 2013

1 commit

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

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

20 Apr, 2013

1 commit

2d5abd83 mergin with master Browse Dir »

root
2013-04-20 21:31:06 -0300

17 Apr, 2013

2 commits

97fe0f50 Fixing master tests after merge with stable Browse Dir »

Rodrigo Souto
2013-04-17 22:16:28 -0300

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

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

16 Apr, 2013

1 commit

d8c5b8ef Fixing content_viewwer translation link test Browse Dir »

Rodrigo Souto
2013-04-16 13:45:30 -0300

15 Apr, 2013

3 commits

09dd907e Just changing the tempalates named_scope to receive environment instead of environment_id Browse Dir »

Rodrigo Souto
2013-04-15 15:12:01 -0300
e909e2c6 Adding tests for enterprise templates ... Browse Dir »
```
ActionItem2608
```
Visita
2013-04-15 11:31:31 -0300
862ea7b0 Adding tests for communities templates ... Browse Dir »
```
ActionItem2608

Note: tests for users templates were made in the previous commit.
```
Visita
2013-04-15 11:14:01 -0300

12 Apr, 2013

1 commit

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

10 Apr, 2013

1 commit

1df7a3b9 Escaping title html in block_helper::block_title() ... Browse Dir »
```
ActionItem2632
```
Visita
2013-04-10 12:19:01 -0300

05 Apr, 2013

2 commits

5c6a55e0 Merge commit 'refs/merge-requests/297' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/297
```
Rodrigo Souto
2013-04-05 14:59:09 -0300
7c6b674e Apply admin/users_controller::index() optimization to stable ... Browse Dir »
```
ActionItem2217
```
Visita
2013-04-05 16:08:33 -0300

03 Apr, 2013

6 commits

aa318276 Completing folder select test Browse Dir »

Rodrigo Souto
2013-04-03 22:05:25 -0300
256b8bf2 Merge commit 'refs/merge-requests/275' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…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 Dir »

Rodrigo Souto
2013-04-03 21:46:20 -0300
6888d8e9 Renaming blocks integration test Browse Dir »

Rodrigo Souto
2013-04-03 20:37:00 -0300
1d0e84f4 Fixing short html article test Browse Dir »

Rodrigo Souto
2013-04-03 20:36:23 -0300
3ea04c54 Merge commit 'refs/merge-requests/188' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/188
```
Rodrigo Souto
2013-04-03 19:41:21 -0300

28 Mar, 2013

4 commits

aaccd5c4 makes Article::to_html finally configurable Browse Dir »

Aurélio A. Heckert
2013-03-28 22:43:45 -0300
76ea3016 move display_short_format to the generic ApplicationHelper Browse Dir »

Aurélio A. Heckert
2013-03-28 22:38:01 -0300
0f6edf86 condensed date periods Browse Dir »

Aurélio A. Heckert
2013-03-28 21:59:33 -0300
c5b9f977 Merge branch 'master' into solr-commits Browse Dir »

Rodrigo Souto
2013-03-28 16:55:47 +0000

27 Mar, 2013

1 commit

5d0a0e66 Fixing test: content_viewer Browse Dir »

Rodrigo Souto
2013-03-27 15:22:24 +0000

18 Mar, 2013

3 commits

67e8ceed Merge branch 'master' into pluginize-solr Browse Dir »

Rodrigo Souto
2013-03-18 21:16:54 -0300

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

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