NoosferoGov / noosfero

21 Jan, 2015

1 commit

45964060 Merge branch 'fix_block_links' into 'master' ... Browse File »

Fix block links

Fixing the URL from the article block and fixing the path of the New event button of the agenda.

When Noosfero is used in a subdirectory, it crashes without this modification.

See merge request !395

2015-01-21 18:29:39 +0000

08 Jan, 2015

2 commits

d1926f54 Cache theme renderings Browse File »

Braulio Bhavamitra
2015-01-08 22:22:09 -0300
bb166e4b Add method to return theme javascript source Browse File »

Braulio Bhavamitra
2015-01-08 22:22:05 -0300

08 Dec, 2014

1 commit

8cd9c0af Add subdirectory to link "Read more" on article block. ... Browse File »
```
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Parley Martins <parleypachecomartins@gmail.com>
```
Parley
2014-12-08 15:07:12 -0200

03 Dec, 2014

1 commit

57e4738a Fix XSS possibility caused by quotes in article title/body Browse File »

Antonio Terceiro
2014-12-03 10:28:35 -0200

18 Nov, 2014

1 commit

1843b53f filter_html: fix crash on nil input Browse File »

Antonio Terceiro
2014-11-18 13:10:59 -0200

13 Nov, 2014

1 commit

22b0889f fix presentation of raw HTML article Browse File »

Antonio Terceiro
2014-11-13 19:10:22 -0200

07 Oct, 2014

1 commit

36b7ff2f Fix partial for class method Browse File »

Victor Costa
2014-10-07 14:35:10 -0300

09 Sep, 2014

2 commits

14300a05 profile_icon: use gravatar for users with no image Browse File »

Antonio Terceiro
2014-09-09 19:31:04 -0300
85bd2779 gettext: fix string extraction and runtime usage ... Browse File »
```
Closes #307

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
```
Victor Costa
2014-09-09 16:22:24 -0300

14 Aug, 2014

1 commit

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

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

1 commit

7ba54a9d Fix merge problems ... Browse File »

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

2 commits

92276876 ApplicationHelper: fix manage_{communities,enterprises} Browse File »

Antonio Terceiro
2014-08-08 13:19:33 -0300
e8617c1e Don't rescue from arbitrary exceptions ... Browse File »
```
This makes it really hard to debug if there are problems other than not
finding the given template
```
Antonio Terceiro
2014-08-08 13:15:54 -0300

07 Aug, 2014

1 commit

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

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

28 Jul, 2014

1 commit

6101e639 fix zoom image bug: upgrade fancybox version ... Browse File »

(ActionItem3193)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>

2014-07-28 15:32:52 -0400

21 Jul, 2014

1 commit

1f33191e rails3: fix inclusion of theme's js Browse File »

Victor Costa
2014-07-21 12:41:03 -0300

09 Jul, 2014

1 commit

16d11c32 Merge branch 'ai3178' into 'stable' ... Browse File »
```
Images looses centralization with add_zoom_to_images

http://noosfero.org/Development/ActionItem3178
```
Rodrigo Souto
2014-07-09 14:53:41 +0000

05 Jul, 2014

1 commit

c2cbd96f Fixed text on user menu links to manage groups ... Browse File »

On languages that "My" is not translated the same way when used
with "enterprises" and "communities", the translations were wrong.

(ActionItem3190)

2014-07-05 00:35:36 +0000

30 Jun, 2014

1 commit

5d152dc4 rails3: fix inclusion of theme's js Browse File »

Victor Costa
2014-06-30 16:20:36 -0300

27 Jun, 2014

1 commit

925df3dd Allow centralization of images with zoomify script ... Browse File »
```
(ActionItem3178)
```
Braulio Bhavamitra
2014-06-27 11:00:35 -0300

26 Jun, 2014

2 commits

36bf2baf Merge branch 'AI3171-categories_block_bug' into 'master' ... Browse File »

Ai3171 categories block bug

This MR fix the problem that makes feature/categories_block.feature cucumber/selenium test fails.

Detailed description: http://noosfero.org/Development/ActionItem3171

2014-06-26 19:27:50 +0000

aa29773a Not display administration link to common users ... Browse File »
```
ActionItem3173
```
Rodrigo Souto
2014-06-26 18:04:47 +0000

18 Jun, 2014

1 commit

b07cbc9b Fixing Categories Menu block html prensetation Browse File »

Arthur Esposte
2014-06-18 22:13:55 +0000

11 Jun, 2014

1 commit

6c40dd18 rails3: fix js escape on search menu Browse File »

Victor Costa
2014-06-11 17:53:59 -0300

05 Jun, 2014

1 commit

b2ff3fa1 Merge branch 'ai3134' into 'stable' ... Browse File »
```
Only show public enterprises/communities to manage

http://noosfero.org/Development/ActionItem3134
```
Rodrigo Souto
2014-06-05 14:12:31 +0000

04 Jun, 2014

3 commits

ad8c4f53 Only show public enterprises/communities to manage ... Browse File »
```
(ActionItem3134)
```
Braulio Bhavamitra
2014-06-04 16:21:43 -0300
958192ff Merge branch 'ai3123' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai3123 Browse File »

Rodrigo Souto
2014-06-04 16:56:51 +0000
ea204f7e application-helper: Change name to identify other types of profiles ... Browse File »
```
ActionItem3101
```
Braulio Bhavamitra
2014-06-04 11:31:07 -0300

29 May, 2014

1 commit

1d891d19 user-menu: loading user menu on the server-side instead of on the client-side ... Browse File »

There is no reason for the user menu to load on the client-side. The
only reason, that would be plausible is if it varnish was providing
cached pages for logged users. Since this is not happening, there is no
need to load it on the client-side.

2014-05-29 22:38:35 +0000

22 May, 2014

1 commit

e72c8f0e rails3: change default jquery-ui theme Browse File »

Victor Costa
2014-05-22 11:28:55 -0300

14 May, 2014

1 commit

31750a44 Move labelled_form_for to new api format Browse File »

Rodrigo Souto
2014-05-14 17:56:39 -0300

13 May, 2014

4 commits

684589bc Merge branch 'rails3' of gitlab.com:noosfero/noosfero into rails3 Browse File »

Rodrigo Souto
2014-05-13 19:58:35 -0300
d4026821 rails3: fix escape of javascript Browse File »

Victor Costa
2014-05-13 17:55:35 -0300
a39c63db Replace instance_eval by instance_exec to avoid api break ... Browse File »
```
http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead
```
Rodrigo Souto
2014-05-13 20:38:15 +0000

23914711 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb

2014-05-13 10:43:37 -0300

12 May, 2014

1 commit

b108c4c0 upgrading jQuery ... Browse File »
```
Conflicts:
	app/views/layouts/_javascript.html.erb
	public/javascripts/jquery-latest.js
```
Naíla Alves
2014-05-12 20:51:26 +0000

06 May, 2014

1 commit

1182476c Merge branch 'rails235' into rails3 ... Browse File »

* rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb

2014-05-06 18:00:26 -0300

05 May, 2014

1 commit

6969fc0f Support plugins' profiles on view_for_profile_actions ... Browse File »
```
(ActionItem3123)
```
Braulio Bhavamitra
2014-05-05 15:12:47 -0300