Component Translated Untranslated Untranslated words Checks Suggestions Comments
Core Fix this component to clear its alerts. AGPL-3.0 38% 18,607 86,218 500 17 Browse
Documentation This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 27% 7,621 90,660 73 Browse
Plugin: Admin_Notifications This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 2 Browse
Plugin: Anti spam This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Breadcrumbs This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Bsc This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Comment classification This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 71% 84 262 6 Browse
Plugin: Comment group This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Comment paragraph This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Community block This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Community track This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 70% 46 127 7 Browse
Plugin: Container block This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Context content This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Custom forms This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 31% 1,098 4,348 100 1 Browse
Plugin: Custom_Routes This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 77% 15 54 5 Browse
Plugin: Display content This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 70% 39 196 11 Browse
Plugin: Elasticsearch This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Environment notification This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Event This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Foo This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Gallery block This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Google analytics This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 83% 2 12 Browse
Plugin: Google cse This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Html5 video This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Lattes curriculum This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: LDAP This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 2 Browse
Plugin: Mailing_List This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 2 Browse
Plugin: Mark comment as read This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Newsletter This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Orders This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Organization ratings This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 2 Browse
Plugin: People block This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 63% 38 151 12 Browse
Plugin: Pg search This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Piwik This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Products This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 8 Browse
Plugin: Public_Access_Restriction This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 77% 8 116 Browse
Plugin: Recent content This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Relevant content This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Remote user This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Require auth to comment This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 89% 3 10 Browse
Plugin: Send email This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 Browse
Plugin: Shopping cart This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 78% 96 472 15 5 Browse
Plugin: Site tour This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 2 Browse
Plugin: Sniffer This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 1 Browse
Plugin: Social_Statistics This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 75% 4 14 Browse
Plugin: Solr This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 97% 3 8 3 Browse
Plugin: Spaminator This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 76% 37 269 2 Browse
Plugin: Statistics This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 82% 22 68 8 Browse
Plugin: Stoa This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 84% 11 82 Browse
Plugin: Sub organizations This component is linked to the Noosfero/Core repository. Fix this component to clear its alerts. AGPL-3.0 95% 3 9 Browse
Project website http://noosfero.org/
Instructions for translators

http://noosfero.org/Development/Localization

Translation license AGPL-3.0 Plugin: Breadcrumbs Plugin: Comment paragraph Plugin: Environment notification Plugin: Event Plugin: Gallery block Plugin: Newsletter Plugin: Orders Plugin: Organization ratings Plugin: Site tour Plugin: Sniffer Core Documentation Plugin: Piwik Plugin: Recent content Plugin: Container block Plugin: Stoa Plugin: LDAP Plugin: Shopping cart Plugin: People block Plugin: Vote Plugin: Custom forms Plugin: Display content Plugin: Variables Plugin: Work assignment Plugin: Community block Plugin: Send email Plugin: Statistics Plugin: Tolerance time Plugin: Custom_Routes Plugin: Google analytics Plugin: Mailing_List Plugin: Comment classification Plugin: Admin_Notifications Plugin: Context content Plugin: Products Plugin: Community track Plugin: Social_Statistics Plugin: Solr Plugin: Public_Access_Restriction Plugin: Lattes curriculum Plugin: Elasticsearch Plugin: Google cse Plugin: Anti spam Plugin: Bsc Plugin: Comment group Plugin: Foo Plugin: Html5 video Plugin: Mark comment as read Plugin: Pg search Plugin: Relevant content Plugin: Remote user Plugin: Require auth to comment Plugin: Spaminator Plugin: Sub organizations Plugin: Template Plugin: Video
Number of strings 45,909
Number of words 284,967
Number of characters 1,809,729
Number of languages 13
Number of source strings 4,628
Number of source words 28,077
Number of source characters 177,886
Language Translated Strings of total Untranslated Untranslated words Checks Suggestions Comments
Armenian 12% 9% 3,187 21,846 116 1 Browse
Czech 0% 0% 2,333 10,680 Browse
English 193 Browse
Esperanto 0% 0% 3,451 22,605 3 Browse
French 45% 36% 1,978 16,125 57 5 Browse
German 55% 47% 1,733 14,853 47 Browse
Indonesian 2% 1% 2,267 10,406 Browse
Italian 1% 1% 3,229 21,703 1 Browse
Norwegian Bokmål 0% 0% 3,280 21,924 2 Browse
Portuguese 99% 99% 3 19 26 Browse
Russian 31% 24% 2,475 18,163 213 16 Browse
Spanish 84% 69% 609 3,228 113 Browse
Ukrainian 2% 1% 3,193 21,525 Browse
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)
yesterday
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)
yesterday
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)
yesterday
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)
3 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)
a week 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)
9 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)
9 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)
9 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)
10 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)
10 days ago
Browse all project changes

Activity in last 30 days

Activity in last year