Language Strings Words Needs editing Checks Suggestions Comments
Armenian 19.0% 14.1% 40.3% 3.7% 0.1% 0.0% Translate
Czech 0.0% 0.0% 0.0% 0.0% 0.0% 0.0% Translate
Esperanto 1.4% 1.0% 3.1% 0.1% 0.0% 0.0% Translate
French 64.3% 61.7% 21.0% 1.3% 0.1% 0.0% Translate
German 72.6% 71.6% 16.0% 1.1% 0.0% 0.0% Translate
Indonesian 2.8% 2.6% 1.6% 0.0% 0.0% 0.0% Translate
Italian 2.4% 2.3% 1.6% 0.0% 0.1% 0.0% Translate
Norwegian Bokmål 0.2% 0.2% 0.1% 0.1% 0.0% 0.0% Translate
Portuguese 100.0% 100.0% 0.0% 0.3% 0.0% 0.0% Translate
Russian 44.7% 43.8% 36.9% 7.9% 0.6% 0.0% Translate
Spanish 91.5% 91.9% 6.3% 1.7% 0.0% 0.0% Translate
Ukrainian 0.1% 0.1% 0.0% 0.0% 0.0% 0.0% Translate
Please log in to see the alerts.
Project website http://noosfero.org/
Instructions for translators http://noosfero.org/Development/Localization
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses bilingual files.
Translation license AGPL-3.0
Repository https://gitlab.com/noosfero/noosfero.git
Repository branch master
Last remote commit Update README.md: Adds Telegram group c22509504
Gabriel Silva authored 2 weeks ago
Repository containing Weblate translations https://hosted.weblate.org/git/noosfero/noosfero/
Filemaskpo/*/noosfero.po
Number of strings 27996
Number of words 128160
Number of characters 782952
Number of languages 12
Number of source strings 2333
Number of source words 10680
Number of source characters 65246
When User Action Detail Object
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None New alert Could not push the repository. Noosfero/Core
4 days ago None Failed push on repository Noosfero/Core
To gitlab.com:noosfero/noosfero.git
 ! [rejected]            master -> master (non-fast-forward)
error: failed to push some refs to 'git@gitlab.com:noosfero/noosfero.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository Noosfero/Core
Auto-merging test/models/sensitive_content_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_test.rb
Auto-merging test/models/sensitive_content_helper_test.rb
CONFLICT (add/add): Merge conflict in test/models/sensitive_content_helper_test.rb
Auto-merging test/models/generic_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/generic_context_test.rb
Auto-merging test/models/gallery_context.rb
CONFLICT (add/add): Merge conflict in test/models/gallery_context.rb
Auto-merging test/models/forum_context.rb
CONFLICT (add/add): Merge conflict in test/models/forum_context.rb
Auto-merging test/models/folder_test.rb
CONFLICT (content): Merge conflict in test/models/folder_test.rb
Auto-merging test/models/folder_context.rb
CONFLICT (add/add): Merge conflict in test/models/folder_context.rb
Auto-merging test/models/blog_context_test.rb
CONFLICT (add/add): Merge conflict in test/models/blog_context_test.rb
Auto-merging test/models/article_test.rb
CONFLICT (content): Merge conflict in test/models/article_test.rb
Auto-merging test/controllers/cms_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/cms_controller_test.rb
Auto-merging public/stylesheets/cms/new-sensitive-content.scss
CONFLICT (add/add): Merge conflict in public/stylesheets/cms/new-sensitive-content.scss
Auto-merging public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/models/sensitive_content/gallery_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/gallery_context.rb
Auto-merging app/models/sensitive_content/forum_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/forum_context.rb
Auto-merging app/models/sensitive_content/folder_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/folder_context.rb
Auto-merging app/models/sensitive_content/blog_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/blog_context.rb
Auto-merging app/models/sensitive_content/agenda_context.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content/agenda_context.rb
Auto-merging app/models/sensitive_content.rb
CONFLICT (add/add): Merge conflict in app/models/sensitive_content.rb
Auto-merging app/models/person.rb
CONFLICT (content): Merge conflict in app/models/person.rb
Auto-merging app/models/generic_context.rb
CONFLICT (add/add): Merge conflict in app/models/generic_context.rb
Auto-merging app/models/folder.rb
CONFLICT (content): Merge conflict in app/models/folder.rb
Auto-merging app/models/article.rb
CONFLICT (content): Merge conflict in app/models/article.rb
Auto-merging app/helpers/sensitive_content_helper.rb
CONFLICT (add/add): Merge conflict in app/helpers/sensitive_content_helper.rb
Auto-merging app/helpers/profile_selector_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_selector_helper.rb
Auto-merging app/helpers/profile_image_helper.rb
CONFLICT (content): Merge conflict in app/helpers/profile_image_helper.rb
Auto-merging app/helpers/buttons_helper.rb
CONFLICT (content): Merge conflict in app/helpers/buttons_helper.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
Auto-merging app/controllers/my_profile/cms_controller.rb
CONFLICT (content): Merge conflict in app/controllers/my_profile/cms_controller.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
Browse all component changes

Activity in last 30 days

Activity in last year