Software Publico / Noosfero

20 Feb, 2014

1 commit

2e49a4f6 Bumping version 0.46.0 Browse Code »

Rodrigo Souto
2014-02-20 17:56:20 -0300

11 Feb, 2014

1 commit

13b60da3 Merge branch 'AI2897-environment_theme' into 'master' ... Browse Code »

Ai2897 Environment Theme

http://noosfero.org/Development/ActionItem2897

The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.

2014-02-11 01:27:07 +0000

10 Feb, 2014

2 commits

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

Rodrigo Souto
2014-02-10 22:13:58 -0300
bfaf1bdd Added hotspots for comments Browse Code »

Daniela Feitosa
2014-02-10 10:13:28 +0000

04 Feb, 2014

2 commits

aa0f384c Merge branch 'AI2922-wall_tab_by_default' into 'master' ... Browse Code »
```
Ai2922 Wall Tab By Default

Display the wall tab by default on user's profile
```
Antonio Terceiro
2014-02-04 18:58:30 +0000
c21b9081 Merge branch 'AI2924-add_verb_users_wall' into 'master' ... Browse Code »
```
AI2924 Add verb for the activities on user's wall

ActionItem: http://noosfero.org/Development/ActionItem2924
```
Antonio Terceiro
2014-02-04 18:54:53 +0000

31 Jan, 2014

5 commits

be72d6f1 Merge commit 'refs/merge-requests/367' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/367

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300
e5f361f2 manage-enterprises-features: enable display_enterprise_menu_link on environment Browse Code »

Rodrigo Souto
2014-01-31 18:39:20 +0000
4badf6ba comment-reply-feature: add reply title and fix test Browse Code »

Rodrigo Souto
2014-01-31 18:25:13 +0000
87ca56c5 categories-block-features: simulate hover to follow link Browse Code »

Rodrigo Souto
2014-01-31 17:46:09 +0000
643c6a53 template fix Browse Code »

Rodrigo Souto
2014-01-31 17:45:37 +0000

29 Jan, 2014

4 commits

480247c5 catalog-tests: fix per page value and remove obsolete test Browse Code »

Rodrigo Souto
2014-01-29 18:02:08 -0300
66707ca9 profile-design-tests: add new ProductCategoriesBlock to enterprises block Browse Code »

Rodrigo Souto
2014-01-29 18:01:15 -0300
4f784bd7 template-tests: add is_template to fix templates tests Browse Code »

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

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

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

13 commits

440535cf convert-macro: unescaping html converted by macros Browse Code »

Rodrigo Souto
2014-01-28 21:35:09 +0000
25018e09 macro: fix attributes after nokogiri change and write some tests Browse Code »

Rodrigo Souto
2014-01-28 21:34:24 +0000
6cb08f2f Merge commit 'refs/merge-requests/366' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/366

Conflicts:
	INSTALL
	script/install-dependencies/debian-squeeze.sh
```
Rodrigo Souto
2014-01-28 16:45:47 -0300
5e853854 person-test: remove unnecessary tests Browse Code »

Rodrigo Souto
2014-01-28 18:51:13 +0000
d53d8b69 profile-helper: refactor display_contact and add html-safe to string concatenation ... Browse Code »
```
Also removing trailing whitespaces
```
Rodrigo Souto
2014-01-28 18:48:43 +0000
268df602 profile_editor:change order of person's fields on manage_fields page ... Browse Code »
```
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Ana Losnak <analosnak@gmail.com>

ActionItem1011
```
Daniel
2014-01-28 18:42:36 +0000
a42fb86d unit_test: correct misspelled words on person_test ... Browse Code »
```
ActionItem1011
```
Ana Losnak
2014-01-28 18:42:18 +0000
eb5062af profile_editor: add extra optional fields for person ... Browse Code »
```
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
673c506c Merge commit 'refs/merge-requests/358' of git://gitorious.org/noosfero/noosfero … ... Browse Code »
```
…into merge-requests/358
```
Rodrigo Souto
2014-01-28 16:21:18 +0000
3d1e7050 vote-plugin-style: display dislike vote with color red Browse Code »

Rodrigo Souto
2014-01-28 15:36:17 +0000
66d9f7d8 plugins-infra: load extensions with configuration.to_prepare Browse Code »

Rodrigo Souto
2014-01-28 15:35:30 +0000
658197fe schema: add vote table to schema Browse Code »

Rodrigo Souto
2014-01-28 15:33:46 +0000
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Code »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

27 Jan, 2014

3 commits

9e954d8c Merge branch 'master' into custom-forms ... Browse Code »

Conflicts:
	plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
	po/pt/noosfero.po

2014-01-27 18:06:57 -0300

45a88ecf custom-forms-helper: encapsulate disabled logic and select default value Browse Code »

Rodrigo Souto
2014-01-27 20:51:58 +0000
4b5140d0 Show different messages for expired forms ... Browse Code »
```
(ActionItem2969)
```
Larissa Reis
2014-01-27 12:37:45 -0300

24 Jan, 2014

2 commits

540c6070 Show 12 organizations per page ... Browse Code »
```
(ActionItem2866)
```
Joenio Costa
2014-01-24 12:35:38 -0300
d98185b3 All files related to plugins should not be on the Noosfero core ... Browse Code »
```
(ActionItem2866)
```
Joenio Costa
2014-01-24 11:08:37 -0300

23 Jan, 2014

7 commits

4b01e9da Merge remote-tracking branch 'danielbucher/sub_organizations_improvements' into … ... Browse Code »
```
…sub_organizations_improvements
```
Joenio Costa
2014-01-23 22:03:46 -0300
b9d5a64e Remove trailing whitespaces and fix identation Browse Code »

Rodrigo Souto
2014-01-23 20:03:00 -0300
3548b943 application-css: remove doubled style Browse Code »

Rodrigo Souto
2014-01-23 20:02:32 -0300
158fd0a9 versioned-article-view: use variabla and alert developers about doubled verification Browse Code »

Rodrigo Souto
2014-01-23 20:01:58 -0300
6d7a0824 Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Code »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-01-23 19:15:27 -0300
32df4672 Merge branch 'master' of https://gitlab.com/noosfero/noosfero Browse Code »

Rodrigo Souto
2014-01-23 18:24:08 -0300
178704b3 po-pt: fix translation mistake Browse Code »

Rodrigo Souto
2014-01-23 18:23:50 -0300