18 Apr, 2016
1 commit
-
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Victor Costa <vfcosta@gmail.com>
13 Apr, 2016
1 commit
-
- Avoid create comments, associate children articles and perform votes on archived articles - Update db/schema -Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br> -Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com> -Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> (cherry picked from commit 144d608f15e2864e8053d384e871699d314a9283)
22 Feb, 2016
1 commit
-
- Every article can be followed so the user can receive notifications without having to comment on it Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Joenio Costa <joenio@colivre.coop.br> Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com> Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Caio SBA <caio@colivre.coop.br> Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br> Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br> Signed-off-by: Evandro Jr <evandrojr@gmail.com>
03 Oct, 2015
1 commit
02 Oct, 2015
3 commits
-
Fixes test broken after changing spread button to use modal api. Also removes colorbox class that I forgot to remove in previous commit, since now we are using modal api. For reference see commit: edcc13059b31341eb78e58079ac2322f1142f206
11 Sep, 2015
1 commit
02 Sep, 2015
1 commit
-
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Omar Júnior <omarroinuj@gmail.com> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>
13 Aug, 2015
1 commit
10 Aug, 2015
1 commit
-
Move icon to the icon theme structure (awesome also have an icon for this)
01 Aug, 2015
1 commit
17 Jun, 2015
1 commit
-
- Added image label - Added image to article body - Changed some minor positioning Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fábio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
08 Jun, 2015
1 commit
26 May, 2015
1 commit
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
19 May, 2015
1 commit
07 Apr, 2015
1 commit
31 Mar, 2015
1 commit
02 Mar, 2015
1 commit
22 Feb, 2015
2 commits
15 Jan, 2015
1 commit
13 Jan, 2015
1 commit
04 Aug, 2014
1 commit
-
(ActionItem3239)
28 Jul, 2014
1 commit
06 Jun, 2014
1 commit
-
…te, spread actions) when showing upload file in content_viewer
13 May, 2014
1 commit
-
http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead
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
11 Feb, 2014
1 commit
-
Conflicts: app/controllers/my_profile/cms_controller.rb app/controllers/public/content_viewer_controller.rb app/helpers/application_helper.rb app/helpers/article_helper.rb app/helpers/catalog_helper.rb app/helpers/comment_helper.rb app/models/article.rb app/models/enterprise.rb app/models/members_block.rb app/models/person.rb app/models/profile.rb app/views/blocks/profile_info.html.erb app/views/blocks/profile_info_actions/community.html.erb config/initializers/dependencies.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb lib/tasks/plugins.rake plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb script/sample-products test/functional/catalog_controller_test.rb test/functional/manage_products_controller_test.rb test/functional/map_balloon_controller_test.rb test/functional/profile_controller_test.rb test/functional/search_controller_test.rb test/unit/box_test.rb test/unit/cms_helper_test.rb test/unit/enterprise_test.rb test/unit/environment_test.rb test/unit/featured_products_block_test.rb test/unit/person_test.rb test/unit/product_category_test.rb test/unit/product_test.rb test/unit/profile_test.rb test/unit/user_test.rb vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
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
25 Dec, 2012
1 commit
-
*.rhtml is deprecated in Rails 3