Noosfero/Core @ Hosted Weblate

The translation is temporarily closed for contributions due to maintenance, please come back later.

Language	Translated	Untranslated	Untranslated words	Checks	Suggestions
Armenian AGPL-3.0	18%	1,890	9,178	260	1

Czech AGPL-3.0	0%	2,333	10,680

English AGPL-3.0				2,333

Esperanto AGPL-3.0	1%	2,301	10,569	14

French AGPL-3.0	66%	780	3,817	123	1

German AGPL-3.0	72%	640	3,035	91

Indonesian AGPL-3.0	2%	2,267	10,406	2

Italian AGPL-3.0	2%	2,278	10,438	5	1

Lithuanian AGPL-3.0	0%	2,333	10,680

Norwegian Bokmål AGPL-3.0	0%	2,328	10,658	2

Portuguese AGPL-3.0	99%	1	12	13

Russian AGPL-3.0	44%	1,291	5,998	375	14

Spanish AGPL-3.0	91%	198	867	60

Ukrainian AGPL-3.0	3%	2,246	10,284

Start new translation

Please sign in to see the alerts.

Project website	https://gitlab.com/noosfero
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	GNU Affero General Public License v3.0 only
Repository	`https://gitlab.com/noosfero/noosfero.git`
Repository branch	master
Last remote commit	fix layout on forum nested comments `8b41531da` Joenio Costa authored 2 weeks ago
Repository containing Weblate translations	`https://hosted.weblate.org/git/noosfero/noosfero/`
Filemask	`po/*/noosfero.po`
Number of strings	32,662
Number of words	149,520
Number of characters	913,444
Number of languages	14
Number of source strings	2,333
Number of source words	10,680
Number of source characters	65,246

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2020-06-09 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added in the past month	`added:>=2020-06-09 AND state:<=needs-editing`	Add

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/modal_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/helpers/application_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)

13 hours 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/modal_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/helpers/application_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)

2 weeks ago

None

Received repository notification

Noosfero / Core

GitLab: https://gitlab.com/noosfero/noosfero, master 2 weeks 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/modal_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/helpers/application_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)

2 weeks ago

None

Received repository notification

Noosfero / Core

GitLab: https://gitlab.com/noosfero/noosfero, master 2 weeks 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/modal_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/helpers/application_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 weeks 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/modal_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/helpers/application_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 weeks 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/modal_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/helpers/application_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 month 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/modal_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/helpers/application_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 month 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/modal_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/helpers/application_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 month ago

Browse all component changes

Noosfero

Core

Search

Daily activity

Weekly activity