Omar Junior / Noosfero

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

17 Jun, 2014

1 commit

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

Victor Costa
2014-06-17 12:22:11 -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

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

10 Feb, 2014

1 commit

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

30 Jan, 2014

1 commit

19945d2e rails3: fix some functional tests ... Browse Dir »
```
Output fields_for tags
```
Victor Costa
2014-01-30 11:30:12 -0300

28 Jan, 2014

1 commit

46e64d51 rails3: output the result of form_tag Browse Dir »

Victor Costa
2014-01-28 16:15:09 -0300

27 Jan, 2014

1 commit

79d0e8ba rails3: fix some controller tests ... Browse Dir »
```
getterm (and __) was replaced by _ (commit 86ecb14f)
```
Victor Costa
2014-01-27 14:11:06 -0300

23 Jan, 2014

1 commit

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

20 Jan, 2014

1 commit

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

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

03 Jan, 2014

1 commit

894e8962 New way to categorize contents Browse Dir »

Victor Costa
2014-01-03 17:49:25 -0300

18 Dec, 2013

1 commit

e28da510 Merge remote-tracking branch 'participa/AI2892-display_content_order_attributes'… ... Browse Dir »
```
… into order-attributes
```
Rodrigo Souto
2013-12-18 17:35:38 -0300

16 Dec, 2013

2 commits

3583e31a Move article image out of the lead Browse Dir »

Victor Costa
2013-12-16 17:30:26 -0300
bb58ba05 Remove unused code at lead_and_body partial Browse Dir »

Victor Costa
2013-12-16 17:26:18 -0300

05 Dec, 2013

1 commit

01bea002 Fix bug with the new image field at suggest article Browse Dir »

Victor Costa
2013-12-05 14:20:09 -0300

27 Nov, 2013

1 commit

96ad392a Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/manage_products.feature
```
Rodrigo Souto
2013-11-27 14:13:20 -0300

22 Nov, 2013

1 commit

da709178 Remove Control Panel button in the memberships listing when user doesn't have access Browse Dir »

Larissa Reis
2013-11-22 16:46:14 -0300

21 Nov, 2013

1 commit

991e20ab Merge branches 'next_colivre' and 'ActionItem2892' into ActionItem2892 Browse Dir »

Leandro Nunes dos Santos
2013-11-21 17:01:48 -0300

14 Nov, 2013

1 commit

03dce3f0 added image field to article Browse Dir »

Francisco Marcelo A. Lima Júnior
2013-11-14 19:55:04 -0300

07 Oct, 2013

1 commit

4251dcbc Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	app/views/cms/view.rhtml
	test/functional/profile_controller_test.rb
```
Rodrigo Souto
2013-10-07 14:13:32 -0300

19 Sep, 2013

2 commits

beef0083 Encapsulate logic for manage_{communityes|enterprises} Browse Dir »

Rodrigo Souto
2013-09-19 15:57:05 -0300
fec8c9a7 Merge commit 'refs/merge-requests/295' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/295
```
Rodrigo Souto
2013-09-19 15:30:45 -0300

19 Aug, 2013

1 commit

e28dc32c Allowed html5 video and audio tags when sanitizing ... Browse Dir »
```
Also, added max-width on css to avoid overflowing when using those tags
(ActionItem2740)
```
Daniela Feitosa
2013-08-19 00:46:05 +0000

19 Jul, 2013

1 commit

b05904aa Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control

2013-07-19 15:36:31 -0300

15 Jul, 2013

3 commits

92c207ee [macro-support-review] Adjusting details of the plugin to comply with core changes Browse Dir »

Rodrigo Souto
2013-07-15 21:26:30 -0300
62be815f [macro-support-review] Adding identifier method for macro Browse Dir »

Rodrigo Souto
2013-07-15 19:23:25 -0300
07caf3d4 [macro-support-review] Refactoring macros infra-structure Browse Dir »

Rodrigo Souto
2013-07-15 19:14:08 -0300

08 Jul, 2013

1 commit

d0a55e25 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-07-08 16:50:24 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse Dir »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300