Software Publico / Noosfero

11 Jul, 2013

18 commits

2e6acc56 Fixing typo on trusted sites permission name Browse Code »

Rodrigo Souto
2013-07-11 18:29:18 -0300
f3bfbfc0 Merge commit 'refs/merge-requests/331' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/331
```
Rodrigo Souto
2013-07-11 17:37:43 -0300
7a39f169 Merge commit 'refs/merge-requests/327' of git://gitorious.org/noosfero/noosfero Browse Code »

Rodrigo Souto
2013-07-11 17:26:38 -0300
f9d3d4d2 Testing no captcha for the admin to register abuse Browse Code »

Rodrigo Souto
2013-07-11 17:23:39 -0300
90af49b9 Merge commit 'refs/merge-requests/323' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/323
```
Rodrigo Souto
2013-07-11 17:23:36 -0300
b3806ad2 Adding name config for templates Browse Code »

Rodrigo Souto
2013-07-11 16:56:58 -0300
2f737f2c Transforming nobars into nosidebars Browse Code »

Rodrigo Souto
2013-07-11 16:56:22 -0300
651b2a36 Merge commit 'refs/merge-requests/321' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/321
```
Rodrigo Souto
2013-07-11 15:15:49 -0300
620c0b86 Merge commit 'refs/merge-requests/307' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/307
```
Rodrigo Souto
2013-07-11 14:54:41 -0300
6871a9ec Merge commit 'refs/merge-requests/301' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/301
```
Rodrigo Souto
2013-07-11 14:31:19 -0300
b5f814e4 Merge commit 'refs/merge-requests/294' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/294
```
Rodrigo Souto
2013-07-11 13:31:04 -0300
d5c404ca Removing unecessary tests from cms controller ... Browse Code »
```
The first one should not test the redirect since it's not its concerns.
The second one wasn't test if there was a confirmation at all.
```
Rodrigo Souto
2013-07-11 13:26:46 -0300
5e9787c8 Merge commit 'refs/merge-requests/291' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/291
```
Rodrigo Souto
2013-07-11 13:14:56 -0300
8e9c9d70 Merge commit 'refs/merge-requests/326' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/326
```
Rodrigo Souto
2013-07-11 13:04:05 -0300
e61a0cba Merge commit 'refs/merge-requests/287' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/287

Conflicts:
	app/models/environment.rb
```
Rodrigo Souto
2013-07-11 13:00:57 -0300
0a558792 Merge commit 'refs/merge-requests/268' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/268
```
Rodrigo Souto
2013-07-11 12:40:30 -0300
65708443 Merge commit 'refs/merge-requests/285' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/285
```
Rodrigo Souto
2013-07-11 12:38:08 -0300
81ca0e3a Merge commit 'refs/merge-requests/264' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/264

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/views/catalog/index.rhtml
```
Rodrigo Souto
2013-07-11 12:20:28 -0300

18 Jun, 2013

2 commits

5a911ba4 Bumping version 0.43.0 Browse Code »

Rodrigo Souto
2013-06-18 11:15:16 -0300
0e91abb2 Adjusting RELEASING file to new release script Browse Code »

Rodrigo Souto
2013-06-18 11:10:36 -0300

14 Jun, 2013

1 commit

caf26446 Merge branch 'stable' Browse Code »

Rodrigo Souto
2013-06-14 11:47:08 -0300

10 Jun, 2013

1 commit

36d9601b provide interface to manage trusted sites ... Browse Code »
```
ActionItem2675
```
Lucas Melo
2013-06-10 16:03:56 -0300

06 Jun, 2013

8 commits

32b977e3 Fixing test on chat Browse Code »

Rodrigo Souto
2013-06-06 15:21:47 -0300
edd73ed5 Merge commit 'refs/merge-requests/314' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/314
```
Rodrigo Souto
2013-06-06 15:13:44 -0300
ae6f3cfe Merge commit 'refs/merge-requests/330' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/330
```
Rodrigo Souto
2013-06-06 15:00:47 -0300
0b77bbea Merge commit 'refs/merge-requests/329' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/329
```
Rodrigo Souto
2013-06-06 14:47:22 -0300
670ad3a9 Merge commit 'refs/merge-requests/324' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/324
```
Rodrigo Souto
2013-06-06 13:29:21 -0300
0c959701 Moving addthis script to a helper method Browse Code »

Rodrigo Souto
2013-06-06 12:42:19 -0300
6425451c Merge commit 'refs/merge-requests/322' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/322
```
Rodrigo Souto
2013-06-06 12:25:10 -0300
c50dc645 Converted article_versions published_at to datetime ... Browse Code »
```
article and article_versions fields type must be the same

also removed plugins tables from schema.rb

(ActionItem2685)
```
Daniela Feitosa
2013-06-06 11:11:26 +0000

05 Jun, 2013

2 commits

e62afb3d Fixing typo on block helper test class name Browse Code »

Rodrigo Souto
2013-06-05 10:58:33 -0300
f68764a1 Converting article's published_at to datetime Browse Code »

Rodrigo Souto
2013-06-05 10:58:05 -0300

04 Jun, 2013

2 commits

b2745d8a Filtering events links only with white_list ... Browse Code »
```
(ActionItem2684)
```
Daniela Feitosa
2013-06-04 06:00:15 -0300

3ba4ed31 Escaped html when displaying leads of events ... Browse Code »

Leads of events returns the date of the event concatened with the lead
defined on article. As on article the lead was not returning a safe
html, the html was being escaped

(ActionItem2658)

2013-06-04 05:55:46 -0300

31 May, 2013

2 commits

885f151a Remove uneeded depndency on openjdk Browse Code »

Antonio Terceiro
2013-05-31 19:46:55 -0300
b01715be Don't start service without a proper DB config ... Browse Code »
```
ActionItem2679
```
Antonio Terceiro
2013-05-31 19:18:04 -0300

30 May, 2013

2 commits

96a2e91e Merge branch 'stable' Browse Code »

Rodrigo Souto
2013-05-30 01:32:33 -0300
049db1a4 Updating schema timestamp Browse Code »

Rodrigo Souto
2013-05-30 01:31:02 -0300

29 May, 2013

2 commits

1b3f0ea9 Bumping version 0.43.0~rc20130529152434 Browse Code »

Rodrigo Souto
2013-05-29 15:24:44 -0300
bcb2e05e Using thin server as string to detect noosfero server is running Browse Code »

Rodrigo Souto
2013-05-29 15:05:04 -0300