Thiago Ribeiro / Noosfero

10 May, 2013

1 commit

- Syntax error on chat
- Reviewed INSTALL.chat
- Added function to update the list of users online on main window

(ActionItem2667)

2013-05-10 18:02:38 +0000

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

15 Apr, 2013

5 commits

63c12a71 Merge commit 'refs/merge-requests/303' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/303
```
Rodrigo Souto
2013-04-15 16:24:20 -0300
16ad2251 Replaced onclick by onmouseover on translations link Browse Dir »

Daniela Feitosa
2013-04-15 18:41:20 -0300
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
9f26e921 Merge commit 'refs/merge-requests/302' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/302
```
Rodrigo Souto
2013-04-15 14:42:30 -0300
3f5de83e Adding visual indicator when comments in profile walls are being sent ... Browse Dir »
```
ActionItem2638
```
Visita
2013-04-15 13:47:12 -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

11 Apr, 2013

1 commit

c054d8c6 Merge commit 'refs/merge-requests/299' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/299
```
Rodrigo Souto
2013-04-11 19:06:48 -0300

10 Apr, 2013

3 commits

cb82652b Merge branch 'html-escape' into stable Browse Dir »

Rodrigo Souto
2013-04-10 16:24:27 -0300
086f3729 Fixing escapes due to debian security release 2.3.5-1.2+squeeze8 ... Browse Dir »
```
(ActionItem2630)
```
Rodrigo Souto
2013-04-10 16:24:05 -0300
1df7a3b9 Escaping title html in block_helper::block_title() ... Browse Dir »
```
ActionItem2632
```
Visita
2013-04-10 12:19:01 -0300

05 Apr, 2013

4 commits

0085fd49 Adding missing require to csv Browse Dir »

Rodrigo Souto
2013-04-05 16:01:33 -0300
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
d3cc4cd5 Merge commit 'refs/merge-requests/289' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/289
```
Rodrigo Souto
2013-04-05 14:37:43 -0300

03 Apr, 2013

7 commits

bd3ef039 Replacing find search by where on select_profile_folder(lazy loading) Browse Dir »

Rodrigo Souto
2013-04-03 22:04:17 -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
bf19f3c4 Removing little mistaken quote Browse Dir »

Rodrigo Souto
2013-04-03 21:10:56 -0300
b95e8647 Merge commit 'refs/merge-requests/254' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/254

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application-ng.rhtml
```
Rodrigo Souto
2013-04-03 21:10:42 -0300
9d2d6b4b Changing variable name to default convention Browse Dir »

Rodrigo Souto
2013-04-03 20:35:34 -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

5 commits

d66fe2c0 enable lead view for events Browse Dir »

Aurélio A. Heckert
2013-03-28 22:53:15 -0300
8664a324 code beauty to article_block Browse Dir »

Aurélio A. Heckert
2013-03-28 22:50:06 -0300
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

26 Mar, 2013

2 commits

c348371a Merge branch 'merge-requests/267' Browse Dir »

Rodrigo Souto
2013-03-26 16:38:57 -0300
03d33e49 Fixed test: comment.feature Browse Dir »

Rodrigo Souto
2013-03-26 19:36:37 +0000

22 Mar, 2013

2 commits

1bec32a8 Fixing pre-population on add members Browse Dir »

Rodrigo Souto
2013-03-22 20:23:05 +0000
571fbdb1 Adding enterprise homepage link to catalog categories Browse Dir »

Rodrigo Souto
2013-03-22 16:26:26 -0300

20 Mar, 2013

2 commits

5cd956a4 Fixed test: features/send_email_to_environment_members.feature ... Browse Dir »

Also removing the :url param on 2 admin view forms that were breaking
the tests. They were originally include to avoid linking to the wrong
page on profiles with own domain.  But this pages will not be visualized
if they are not using the environment domain, therefore there is no need
to used this params.

2013-03-20 20:16:56 +0000

448366be Merge commit 'refs/merge-requests/267' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/267

Conflicts:
	features/signup.feature
	features/step_definitions/noosfero_steps.rb

Making tests on signup wait for the bot trap time and use selenium.
```
Rodrigo Souto
2013-03-20 15:28:46 -0300

18 Mar, 2013

3 commits

146786cb Fixing cucumber tests Browse Dir »

Rodrigo Souto
2013-03-18 22:58:14 +0000

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

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