Omar Junior / Noosfero

18 Sep, 2014

1 commit

9372126a [suggestions] Some enhancements ... Browse Dir »

Added title on links
Moved logic from view to model
Added conditions to avoid displaying empty lists
Removed code duplication on js

2014-09-18 08:21:47 -0300

18 Aug, 2014

1 commit

b7823262 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	db/schema.rb
```
Rodrigo Souto
2014-08-18 12:31:32 -0300

13 Aug, 2014

2 commits

6ccbcfa6 profile-suggestions: final adjustements Browse Dir »

Rodrigo Souto
2014-08-13 11:06:42 -0300
05c37cf4 profile-suggestions: adds missing views for connections page ... Browse Dir »
```
(ActionItem3234)
```
Larissa Reis
2014-08-13 09:16:01 -0300

12 Aug, 2014

2 commits

1a41a455 profile-suggestions: adds profile and tag connections below user ... Browse Dir »
```
(ActionItem3234)
```
Larissa Reis
2014-08-12 15:35:43 +0000
0ad3346d profile-connections: changes css to connections block ... Browse Dir »
```
  Makes the connections shown in the community / people block less
  crowded.

(ActionItem3234)
```
Larissa Reis
2014-08-12 13:53:52 +0000

11 Aug, 2014

1 commit

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

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

5 commits

03abebca [suggestions] Add suggestions on communities block ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-08-04 22:12:32 -0300
de452eab [suggestions] Added suggestion list on friends block ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-08-04 22:12:32 -0300
06611e5d [suggestion] Update community suggestions list ... Browse Dir »
```
After asking to be member removing suggestion, the list is updated

(ActionItem3234)
```
Daniela Feitosa
2014-08-04 14:20:45 -0300
43c12900 [suggestion] Update friends suggestions list ... Browse Dir »
```
After asking friendship or removing suggestion, the list is updated

(ActionItem3234)
```
Daniela Feitosa
2014-08-04 14:06:14 -0300
ad29f61a [suggestions] Displays categories in common ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-08-04 11:47:43 -0300

29 Jul, 2014

1 commit

e643284a [media-panel-improvements] Show/Hide media panel Browse Dir »

Rodrigo Souto
2014-07-29 18:03:01 -0300

28 Jul, 2014

1 commit

7332d0d4 Merge remote-tracking branch 'dani/ActionItem3234' into stoa-merge ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/models/profile.rb
	app/views/friends/index.html.erb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-07-28 11:09:25 -0300

27 Jul, 2014

2 commits

c14a3e83 profile_suggestions: pages follows same standard ... Browse Dir »
```
(ActionItem3234)
```
Daniela Feitosa
2014-07-27 11:35:33 -0300
fcad091d profile_suggestions: friends suggestions interface ... Browse Dir »
```
Users can:
   * add a suggestion as friend
   * remove a suggestion from list

(ActionItem3234)
```
Daniela Feitosa
2014-07-27 00:31:24 -0300

22 Jul, 2014

2 commits

a237136f [template-welcome-page] Let template name to be completed on the welcome page partial Browse Dir »

Rodrigo Souto
2014-07-22 11:15:19 -0300
c5257df0 [template-welcome-page] Refactor person template welcome page Browse Dir »

Rodrigo Souto
2014-07-22 11:14:24 -0300

16 Jul, 2014

1 commit

a77b106c Fixing bug AI3206: saving profile categories Browse Dir »

Arthur Esposte
2014-07-16 12:02:21 -0300

07 Jul, 2014

1 commit

bad8766a Update every old syntax of form_for and javascript_tag Browse Dir »

Rodrigo Souto
2014-07-07 11:59:05 -0300

05 Jul, 2014

1 commit

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

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

17 Jun, 2014

1 commit

21153d13 rails3: fix change image from profile Browse Dir »

Victor Costa
2014-06-17 12:22:11 -0300

05 Jun, 2014

1 commit

ac139797 Merge branch 'AI3158-icons-in-folder' into 'stable' ... Browse Dir »

Display missed icons on folder view

A small rewrite with more coherent names and context-able listing to make that thing to work.

http://noosfero.org/Development/ActionItem3158

2014-06-05 14:31:28 +0000

04 Jun, 2014

2 commits

526c04a9 Rename articles_list.rhtml to content_list.rhtml ... Browse Dir »
```
`content_list` is a more coherent name for listing things that are no exactily an article.

Completes ActionItem3158 changes
```
Aurélio A. Heckert
2014-06-04 18:48:39 -0300
f9a7c1f7 Makes folder listing context-able ... Browse Dir »
```
Also enables to correctly display icons
Closes ActionItem3158
```
Aurélio A. Heckert
2014-06-04 18:40:04 -0300

13 May, 2014

1 commit

a4611fd2 rails3: refactoring interface for category selection Browse Dir »

Victor Costa
2014-05-13 17:55:35 -0300

09 May, 2014

1 commit

66ec5b45 rails3: fix functional tests Browse Dir »

Victor Costa
2014-05-09 13:59:54 -0300

08 May, 2014

1 commit

7170c4c4 rails3: rename rhtml to html.erb Browse Dir »

Victor Costa
2014-05-08 14:34:45 -0300

06 May, 2014

1 commit

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

* 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

02 May, 2014

1 commit

59d132f8 Remove disabled enterprise message ... Browse Dir »
```
(ActionItem3129)
```
Braulio Bhavamitra
2014-05-02 16:51:55 -0300

02 Apr, 2014

1 commit

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse Dir »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

26 Mar, 2014

1 commit

cb397858 city_state_auto_complete: City/State auto-complete for user signup ... Browse Dir »

(AI3003)

- Add autocomplete to state and city fields in person create
- Created helper to share logic between maps and signup autocomplete

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>

2014-03-26 15:25:18 -0300

25 Mar, 2014

2 commits

4c75b9bd Merge branch 'stable' into noosfero_0.47.0 ... Browse Dir »
```
Conflicts:
	test/unit/block_test.rb
```
Daniela Feitosa
2014-03-25 22:09:37 +0000
341aff13 fix: added more info on cache_key of members_block ... Browse Dir »
```
(ActionItem3058)
```
Daniela Feitosa
2014-03-25 02:17:26 +0000

13 Mar, 2014

1 commit

a72fb5dd Better styles for default layout and small improvements in the UI ... Browse Dir »
```
(ActionItem2928)
```
Joenio Costa
2014-03-13 18:20:39 -0300

12 Mar, 2014

1 commit

9a799cfa Merge branch 'AI2928-categories' of https://gitlab.com/participa/noosfero into AI2928-categories Browse Dir »

Joenio Costa
2014-03-12 10:57:35 -0300

11 Mar, 2014

1 commit

8e7fe1a5 Improved layout for categories selection ... Browse Dir »
```
(ActionItem2928)
```
Victor Costa
2014-03-11 17:33:42 -0300

10 Mar, 2014

1 commit

1dfa6f09 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-10 10:10:22 -0300

11 Feb, 2014

1 commit

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