Charles Oliveira / noosfero

09 May, 2013

2 commits

7d51ce8b Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/298

Added html_safe that was missing on the block_helper new method

Conflicts:
	app/views/box_organizer/_highlights_block.rhtml
	test/unit/application_helper_test.rb

2013-05-09 15:36:19 -0300

df6d2864 Including a link to the start of the catalog on catalog categories left block Browse Dir »

Rodrigo Souto
2013-05-09 13:34:35 -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

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
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

10 Apr, 2013

2 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

05 Apr, 2013

2 commits

b1c7003c adjust the display of new content type options. Browse Dir »

Aurélio A. Heckert
2013-04-05 17:39:33 -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

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
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

1 commit

8664a324 code beauty to article_block Browse Dir »

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

27 Mar, 2013

1 commit

b517b8bf Better add block dialog ... Browse Dir »

* erase code is fun;
* better name for "Area 1". Users can understand it now;
* inline style for layout sux! Stop doing this!
* add block dialog looks nice, with simpler code.

2013-03-27 11:02:14 -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

25 Mar, 2013

1 commit

7d94ca05 recognize the main button_bar on profile_design Browse Dir »

Aurélio A. Heckert
2013-03-25 18:49:59 -0300

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

1 commit

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

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

15 Mar, 2013

2 commits

af6851a2 Correct product catalog's "expand-boxes" ... Browse Dir »

   * Correct multiple id generation on catalog/index.rhtml
   * Better main floating box element selection with a class
   * Remove txt2html from description. (WTF!?)
   * catalog.js rewrite. Simpler and working nice.
   * Move width/position style from JS do CSS.

closes ActionItem2621

2013-03-15 21:19:40 -0300

c6bf7b15 Merge commit 'refs/merge-requests/253' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/253
```
Rodrigo Souto
2013-03-15 20:07:18 -0300

11 Mar, 2013

2 commits

aaefdf5b A better highlights block config interface ... Browse Dir »
```
Beauty, useful, readable and code cleanner.
ActionItem2613
```
Aurélio A. Heckert
2013-03-11 15:08:46 -0300

00c7c23e Better block config display ... Browse Dir »

Make colorBox to feet better the block config dialog, removing the unneeded horizontal scroll.
Add a better style, and display the cancel button.

2013-03-11 12:13:26 -0300

07 Mar, 2013

1 commit

3c168675 Merge commit 'refs/merge-requests/273' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/273
```
Rodrigo Souto
2013-03-07 12:37:02 -0300

18 Feb, 2013

1 commit

3154fbb1 Merge commit 'refs/merge-requests/274' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/274
```
Rodrigo Souto
2013-02-18 18:28:32 -0300

06 Feb, 2013

1 commit

4de6c173 Filter useful folders to upload images and pre-select a gallery ... Browse Dir »
```
closes ActionItem2567
```
Aurélio A. Heckert
2013-02-06 17:09:46 -0300

04 Feb, 2013

1 commit

b32061fa Leaving hosts on links src when added on tinymce ... Browse Dir »
```
It also fixes src from images

(ActionItem2555)
```
Daniela Feitosa
2013-02-04 20:49:38 -0300

01 Feb, 2013

1 commit

223280f6 Organize gallery itens on search result page ... Browse Dir »
```
Change a little the image display to repeat the gallery display
in the network stream and for a better space usage.
```
Aurélio A. Heckert
2013-02-01 19:36:15 -0300

30 Jan, 2013

1 commit

127cd3fb Allowing search form to use goggle_cse plugin ... Browse Dir »
```
(ActionItem2560)
```
Daniela Feitosa
2013-01-30 14:31:19 -0200

26 Jan, 2013

1 commit

97f28847 Merge branch 'honeypot' Browse Dir »

Rodrigo Souto
2013-01-26 01:48:10 +0000