27 Jan, 2015
2 commits
-
Conflicts: public/javascripts/application.js public/stylesheets/application.css
-
Ai3297 class community Fix the reviewed code in https://gitlab.com/noosfero/noosfero/merge_requests/348 See merge request !404
22 Jan, 2015
1 commit
-
Append logged-in class in body when user is logged in See merge request !387
21 Jan, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
08 Jan, 2015
2 commits
03 Dec, 2014
1 commit
24 Nov, 2014
1 commit
05 Nov, 2014
1 commit
-
Conflicts: app/helpers/layout_helper.rb
26 Aug, 2014
1 commit
-
also: * keep the tip about separate tags by comma * include the css in the header page to have cache (ActionItem3280)
13 May, 2014
2 commits
-
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
12 May, 2014
2 commits
-
Also removing local jquery-ui themes and using themes provided by cdn instead.
-
Conflicts: app/views/layouts/_javascript.html.erb public/javascripts/jquery-latest.js
06 May, 2014
1 commit
-
* 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
05 May, 2014
1 commit
29 Apr, 2014
1 commit
-
This fixes a problem with the packaged production environment where Rails 3 expects write access to the entire directory instead of to just the file it actually needs to write
23 Apr, 2014
1 commit
-
Conflicts: app/views/content_viewer/view_page.rhtml app/views/profile_editor/index.rhtml debian/changelog lib/noosfero.rb plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb
09 Apr, 2014
1 commit
23 Mar, 2014
1 commit
18 Mar, 2014
1 commit
-
(ActionItem2610)
25 Feb, 2014
1 commit
24 Sep, 2013
1 commit
-
Rails.root is now a Pathname. The best use of it is with the #join method instead of concatenation and such. I therefore am rewriting all this calls to fix/avoid problems.
19 Jul, 2013
1 commit
-
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
06 Jun, 2013
1 commit
31 May, 2013
1 commit
-
Now the home page works
13 Dec, 2012
3 commits