Thiago Ribeiro / Noosfero

20 Mar, 2014

3 commits

9c9e90ee Merge branch 'master' of https://gitlab.com/noosfero/noosfero into merging Browse Dir »

Rodrigo Souto
2014-03-20 11:55:03 -0300
68426a08 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-20 11:41:07 -0300

6e10728c Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/views/themes/index.rhtml
	db/schema.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	test/unit/person_test.rb

2014-03-20 10:58:42 -0300

19 Mar, 2014

1 commit

d5d9e7da Merge branch 'search-optimizations' into stable Browse Dir »

Rodrigo Souto
2014-03-19 17:16:20 +0000

18 Mar, 2014

7 commits

6e9cc269 cache-counter: update counter straight on database skipping callbacks and validations ... Browse Dir »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:28:59 +0000
5fba93dd person: register and use friends_count to fetch most_popular people ... Browse Dir »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:27:38 +0000
6ed2fbe7 create_topics: saving number of access to db ... Browse Dir »
```
Also fixed typo

(ActionItem2997)
```
Daniela Feitosa
2014-03-18 20:09:50 +0000
02b13044 Merge branch 'AI2997-create_topics_forum' of https://gitlab.com/unb-gama/noosfero Browse Dir »

Daniela Feitosa
2014-03-18 20:09:30 +0000
a91ba23d Removed unused method ... Browse Dir »
```
Also included tests for meta tags and removed not-needed tests

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 18:40:07 +0000
c6dc9c48 Added meta tags for OpenGraph and Twitter ... Browse Dir »
```
(ActionItem2610)
```
Daniela Feitosa
2014-03-18 10:57:44 +0000
f1dd48d2 Added info to better sharing in other networks ... Browse Dir »
```
* Changed title tag

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 10:57:44 +0000

17 Mar, 2014

2 commits

645f9328 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-17 20:14:21 -0300
12a28da7 Added plugin for mark comment as read ... Browse Dir »
```
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>

(ActionItem2670)
```
Victor Costa
2014-03-17 22:59:07 +0000

14 Mar, 2014

1 commit

b6679024 Merge branch 'ai2979' into 'stable' ... Browse Dir »
```
Order images in galleries by image name

http://noosfero.org/Development/ActionItem2979
```
Rodrigo Souto
2014-03-14 20:55:38 +0000

12 Mar, 2014

1 commit

9a799cfa Merge branch 'AI2928-categories' of https://gitlab.com/participa/noosfero into AI2928-categories Browse Dir »

Joenio Costa
2014-03-12 10:57:35 -0300

11 Mar, 2014

1 commit

8e7fe1a5 Improved layout for categories selection ... Browse Dir »
```
(ActionItem2928)
```
Victor Costa
2014-03-11 17:33:42 -0300

10 Mar, 2014

1 commit

1dfa6f09 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-10 10:10:22 -0300

07 Mar, 2014

3 commits

1c211c78 create_topics: Corrections for merge-request. ... Browse Dir »
```
(ActionItem2997)

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2014-03-07 14:38:31 +0000

d0561132 Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

1121fdb7 create_topics: Add logic to show the create topic button to community members ... Browse Dir »
```
(ActionItem2997)

Signed_off_by: Gabriela Navarro <navarro1703@gmail.com>
Signed_off_by: Gustavo Jaruga <darksshades@gmail.com>
```
Gabriela Navarro
2014-03-07 09:31:36 -0300

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse Dir »
```
Ai2943 Container Block Fixes

Fix broken edition for container block with the new css for sideboxes view.
```
Daniela Feitosa
2014-03-05 17:53:53 +0000

21 Feb, 2014

1 commit

b4c854e1 Move title to name on uploaded files Browse Dir »

Braulio Bhavamitra
2014-02-21 17:04:05 -0300

20 Feb, 2014

1 commit

61af39c0 Merge branch 'master_colivre' into AI2694-network_activity_email ... Browse Dir »
```
Conflicts:
	test/unit/person_test.rb
```
Victor Costa
2014-02-20 10:55:47 -0300

13 Feb, 2014

1 commit

e95275da Revert "application_helper: use Nokogiri in convert_macro() instead of Hpricot" ... Browse Dir »

This reverts commit d726e40eb2b02f88051c1695596738a42c0eb561.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

Conflicts:

	app/helpers/application_helper.rb

2014-02-13 20:34:10 -0300

28 Jan, 2014

5 commits

440535cf convert-macro: unescaping html converted by macros Browse Dir »

Rodrigo Souto
2014-01-28 21:35:09 +0000
6cb08f2f Merge commit 'refs/merge-requests/366' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/366

Conflicts:
	INSTALL
	script/install-dependencies/debian-squeeze.sh
```
Rodrigo Souto
2014-01-28 16:45:47 -0300
d53d8b69 profile-helper: refactor display_contact and add html-safe to string concatenation ... Browse Dir »
```
Also removing trailing whitespaces
```
Rodrigo Souto
2014-01-28 18:48:43 +0000
eb5062af profile_editor: add extra optional fields for person ... Browse Dir »
```
Signed-off-by: Ana Losnak <analosnak@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>

ActionItem1011
```
Ana Losnak
2014-01-28 18:42:02 +0000
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

23 Jan, 2014

2 commits

6d7a0824 Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-01-23 19:15:27 -0300
cf94bc1e container_block: do not show its boxes at add_block view Browse Dir »

Victor Costa
2014-01-23 13:56:21 -0300

22 Jan, 2014

1 commit

43535f4f boxes-helper: add params to context passed to the block Browse Dir »

Rodrigo Souto
2014-01-22 20:04:18 +0000

21 Jan, 2014

2 commits

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

Conflicts:
	app/models/block.rb
	public/designs/icons/tango/style.css
	test/unit/block_test.rb
```
Rodrigo Souto
2014-01-21 16:45:31 -0300

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

20 Jan, 2014

1 commit

4531732c Small refactoring of comment_actions method at comment_helper ... Browse Dir »
```
(ActionItem2786)
```
Victor Costa
2014-01-20 18:44:52 -0300

19 Jan, 2014

1 commit

25f34b4d article_versions: list of versions on a new page ... Browse Dir »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000

18 Jan, 2014

3 commits

8e720312 Replacing rev by version Browse Dir »

Daniela Feitosa
2014-01-18 21:11:45 +0000
658ecf81 Trying to make it prettier :) Browse Dir »

Daniela Feitosa
2014-01-18 16:32:20 +0000
d7da0420 Added methods to return data from specific version ... Browse Dir »
```
(ActionItem2822)
```
Daniela Feitosa
2014-01-18 16:32:20 +0000

16 Jan, 2014

1 commit

2de692cd Merge remote branch 'unb-gama/AI2844-join_button' into AI2844 Browse Dir »

Daniela Feitosa
2014-01-16 02:27:37 +0000