Charles Oliveira / noosfero

21 May, 2015

1 commit

f8a595c3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	app/views/content_viewer/_article_toolbar.html.erb
```
Victor Costa
2015-05-21 14:28:17 -0300

13 May, 2015

3 commits

920a3d73 content_privacy: further optimizations on migration Browse Dir »

Rodrigo Souto
2015-05-13 17:21:25 -0300
617f3a2f Changed migration to use find_each batch update Browse Dir »

André Guedes
2015-05-13 16:33:41 -0300

9360f04a Add migration to change default private profile content ... Browse Dir »

Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-05-13 16:32:28 -0300

12 May, 2015

3 commits

ea5d6c29 merging with master Browse Dir »

Leandro Santos
2015-05-12 21:45:22 -0300
9132007f Applying merge request revisions ... Browse Dir »
```
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
```
André Guedes
2015-05-12 13:15:35 -0300
59c6019c Migrate for add the fourth box. ... Browse Dir »
```
Migrate for add the fourth box to existing enviroments and profiles.

Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
```
Thiago Ribeiro
2015-05-12 13:15:35 -0300

08 May, 2015

2 commits

8bcf8c4f Added permission to manage_custom_roles and started test for the controller ... Browse Dir »
```
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
```
André Guedes
2015-05-08 16:13:55 -0300

77ffeee2 Added custom roles management for organizations ... Browse Dir »

Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>

2015-05-08 16:13:55 -0300

22 Apr, 2015

1 commit

50e88e2f Revert "Merge branch 'fix_migration' into 'stable'" ... Browse Dir »
```
This reverts commit f99f59236b594a7ce10894c97821b1d60364086d, reversing
changes made to 6736c36dea7396555087da22fe45f001a289a944.
```
Evandro Junior
2015-04-22 12:05:42 -0300

20 Apr, 2015

1 commit

4c937832 fix migration Browse Dir »

Evandro Junior
2015-04-20 17:53:16 -0300

16 Apr, 2015

1 commit

42e1b8af Merge branch 'master' into next Browse Dir »

Antonio Terceiro
2015-04-16 09:35:16 -0300

13 Apr, 2015

3 commits

14f2a5e8 Fix merge with api Browse Dir »

Victor Costa
2015-04-13 14:47:11 -0300
8a6d7d69 Merge branch 'api' into stable ... Browse Dir »
```
Conflicts:
	config.ru
	lib/noosfero/plugin.rb
```
Victor Costa
2015-04-13 14:36:36 -0300
37c45c16 fix conflit with next Browse Dir »

Leandro Santos
2015-04-13 09:19:47 -0300

09 Apr, 2015

3 commits

7dba8f99 fixing conflit Browse Dir »

Leandro Santos
2015-04-09 08:19:02 -0300
a08cccb5 renaming setting to settings Browse Dir »

Leandro Santos
2015-04-09 08:12:21 -0300
68e50a17 fixing conflit with next Browse Dir »

Leandro Santos
2015-04-09 07:00:53 -0300

08 Apr, 2015

3 commits

c11cfb6d Merge branch 'next' into stable Browse Dir »

Leandro Santos
2015-04-08 21:55:05 -0300
54d9eb37 Add settings field for comments. Now it will be possible to use acts_as_having_fields for comments Browse Dir »

Leandro Santos
2015-04-08 21:51:05 -0300
beb6bfa0 fix-yaml-migration: use find_each to reduce memory consumption Browse Dir »

Rodrigo Souto
2015-04-08 12:10:12 -0300

24 Mar, 2015

3 commits

7fa02316 api: renaming private token migration Browse Dir »

Leandro Santos
2015-03-24 21:09:55 -0300
6bc2576f adding authentication and entity mananegement Browse Dir »

Leandro Santos
2015-03-24 20:53:02 -0300
8047cb18 adding private token information to users Browse Dir »

Leandro Santos
2015-03-24 20:53:02 -0300

19 Mar, 2015

1 commit

3e5d8c76 Merge branch 'serpro-context' into stable ... Browse Dir »
```
Conflicts:
	app/models/profile.rb
	app/views/profile_editor/edit.html.erb
```
Victor Costa
2015-03-19 17:52:01 -0300

16 Mar, 2015

1 commit

be674ec9 Merge branch 'softwarepublico/noosfero-secret_comunity' into next ... Browse Dir »
```
See merge request !481
```
Antonio Terceiro
2015-03-16 16:26:55 -0300

27 Feb, 2015

2 commits

0acacf51 Merge branch 'master' into stable Browse Dir »

Leandro Santos
2015-02-27 11:31:41 -0300
f5ff10a3 Update version of acts-as-taggable-on ... Browse Dir »
```
See merge request !421

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
```
Victor Costa
2015-02-27 11:06:12 -0300

26 Feb, 2015

1 commit

49716023 Add Secret type to communities' privacy options ... Browse Dir »

- created 'secret' attribute for profiles
- redefined scope for secret communities

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-02-26 12:53:07 +0000

24 Feb, 2015

1 commit

0531c6a2 merging with master Browse Dir »

Leandro Santos
2015-02-24 11:37:25 -0300

04 Feb, 2015

1 commit

60262a33 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/controllers/public/search_controller.rb
	app/models/profile.rb
	app/views/cms/edit.html.erb
	public/stylesheets/application.css

2015-02-04 13:02:40 -0300

03 Feb, 2015

2 commits

d2029dc6 Merge branch 'invitation' into stoa ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Rodrigo Souto
2015-02-03 18:11:15 -0300

71439c6c Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/my_profile/profile_editor_controller.rb
	app/helpers/search_helper.rb
	app/models/invitation.rb
	app/models/person.rb
	app/views/cms/view.html.erb
	app/views/templates/index.html.erb
	plugins/community_track/views/content_viewer/_step_item.html.erb
	test/functional/home_controller_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb

2015-02-03 18:06:21 -0300

02 Feb, 2015

1 commit

6b78cf93 profile: add allow_members_to_invite and invite_friends_only configurations Browse Dir »

Rodrigo Souto
2015-02-02 19:51:46 -0300

28 Jan, 2015

1 commit

d9a3fdb3 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb

2015-01-28 15:22:56 -0300

22 Jan, 2015

1 commit

cbf7f847 external_feed: Change column type to allow big addresses Browse Dir »

Braulio Bhavamitra
2015-01-22 13:54:03 -0300

21 Jan, 2015

1 commit

b3068b11 Add option to all community and users followers view a private article ... Browse Dir »

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>

2015-01-21 15:45:34 -0200

14 Jan, 2015

2 commits

48c34b8c Merge branch 'master' into stable ... Browse Dir »
```
Conflicts:
	public/javascripts/application.js
```
Victor Costa
2015-01-14 17:55:35 -0300

538bb500 Rename Statistics blocks sooner ... Browse Dir »

When upgrading from 0.47, 20140724134601_fix_yaml_encoding.rb will run
before 20140827191326_remove_environment_statistics_block.rb and crash
because the EnvironmentStatisticsBlock class does not exist anymore.

2015-01-14 11:49:44 -0200

20 Nov, 2014

1 commit

94eaff08 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	Gemfile.lock
	script/development
```
Larissa Reis
2014-11-20 01:24:55 -0300