13 Feb, 2015

1 commit

11 Feb, 2015

1 commit

08 Dec, 2014

1 commit

16 Oct, 2014

1 commit

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
    Victor Costa
     

26 Mar, 2014

1 commit

22 Jan, 2014

1 commit

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
    Rodrigo Souto
     

28 Nov, 2013

1 commit

  • 0834d18f   improving agenda/events ... Browse Dir » 
    Show events by month
Event list now only show 10 events when listing events for month
(events for a day still listing all events)
Add information on indefined place
Enhance layout

(ActionItem2587)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>
    Paulo Meireles
     

25 Dec, 2012

1 commit

24 Dec, 2011

1 commit

03 May, 2011

1 commit

26 Oct, 2010

1 commit

08 Apr, 2010

1 commit

  • cc96e5cc   HTML optimizations ... Browse Dir » 
    This commit introduces a lot of changes in the HTML generated by Nosfero
with the intent of making it load faster on users' browsers. This
includes:

  * Adding apache configuration for compression of text content and
    aggresive cache policy (caching assets for 1 month)
  * Drastically reducing the number of stylesheets and javascript files
    referenced in the HTML.
  * The remaining CSS and Javascript files are now cached in a single file
    (one CSS file and one Javascript file) so that clients will only
    request a single file instead of several ones (and thus requiring a
    single HTTP connection instead of several ones).
  * Making sure that all assets referenced in the code have a timestamp
    (?21083219837) in the end of the URL so that when they are updated the
    client will fetch them again.

During the course of the implemeantion, some other changes were made:

  * Updated INSTALL file with documentation about apache configuration for
    production environments.
  * Marked as deprecated all methods that use stylesheet_import, as well
    as stylesheet_import itself.
  * Removed "better browser promotion" code. It sucks.
  * Unifyed Noosfero stylesheets)
  * Unifyed stylesheets in the base theme
  * Enhanced the sample-data script with the creation of random events.
    in a range of 60 days around the current date, so that there will be
    events in the previous month, in the current month and in the next
    month.
  * Removed unused cms.js
  * Updated .gitignore example to ignore cached CSS and Javascript files.
  * Updated git-upgrade script to remove cached CSS and Javascript files.

(ActionItem1425)
    Antonio Terceiro
     

02 Dec, 2009

1 commit

  • c6761125   More improvements to agenda ... Browse Dir » 
     - Button to create new event
 - Displaying header and footer even without side boxes
 - Display links to events in bold
 - Fixing previous and next month boxes on IE
 - Display environment name in header of global agenda

(ActionItem1255)
    Joenio Costa
     

20 Nov, 2009

1 commit

31 Oct, 2009

1 commit