Software Publico / Noosfero

21 Aug, 2015

1 commit

e7ae2545 oauth_client: deserialize fields and improve authentication Browse Dir »

Braulio Bhavamitra
2015-08-21 20:39:57 -0300

22 Feb, 2015

1 commit

aca12460 Merge branch 'ai3139' into 'master' ... Browse Dir »
```
Register last login date

See merge request !465
```
Braulio Bhavamitra
2015-02-22 23:07:11 +0000

13 Feb, 2015

1 commit

94d0d92d Merge branch 'chat' of https://gitlab.com/diguliu/noosfero ... Browse Dir »
```
See merge request !454
```
Antonio Terceiro
2015-02-13 11:56:59 -0200

11 Feb, 2015

1 commit

f8fab09f Use true instead of 't' in SQL where clauses Browse Dir »

Braulio Bhavamitra
2015-02-11 08:16:29 -0300

10 Feb, 2015

2 commits

becf0ab7 Register last login date ... Browse Dir »
```
(ActionItem3139)
```
Braulio Bhavamitra
2015-02-10 15:33:13 -0300
00b69cdc Merge branch 'ai2809' into 'master' ... Browse Dir »
```
Use materialized path for parents lookup

http://noosfero.org/Development/ActionItem2809

See merge request !7
```
Braulio Bhavamitra
2015-02-10 18:21:43 +0000

06 Feb, 2015

1 commit

d29ca9e2 Merge branch 'master' into chat ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2015-02-06 11:17:02 -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

30 Jan, 2015

2 commits

8923158b Improve migration performance Browse Dir »

Braulio Bhavamitra
2015-01-30 16:14:03 -0300
95ebdaf6 Optimize category tree lookup with a materialized path Browse Dir »

Braulio Bhavamitra
2015-01-30 16:14:02 -0300

27 Jan, 2015

1 commit

a9c67a1b Merge branch 'chat' into master-with-chat ... Browse Dir »
```
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
```
Rodrigo Souto
2015-01-27 19:15:59 -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

1 commit

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

13 Jan, 2015

1 commit

82325df3 Add oauth client plugin Browse Dir »

Victor Costa
2015-01-13 18:11:44 -0300

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

18 Nov, 2014

1 commit

0acccc16 Fix yaml migration Browse Dir »

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

05 Nov, 2014

1 commit

8a138242 Save chat history ... Browse Dir »
```
Conflicts:
	app/controllers/public/chat_controller.rb

Conflicts:
	app/controllers/public/chat_controller.rb
```
Victor Costa
2014-11-05 18:54:38 -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

1 commit

00bda324 improving the runtime of migrations Browse Dir »

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

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

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

27 Aug, 2014

1 commit

914ea967 Removing EnvironmentStatisticsBlock from core ... Browse Dir »
```
PeopleBlock plugin overrides the EnvironmentStatisticsBlock

(ActionItem3045)
```
Joenio Costa
2014-08-27 20:41:41 -0300

19 Aug, 2014

2 commits

c9d91c10 Merge remote-tracking branch 'origin/rails3' Browse Dir »

Antonio Terceiro
2014-08-19 10:03:08 -0300
fe674d2b Add Task model to fix yaml encoding migration Browse Dir »

Victor Costa
2014-08-19 09:27:24 -0300

18 Aug, 2014

1 commit

b7823262 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	db/schema.rb
```
Rodrigo Souto
2014-08-18 12:31:32 -0300

14 Aug, 2014

1 commit

eec782d0 Merge branch 'master' into AI2915-category_color Browse Dir »

Joenio Costa
2014-08-14 14:55:04 -0300

12 Aug, 2014

1 commit

2620604b Change the category color selection to use a colorpicker component. ... Browse Dir »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-12 09:44:00 -0300

11 Aug, 2014

2 commits

b19af545 Merge branch 'stable-master' Browse Dir »

Antonio Terceiro
2014-08-11 22:29:19 -0300
c6410e3e profile-suggestions: connections Browse Dir »

Rodrigo Souto
2014-08-11 20:28:34 +0000

08 Aug, 2014

2 commits

b6c58a29 Set default tag context for article taggings Browse Dir »

Victor Costa
2014-08-08 19:08:02 -0300
fd9ec40e profile-suggestions: refactoring suggestion calculation ... Browse Dir »
```
Building full sql to calculate every suggestion of every rule
```
Rodrigo Souto
2014-08-08 16:57:24 +0000

07 Aug, 2014

1 commit

34f8f4d7 Merge remote-tracking branch 'origin/stable' ... Browse Dir »

Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb

2014-08-07 14:20:39 -0300

06 Aug, 2014

2 commits

d8fd6277 checkpoint Browse Dir »

Rodrigo Souto
2014-08-06 20:19:38 +0000
64fddd53 profile-suggestions: add migration to create initial suggestions Browse Dir »

Rodrigo Souto
2014-08-06 11:28:49 -0300

28 Jul, 2014

1 commit

7332d0d4 Merge remote-tracking branch 'dani/ActionItem3234' into stoa-merge ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/models/profile.rb
	app/views/friends/index.html.erb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-07-28 11:09:25 -0300

27 Jul, 2014

1 commit

016d233a profile-suggestions: added basic structure ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-07-27 00:31:24 -0300