Charles Oliveira / noosfero

20 Aug, 2014

2 commits

aef06801 Add note web visualization Browse Dir »

Leandro Santos
2014-08-20 10:50:58 -0300
0a62ae2b define a lobby note title dinamically Browse Dir »

Leandro Santos
2014-08-20 02:28:01 -0300

19 Aug, 2014

1 commit

65ec2574 notification plugin Browse Dir »

Leandro Santos
2014-08-19 20:36:23 -0300

18 Aug, 2014

1 commit

50a6abe6 Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-08-18 11:57:19 -0300

15 Aug, 2014

6 commits

176bce4b release tasks: user $version instead of Noosfero::VERSION Browse Dir »

Antonio Terceiro
2014-08-15 22:05:29 -0300
75687727 release tasks: allow manual upload of .deb packages ... Browse Dir »
```
I build the packages in a different system than the one where I keep my
ssh keys. Nevertheless, it will still work for other who don't.
```
Antonio Terceiro
2014-08-15 19:57:54 -0300
1262c193 Bumping version 1.0~rc1 Browse Dir »

Antonio Terceiro
2014-08-15 16:35:43 -0300
5ec0e445 update release rake tasks Browse Dir »

Antonio Terceiro
2014-08-15 16:35:08 -0300
d55b3268 Move PROJECT/VERSION constants to their own file ... Browse Dir »
```
Incidentally this removes warnings when loading the environment.
```
Antonio Terceiro
2014-08-15 16:35:07 -0300
cec25930 Merge branch 'rails3' into rails3_stable ... Browse Dir »
```
Conflicts:
	db/schema.rb
	public/javascripts/application.js
```
Victor Costa
2014-08-15 12:10:31 -0300

11 Aug, 2014

2 commits

b19af545 Merge branch 'stable-master' Browse Dir »

Antonio Terceiro
2014-08-11 22:29:19 -0300

7ba54a9d Fix merge problems ... Browse Dir »

At least as far as unit tests are concerned. Still missing:

  - 1 failing test in ArticleTest
  - 1 failing test in PersonTest

2014-08-11 16:34:21 -0300

08 Aug, 2014

3 commits

3300e3ed Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-08-08 11:11:54 -0300
56f0dd6e Fix routes for base plugins Browse Dir »

Victor Costa
2014-08-08 11:11:25 -0300
08c7da41 Merge branch 'AI3269_link-article' into rails3_stable Browse Dir »

Victor Costa
2014-08-08 10:44:20 -0300

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

04 Aug, 2014

1 commit

b8bcd24b Remove merge artifact added by mistake Browse Dir »

Antonio Terceiro
2014-08-04 17:04:56 -0300

30 Jul, 2014

1 commit

932e054f Add support for base plugins ... Browse Dir »

Base plugins are enanbed by default and cannot be disabled at the system
level, but can be disabled per-environment at the web UI.

A part of the required changes also fix the Noosfero plugin
infrastructure, in special migrations, on Rails 3.

2014-07-30 17:50:49 -0300

29 Jul, 2014

1 commit

e562726f Merge branch 'rails3' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
```
Victor Costa
2014-07-29 18:18:06 -0300

28 Jul, 2014

1 commit

dda93504 Improve plugin test runs ... Browse Dir »

- process plugins in alphabeticall order, so when watching the console
  output, one can know at which point of the execution we are.
- run all tests of a given type (unit, functional etc) for a single
  plugin together. On my machine this brings the total run time from
  ~34min down to ~20min.

2014-07-28 17:31:05 -0300

24 Jul, 2014

2 commits

01b4ab03 Merge branch 'rails3' into rails3_stable Browse Dir »

Victor Costa
2014-07-24 17:03:10 -0300
180142e9 Fix plugin routes with profile Browse Dir »

Victor Costa
2014-07-24 17:02:27 -0300

22 Jul, 2014

1 commit

8f3d6b31 file-presenter: do not wrap Articles that are not files ... Browse Dir »
```
This check is redundant but speeds up blog_page.

ActionItem3201
```
Rodrigo Souto
2014-07-22 21:30:39 +0000

09 Jul, 2014

1 commit

34f26734 Merge branch 'ai3179' into 'stable' ... Browse Dir »
```
Fix crash on rake noosfero:translations:compile

http://noosfero.org/Development/ActionItem3179
```
Rodrigo Souto
2014-07-09 15:01:26 +0000