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
30 Mar, 2014
1 commit
-
(ActionItem3070)
07 Mar, 2014
4 commits
-
Conflicts: config/initializers/dependencies.rb debian/control lib/noosfero/core_ext.rb lib/noosfero/plugin/routes.rb
-
It's not used anymore since: ca5ebf95375cd5dbb80a047dc79f4c31e36df899
29 Jan, 2014
1 commit
-
This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899 and was mistakenly included on this merge 4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix 70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't removed.
10 Jan, 2014
1 commit
-
(ActionItem2918)
09 Jan, 2014
1 commit
-
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
21 Nov, 2013
2 commits
06 Nov, 2013
1 commit
24 Oct, 2013
1 commit
09 Oct, 2013
1 commit
-
PS: still failing due to ActionTracker::Record#current_user_from_model
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.
05 Sep, 2013
1 commit
16 Jul, 2013
1 commit
15 Jul, 2013
1 commit
13 Jul, 2013
1 commit
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
5 commits
08 Jul, 2013
1 commit
27 Jun, 2013
1 commit
27 Feb, 2013
1 commit
-
Conflicts: app/models/comment.rb app/views/layouts/application-ng.rhtml test/unit/category_test.rb
20 Feb, 2013
1 commit
-
…that uses the macro support
18 Dec, 2012
1 commit
-
Also logging spammer when comment is marked as spam
11 Dec, 2012
1 commit
-
Starting pluginization of solr!
07 Oct, 2012
1 commit
-
…into merge-requests/213 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/views/content_viewer/_comment.rhtml app/views/content_viewer/view_page.rhtml lib/noosfero/plugin.rb test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
11 Sep, 2012
1 commit
-
ActionItem2306
26 Aug, 2012
1 commit
25 Aug, 2012
2 commits
-
ActionItem2306
24 Aug, 2012
1 commit
-
ActionItem2306
21 Aug, 2012
4 commits
-
Conflicts: app/helpers/application_helper.rb app/views/content_viewer/_article_toolbar.rhtml test/functional/content_viewer_controller_test.rb
-
ActionItem2306
-
ActionItem2306