12 May, 2015
6 commits
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
-
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
-
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
22 Feb, 2015
1 commit
-
Add topleft layout template See merge request !385
13 Feb, 2015
1 commit
-
See merge request !454
10 Feb, 2015
1 commit
-
awesome: Update to version 4.3.0 and make update process easier For update just replace the `scss` and `fonts` folder with the new version, no merge is necessary as before. See merge request !461
09 Feb, 2015
1 commit
-
We now extend the vanilla scss and extend on another file. Conflicts: public/designs/icons/awesome/style.css
06 Feb, 2015
1 commit
-
Conflicts: public/stylesheets/application.css
03 Feb, 2015
3 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
-
Add awesome icon theme See merge request !423
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
22 Jan, 2015
1 commit
16 Jan, 2015
1 commit
19 Dec, 2014
1 commit
12 Dec, 2014
1 commit
03 Dec, 2014
1 commit
21 Nov, 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...
29 Jul, 2014
1 commit
22 Jul, 2014
1 commit
05 Jun, 2014
1 commit
-
(ActionItem2859)
13 May, 2014
1 commit
-
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
2 commits
-
Conflicts: app/views/layouts/_javascript.html.erb public/javascripts/jquery-latest.js
-
Conflicts: features/categories_block.feature public/stylesheets/application.css
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
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