06 Feb, 2015
1 commit
-
Conflicts: public/stylesheets/application.css
03 Feb, 2015
2 commits
-
Conflicts: app/controllers/my_profile/profile_editor_controller.rb app/helpers/search_helper.rb app/models/invitation.rb app/models/person.rb app/views/cms/view.html.erb app/views/templates/index.html.erb plugins/community_track/views/content_viewer/_step_item.html.erb test/functional/home_controller_test.rb test/unit/person_test.rb test/unit/profile_test.rb
28 Jan, 2015
1 commit
-
When acessing Noosfero through a properly configured HTTPS setup, all links will now be generated with https (or without an explicit protocol and will just work). Links generated outside of the scope of a request (models, mailers etc) will still use http://. That can be fixed by a localized change to Environment#top_url, but for now I expect everyone using HTTPS to have a proper HTTP -> HTTPS redirection mechanism.
27 Jan, 2015
1 commit
-
Conflicts: public/javascripts/application.js public/stylesheets/application.css
19 Dec, 2014
1 commit
12 Dec, 2014
1 commit
03 Dec, 2014
1 commit
20 Nov, 2014
1 commit
-
Conflicts: Gemfile.lock script/development
10 Oct, 2014
1 commit
-
- Remove absolute URL's from stylesheets and javascripts - Handle prefix in LinkListBlock - add Noosfero.root method as a central data source The application server needs to be started with the RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix. In development, this can be tested with # assuming /social prefix $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start For production, see INSTALL.md
12 Aug, 2014
4 commits
-
Makes the connections shown in the community / people block less crowded. (ActionItem3234)
04 Aug, 2014
2 commits
-
(ActionItem3234)
-
(ActionItem3234)
31 Jul, 2014
1 commit
-
Ideally we want to merge both of them somehow...
05 Jun, 2014
1 commit
-
(ActionItem2859)
12 May, 2014
1 commit
-
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
29 Mar, 2014
1 commit
-
(ActionItem2911) Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
18 Feb, 2014
1 commit
31 Jan, 2014
1 commit
-
…into merge-requests/367 Conflicts: app/views/content_viewer/view_page.rhtml
21 Jan, 2014
1 commit
-
…into merge-requests/337 Conflicts: app/controllers/public/catalog_controller.rb app/helpers/application_helper.rb app/helpers/catalog_helper.rb app/views/catalog/index.rhtml public/stylesheets/application.css
16 Jan, 2014
1 commit
-
(ActionItem2844)
08 Jan, 2014
1 commit
-
- Added buttons at members block. - Added checkbox to show or not the buttons on the community members. - Removed the render button "enter/leave" when the checkbox that enables the button is unchecked - Adjusted style CSS and display button - Added cucumber and unit tests. - Removed some spaces. - There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them. (ActionItem2844) Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Leandro Alves <leandrosustenido@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: Andre Bedran <bedran.fleck@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
16 Dec, 2013
1 commit
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
27 Sep, 2013
1 commit
-
* The env admin link and the user pannel had the same controlpanel id. * The user icon is now recovered. * The #manage-enterprises icons was croped. Closes ActionItem2817
19 Sep, 2013
2 commits
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
-
…into merge-requests/295
04 Sep, 2013
1 commit
12 Jul, 2013
1 commit
17 Jun, 2013
1 commit
-
ActionItem896
08 May, 2013
1 commit
-
The idea is never to give a Upload File to a view. That must always work with a File Presenter providing overwrite methods and specific views/partials. ActionItem2373
22 Mar, 2013
1 commit
-
ActionItem1030
08 Nov, 2012
1 commit
-
(ActionItem2439)
24 Oct, 2012
1 commit
-
Conflicts: app/helpers/forms_helper.rb app/models/box.rb app/views/box_organizer/edit.rhtml db/schema.rb test/unit/box_test.rb
20 Oct, 2012
2 commits
23 Aug, 2012
1 commit