Charles Oliveira / noosfero

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

19 Nov, 2014

1 commit

35593276 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-11-19 11:30:21 -0300

18 Nov, 2014

1 commit

0acccc16 Fix yaml migration Browse Dir »

Braulio Bhavamitra
2014-11-18 17:07:52 -0300

23 Oct, 2014

1 commit

f2eb9480 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-10-23 11:27:12 -0300

22 Oct, 2014

1 commit

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

Conflicts:
	app/helpers/profile_helper.rb
	app/views/content_viewer/_article_toolbar.rhtml
	app/views/profile/_common.rhtml
	app/views/profile/_organization_profile.rhtml
	app/views/profile/_person_profile.rhtml
	db/schema.rb
	public/stylesheets/application.css

2014-10-22 21:39:49 -0300

17 Oct, 2014

2 commits

45deacbe Merge branch 'AI3205-comment-paragraph' into stable ... Browse Dir »
```
Conflicts:
	app/models/comment.rb
```
Victor Costa
2014-10-17 11:08:43 -0300
00bda324 improving the runtime of migrations Browse Dir »

Daniela Feitosa
2014-10-17 11:17:37 +0000

06 Oct, 2014

1 commit

c6fbcd46 Merge branch 'master' into AI3205-comment-paragraph Browse Dir »

Victor Costa
2014-10-06 16:47:34 -0300

22 Sep, 2014

1 commit

9804917f Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300

18 Sep, 2014

1 commit

9cc4340d Merge branch 'master' into stoa Browse Dir »

Daniela Feitosa
2014-09-18 08:19:26 -0300

11 Sep, 2014

1 commit

6bc2c9c5 Merge branch 'stable' into stable-merge ... Browse Dir »

Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po

2014-09-11 19:53:28 -0300

10 Sep, 2014

1 commit

a0fd2411 Fixed selection of tables and images Browse Dir »

Evandro Jr
2014-09-10 12:39:59 -0300

08 Sep, 2014

1 commit

79e1ad7b Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/my_profile/memberships_controller.rb
	app/controllers/public/account_controller.rb
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/token_helper.rb
	app/views/account/signup.html.erb
	app/views/layouts/_javascript.html.erb
	db/schema.rb
	test/functional/application_controller_test.rb

2014-09-08 12:36:01 -0300