13 Jun, 2014
1 commit
-
added new hotstop "body_ending"
05 Jun, 2014
2 commits
-
Conflicts: app/controllers/admin/environment_design_controller.rb app/models/friends_block.rb app/models/members_block.rb test/functional/environment_design_controller_test.rb test/unit/members_block_test.rb
02 Jun, 2014
3 commits
-
Conflicts: app/views/profile_editor/edit.html.erb (ActionItem3152)
28 May, 2014
2 commits
19 May, 2014
2 commits
-
(ActionItem3096)
-
Join community if user log in or sign up after following a "Join" link within a community. (ActionItem3096)
16 May, 2014
1 commit
-
(ActionItem3096)
13 May, 2014
3 commits
-
Testing the difference of the exact job instead of all jobs. Also including class methods on Delayed::Job to fetch jobs by_handler and with handler_like (using sql LIKE).
-
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
1 commit
-
Conflicts: features/categories_block.feature public/stylesheets/application.css
09 May, 2014
1 commit
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
2 commits
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
17 Apr, 2014
1 commit
-
The test was checking by "original article" and "edited article" but the lib was putting the "original" and the "edited" inside a strong tag because it's the only part being edited. To solve the problem I just checked by the text that was changed.
15 Apr, 2014
1 commit
13 Apr, 2014
2 commits
-
Also removed whitespace (ActionItem3009)
-
Also added functional test to the feature (ActionItem3009)
11 Apr, 2014
1 commit
-
…o into AI3009-username_suggestion Conflicts: app/views/account/_signup_form.rhtml
08 Apr, 2014
7 commits
-
also, moving views from app/views/shared to app/views/embed (ActionItem3031)
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/categories_block.feature test/functional/search_controller_test.rb
-
(ActionItem3087)
-
also, removing lots of TAB characters ActionItem3048
07 Apr, 2014
2 commits
-
…sfero into AI3003-City_State_AutoComplete
03 Apr, 2014
1 commit
-
AI3012
02 Apr, 2014
2 commits
-
…to juniorsilva1001/noosfero-article-version Conflicts: app/views/content_viewer/versioned_article.rhtml db/schema.rb public/stylesheets/application.css
-
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
01 Apr, 2014
1 commit
31 Mar, 2014
2 commits
-
Conflicts: test/unit/block_test.rb