07 Aug, 2014
1 commit
-
Hopefully this is the very last time we do this. Conflicts: Rakefile app/controllers/my_profile/cms_controller.rb app/controllers/public/content_viewer_controller.rb app/helpers/application_helper.rb app/helpers/content_viewer_helper.rb app/models/article.rb app/models/enterprise.rb app/models/product_categories_block.rb app/models/products_block.rb app/views/account/_signup_form.rhtml app/views/blocks/my_network.rhtml app/views/blocks/profile_info.rhtml app/views/blocks/profile_info_actions/_community.html.erb app/views/blocks/profile_info_actions/_enterprise.html.erb app/views/blocks/profile_info_actions/_person.html.erb app/views/content_viewer/view_page.rhtml app/views/profile/index.rhtml app/views/shared/_disabled_enterprise.html.erb app/views/shared/articles_list.html.erb db/schema.rb debian/changelog lib/file_presenter.rb lib/noosfero.rb plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb plugins/work_assignment/test/unit/work_assingment_plugin_test.rb public/javascripts/application.js script/sample-articles script/sample-enterprises script/sample-products script/sample-profiles test/functional/cms_controller_test.rb test/functional/comment_controller_test.rb test/functional/content_viewer_controller_test.rb test/unit/application_helper_test.rb test/unit/article_test.rb test/unit/content_viewer_helper_test.rb test/unit/folder_helper_test.rb test/unit/forum_helper_test.rb
31 Jul, 2014
1 commit
-
the assumption on authorship changed from last_changed_by to created_by
24 Jul, 2014
1 commit
25 Feb, 2014
1 commit
26 Nov, 2012
1 commit
16 Nov, 2012
1 commit
07 Nov, 2012
4 commits
-
This reverts commit b8920a1e95ef9e9d54527de691fbeb1b1921a27f. Conflicts: app/models/user.rb
-
Conflicts: debian/changelog lib/noosfero.rb
-
* Must fix the class calls commented on Article class
06 Nov, 2012
2 commits
-
This reverts commit 521420587c18163c55c790a2f5241489260cea38. is_template is not defined on stable version yet: "NoMethodError: undefined method `is_template?'"
04 Nov, 2012
5 commits
-
Conflicts: app/sweepers/article_sweeper.rb db/schema.rb test/unit/environment_test.rb
-
Added tests Added background on edition of profile to be easier to know which field the checkbox is related (ActionItem1717)
01 Nov, 2012
3 commits
-
Conflicts: app/helpers/forms_helper.rb app/sweepers/article_sweeper.rb
-
Conflicts: db/schema.rb test/unit/environment_test.rb
-
Conflicts: app/views/content_viewer/view_page.rhtml public/stylesheets/application.css
29 Oct, 2012
3 commits
-
Added field sigup_welcome_text on environment New tab on admin panel to edit the text When the environment doesn't have a text, will use the default text Added content_type to email (ActionItem2497)
27 Oct, 2012
1 commit
-
Added field redirection_after_login on profiles and environments New db/schema Added a select to choose option to redirect on admin panel and on profile control panel (ActionItem2369)
25 Oct, 2012
2 commits
-
…into merge-requests/236
-
…into merge-requests/233 Conflicts: test/integration/routing_test.rb
24 Oct, 2012
6 commits
-
* Adding the button to add the new content in the cms including the name, description and icon.
-
Conflicts: app/helpers/forms_helper.rb app/models/box.rb app/views/box_organizer/edit.rhtml db/schema.rb test/unit/box_test.rb
-
Conflicts: app/helpers/forms_helper.rb
-
Sets fetched_at to nil after change external feed address so the feed is fetched right after the address change and without waiting the feed to be expired.
23 Oct, 2012
2 commits
-
…into merge-requests/231
21 Oct, 2012
2 commits
-
"Add a block" button "Edit" buttons on blocks Also replaced radio_button_tag and label_tag by labelled_radio_button
20 Oct, 2012
3 commits
13 Oct, 2012
1 commit