Software Publico / Noosfero

20 Mar, 2014

2 commits

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

Rodrigo Souto
2014-03-20 11:55:03 -0300

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

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

18 Mar, 2014

2 commits

8eb914c0 action_tracker: register and use activities_count to fetch most_active profile ... Browse File »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:27:44 +0000
5fba93dd person: register and use friends_count to fetch most_popular people ... Browse File »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:27:38 +0000

20 Feb, 2014

1 commit

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

28 Jan, 2014

3 commits

d53d8b69 profile-helper: refactor display_contact and add html-safe to string concatenation ... Browse File »
```
Also removing trailing whitespaces
```
Rodrigo Souto
2014-01-28 18:48:43 +0000
268df602 profile_editor:change order of person's fields on manage_fields page ... Browse File »
```
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Ana Losnak <analosnak@gmail.com>

ActionItem1011
```
Daniel
2014-01-28 18:42:36 +0000
eb5062af profile_editor: add extra optional fields for person ... Browse File »
```
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

17 Jan, 2014

1 commit

7bc0a2a4 sub_organizations_plugin: Add related organizations block ... Browse File »

The following improvements have been made:
  - Created action that displays sub-organization and
  super organizations of a given organization.
  - Created a block that display related organizations.
  - List mother organizations to person's membership if
  he/she is member of a sub-organization.

(ActionItem2499)
(ActionItem2825)

Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br>
Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>

2014-01-17 14:43:37 -0200

15 Jan, 2014

2 commits

d1609c73 Merge remote branch 'unb-gama/AI2852-article_access_level' into AI2852 ... Browse File »
```
Conflicts:
	app/models/person.rb
	db/schema.rb
```
Daniela Feitosa
2014-01-15 12:44:00 +0000

b3fb1448 forum_use_terms: add user term to forums ... Browse File »

(ActionItem2513)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-01-15 00:40:00 +0000

10 Jan, 2014

1 commit

9a226174 Send network activity by email Browse File »

Victor Costa
2014-01-10 18:00:24 -0300

09 Jan, 2014

1 commit

9f616e0b access_level: Custom permission for community users to access an article ... Browse File »

- Added a field on article new/edit to specify which users can access the article
- Added a relationship has_and_belongs_to_many between Article and Person
- Created a new table article_privacy_exceptions for has_and_belongs_to_many
- Added cucumber tests
- Added a new cucumber step to add a user to the exception users list

(ActionItem2852)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>

2014-01-09 12:12:04 -0200

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse File »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000

06 Jan, 2014

3 commits

3e8bfd50 application-helper: refactor gravatar logic Browse File »

Rodrigo Souto
2014-01-06 19:27:45 +0000
b2294d44 person: simplifying memberships_by_role Browse File »

Rodrigo Souto
2014-01-06 18:04:14 +0000
ab843111 Merge remote-tracking branch 'larissa/filter-communities' into filter-communities ... Browse File »
```
Conflicts:
	test/functional/memberships_controller_test.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-06 17:56:58 +0000

16 Dec, 2013

1 commit

2d3800c3 erge commit 'refs/merge-requests/390' of git://gitorious.org/noosfero/noosfero i… ... Browse File »
```
…nto merge-requests/390
```
Rodrigo Souto
2013-12-16 15:02:07 -0300

12 Dec, 2013

1 commit

6cc3ecdd Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/410
```
Rodrigo Souto
2013-12-12 18:00:41 -0300

16 Nov, 2013

1 commit

dfaf8361 Fixed error messages ... Browse File »
```
(ActionItem2904)
```
Daniela Feitosa
2013-11-16 20:24:53 +0000

12 Nov, 2013

1 commit

3e453e44 Allow admins to activate and deactivate environment users. Browse File »

Eduardo Tourinho Edington
2013-11-12 16:43:38 -0300

23 Oct, 2013

1 commit

389f1db0 Adds filter by role in memberships listing Browse File »

Larissa Reis
2013-10-23 13:23:10 -0300

01 Oct, 2013

1 commit

38427d37 finishing action item 2722 Browse File »

Naíla Alves
2013-10-01 20:20:11 -0300

02 Sep, 2013

1 commit

56346bc9 Set fields default to private Browse File »

Braulio Bhavamitra
2013-09-02 13:15:52 -0300

28 Feb, 2013

1 commit

b9a0b4d3 Preparing search filter scheme Browse File »

Rodrigo Souto
2013-02-28 21:59:36 +0000

03 Dec, 2012

2 commits

53d8ceb4 Merge branch 'merge-requests/248' into redemoinho ... Browse File »
```
Conflicts:
	lib/noosfero/plugin/settings.rb
	test/unit/plugin_settings_test.rb
```
Rodrigo Souto
2012-12-03 13:34:00 -0300
45b48472 Merge commit 'refs/merge-requests/248' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/248

Conflicts:
	app/models/person.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css
	test/functional/catalog_controller_test.rb
```
Rodrigo Souto
2012-12-03 15:19:34 +0000

30 Nov, 2012

1 commit

69b22fc8 Defining abuser Browse File »

Rodrigo Souto
2012-11-30 12:35:34 -0200

27 Nov, 2012

1 commit

70890398 Adding new fields to shopping_cart Browse File »

Rodrigo Souto
2012-11-27 14:03:00 -0300

04 Nov, 2012

3 commits

2da66927 Removed possibility to add image on signup Browse File »

Daniela Feitosa
2012-11-04 17:28:38 -0200
339df62d Enhancements on privacy settings ... Browse File »
```
Added tests
Added background on edition of profile to be easier to know which field
the checkbox is related

(ActionItem1717)
```
Daniela Feitosa
2012-11-04 17:11:49 -0200
27eb1487 Done Browse File »

Caio Almeida
2012-11-04 14:24:53 -0200

25 Oct, 2012

1 commit

518ec830 Merge commit 'refs/merge-requests/233' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/233

Conflicts:
	test/integration/routing_test.rb
```
Daniela Feitosa
2012-10-25 00:39:00 -0200

21 Oct, 2012

1 commit

7bac7ef7 adding some hotspots to make the openid plugin works. Browse File »

Leandro Nunes dos Santos
2012-10-21 18:42:30 -0200

13 Sep, 2012

1 commit

d482447c [performance] Reducing overall database queries Browse File »

Rodrigo Souto
2012-09-13 17:16:26 -0300

11 Sep, 2012

1 commit

cbc821f2 Merge commit 'refs/merge-requests/216' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/216

Conflicts:
	debian/changelog
	etc/noosfero/varnish-noosfero.vcl
	lib/noosfero.rb
```
Daniela Feitosa
2012-09-11 17:38:00 -0300

05 Sep, 2012

1 commit

f4012a36 Merge branch 'stable' Browse File »

Antonio Terceiro
2012-09-05 16:13:20 -0300

29 Aug, 2012

1 commit

4ba4ceaf Filter out activities echos from wall ... Browse File »
```
  Removes from activities the ActionTracker::Records which are
  redundants to certain profiles.

(ActionItem2402)
```
Larissa Reis
2012-08-29 13:28:49 -0300

24 Aug, 2012

1 commit

86bb3bc1 Finish the new implementation of hotspot behaviour ... Browse File »
```
Undo some things, fix some tests, etc
```
Antonio Terceiro
2012-08-24 14:56:22 -0300

21 Aug, 2012

1 commit

d323bd53 Merge commit 'refs/merge-requests/181' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/181

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/models/person.rb
	app/views/enterprise_registration/basic_information.rhtml
	lib/noosfero/plugin.rb
	public/stylesheets/application.css
	test/unit/person_test.rb
	test/unit/profile_test.rb

2012-08-21 15:06:48 -0300