Software Publico / Noosfero

13 Feb, 2014

1 commit

e95275da Revert "application_helper: use Nokogiri in convert_macro() instead of Hpricot" ... Browse Dir »

This reverts commit d726e40eb2b02f88051c1695596738a42c0eb561.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

Conflicts:

	app/helpers/application_helper.rb

2014-02-13 20:34:10 -0300

10 Feb, 2014

3 commits

09db6ba7 Merge branch 'AI2897-environment_theme' of https://gitlab.com/unb-gama/noosfero … ... Browse Dir »
```
…into unb-gama/noosfero-AI2897-environment_theme
```
Rodrigo Souto
2014-02-10 22:15:25 -0300
1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

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

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 Dir »
```
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 Dir »
```
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

2 commits

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

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300
4badf6ba comment-reply-feature: add reply title and fix test Browse Dir »

Rodrigo Souto
2014-01-31 18:25:13 +0000

28 Jan, 2014

7 commits

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

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

Conflicts:
	INSTALL
	script/install-dependencies/debian-squeeze.sh
```
Rodrigo Souto
2014-01-28 16:45:47 -0300
d53d8b69 profile-helper: refactor display_contact and add html-safe to string concatenation ... Browse Dir »
```
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 Dir »
```
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
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
673c506c Merge commit 'refs/merge-requests/358' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/358
```
Rodrigo Souto
2014-01-28 16:21:18 +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

6 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
158fd0a9 versioned-article-view: use variabla and alert developers about doubled verification Browse Dir »

Rodrigo Souto
2014-01-23 20:01:58 -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

297b3b72 Fixing AI2897 problems: ... Browse Dir »

-Changed update_attribute to setting the attribute then 'save!'
-Removed some whitespaces
-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.

(ActionItem2897)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>

2014-01-23 16:28:03 -0200

b0874b74 Allow the admin users to change the environment theme on the admin panel. Browse Dir »

Eduardo Tourinho Edington
2014-01-23 16:23:02 -0200
8625b2c8 fix: catalog configuration only for enterprises ... Browse Dir »
```
(ActionItem896)
```
Daniela Feitosa
2014-01-23 16:37:40 +0000

22 Jan, 2014

4 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

21 Jan, 2014

4 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

20 Jan, 2014

5 commits

4531732c Small refactoring of comment_actions method at comment_helper ... Browse Dir »
```
(ActionItem2786)
```
Victor Costa
2014-01-20 18:44:52 -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
a1813557 cms-edit: move article.js include to the bottom of the file Browse Dir »

Rodrigo Souto
2014-01-20 17:00:41 -0300
c3105ac9 article-lead: move js to separate file ... Browse Dir »
```
article.js was being included twice.

(ActionItem2956)
```
Rodrigo Souto
2014-01-20 16:59: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

19 Jan, 2014

2 commits

35d7a6af Checking if perrmission to view article before version Browse Dir »

Daniela Feitosa
2014-01-19 23:53:43 -0300
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

18 Jan, 2014

4 commits

8e720312 Replacing rev by version Browse Dir »

Daniela Feitosa
2014-01-18 21:11:45 +0000
5cd25bf8 Reverting now is working ... Browse Dir »
```
Removed setting as versioned column
revert button is following the pattern
styling link-this-page

(ActionItem2822)
```
Daniela Feitosa
2014-01-18 20:41:04 +0000
658ecf81 Trying to make it prettier :) Browse Dir »

Daniela Feitosa
2014-01-18 16:32:20 +0000
d7da0420 Added methods to return data from specific version ... Browse Dir »
```
(ActionItem2822)
```
Daniela Feitosa
2014-01-18 16:32:20 +0000