Thiago Ribeiro / Noosfero

21 Feb, 2014

3 commits

289ca9e2 rails3: fix html display for short format on articles Browse Dir »

Victor Costa
2014-02-21 15:05:05 -0300
2978625c rails3: fix person_test that was depending of db order Browse Dir »

Victor Costa
2014-02-21 14:29:54 -0300
465fab89 rails3: fix community test related to action_tracker Browse Dir »

Victor Costa
2014-02-21 13:56:09 -0300

13 Feb, 2014

1 commit

ef0730cc rails3: fix unit tests Browse Dir »

Victor Costa
2014-02-13 17:14:51 -0300

11 Feb, 2014

2 commits

1f0194be Merge branch 'master' into rails3-merge ... Browse Dir »

Conflicts:
	app/views/profile_themes/add_css.rhtml
	app/views/profile_themes/add_image.rhtml
	app/views/profile_themes/css_editor.rhtml
	app/views/profile_themes/edit.rhtml
	app/views/profile_themes/new.rhtml
	app/views/themes/add_css.html.erb
	app/views/themes/add_css.rhtml
	app/views/themes/add_image.html.erb
	app/views/themes/add_image.rhtml
	app/views/themes/css_editor.html.erb
	app/views/themes/css_editor.rhtml
	app/views/themes/edit.html.erb
	app/views/themes/edit.rhtml
	app/views/themes/index.html.erb
	app/views/themes/new.html.erb
	app/views/themes/new.rhtml
	test/factories.rb
	test/functional/profile_themes_controller_test.rb

2014-02-11 18:00:35 -0300

e9fea38f Merge branch 'master' into rails3-merge ... Browse Dir »

Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

2014-02-11 17:35:19 -0300

10 Feb, 2014

1 commit

1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

Rodrigo Souto
2014-02-10 22:13:58 -0300

06 Feb, 2014

1 commit

9b4b80b9 rails3: using mock instead of empty array to avoid stubs on nil Browse Dir »

Rodrigo Souto
2014-02-06 21:08:11 +0000

04 Feb, 2014

1 commit

d81e89da rails3: fix user_activation_job_test Browse Dir »

Victor Costa
2014-02-04 12:52:49 -0300

03 Feb, 2014

3 commits

0e46219f rails3: fix user unit tests ... Browse Dir »
```
Change the way of sending signup mail
```
Victor Costa
2014-02-03 18:42:05 -0300
a0b2a343 rails3: fix some unit tests Browse Dir »

Victor Costa
2014-02-03 18:42:00 -0300
caa8090a rails3: fix birthday validation Browse Dir »

Victor Costa
2014-02-03 14:26:53 -0300

29 Jan, 2014

2 commits

4f784bd7 template-tests: add is_template to fix templates tests Browse Dir »

Rodrigo Souto
2014-01-29 18:00:18 -0300

79d66909 comment: remove comment_as_thread method ... Browse Dir »

This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899
and was mistakenly included on this merge
4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix
70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't
removed.

2014-01-29 20:32:15 +0000

28 Jan, 2014

5 commits

25018e09 macro: fix attributes after nokogiri change and write some tests Browse Dir »

Rodrigo Souto
2014-01-28 21:34:24 +0000
5e853854 person-test: remove unnecessary tests Browse Dir »

Rodrigo Souto
2014-01-28 18:51:13 +0000
a42fb86d unit_test: correct misspelled words on person_test ... Browse Dir »
```
ActionItem1011
```
Ana Losnak
2014-01-28 18:42:18 +0000
eb5062af profile_editor: add extra optional fields for person ... Browse Dir »
```
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
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

23 Jan, 2014

2 commits

4b01e9da Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into … ... Browse Dir »
```
…sub_organizations_improvements
```
Joenio Costa
2014-01-23 22:03:46 -0300
6d7a0824 Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-01-23 19:15:27 -0300

22 Jan, 2014

6 commits

99c4da00 Merge commit 'refs/merge-requests/342' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/342

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000
8caf11c4 product-categories-block: add 'catalog_only' option and define it as default Browse Dir »

Rodrigo Souto
2014-01-22 20:20:34 +0000
f7c88798 block: add support for custom display modes for blocks Browse Dir »

Rodrigo Souto
2014-01-22 20:17:48 +0000
43535f4f boxes-helper: add params to context passed to the block Browse Dir »

Rodrigo Souto
2014-01-22 20:04:18 +0000
de437f75 rails3: fix tests related to TaskMailer Browse Dir »

Victor Costa
2014-01-22 10:50:50 -0300
e15c8cea rails3: fix tests in article_test related to profile assignment Browse Dir »

Victor Costa
2014-01-22 10:50:28 -0300

21 Jan, 2014

8 commits

764f2771 clone-block: replace enabled=false by display=:never Browse Dir »

Rodrigo Souto
2014-01-21 20:02:46 +0000
e80da508 Merge commit 'refs/merge-requests/339' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/339

Conflicts:
	app/models/block.rb
	public/designs/icons/tango/style.css
	test/unit/block_test.rb
```
Rodrigo Souto
2014-01-21 16:45:31 -0300
e59c8ae2 product-categories-block: not visible when products are disabled on the environment Browse Dir »

Rodrigo Souto
2014-01-21 19:34:30 +0000

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

a2e56267 rails3: fix recent_documents_block_test ... Browse Dir »
```
Apply again recet_documents_block fixes done in commit 54a29b33
```
Victor Costa
2014-01-21 13:41:06 -0300
19ac9d93 rails3: fix profile_categorization_test Browse Dir »

Victor Costa
2014-01-21 12:52:11 -0300
8ef58efe rails3: fix slideshow_block_test Browse Dir »

Victor Costa
2014-01-21 12:47:39 -0300
b31f8719 rails3: fix comment_helper_test ... Browse Dir »
```
Mocha default behavior changes to not allow stubbing on nil.
```
Victor Costa
2014-01-21 09:47:01 -0300

20 Jan, 2014

4 commits

70ff8448 rails3: custom methods assert_difference and assert_no_difference removed Browse Dir »

Victor Costa
2014-01-20 19:30:59 -0300
362d23e0 Move to vote plugin all modifications on core related to vote_fu ... Browse Dir »
```
(ActionItem2786)
```
Victor Costa
2014-01-20 18:44:17 -0300
bf559b5f box: pass holder class as type for extra blocks hotspot ... Browse Dir »
```
(ActionItem2958)
```
Rodrigo Souto
2014-01-20 19:21:05 +0000
287d9504 rails3: fix time zone issue Browse Dir »

Victor Costa
2014-01-20 10:18:16 -0300

19 Jan, 2014

1 commit

25f34b4d article_versions: list of versions on a new page ... Browse Dir »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000