release: merge back stable branch into default
marcink -
r4390:4a659147 merge default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -0,0 +1,41
1 |RCE| 4.19.1 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2020-05-25
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13
14
15 General
16 ^^^^^^^
17
18
19
20 Security
21 ^^^^^^^^
22
23 - issue-tracker: fixed XSS inside the newly generated description fields.
24
25
26 Performance
27 ^^^^^^^^^^^
28
29 -
30
31
32 Fixes
33 ^^^^^
34
35 - HTTP: fixed headers problems in the application.
36
37
38 Upgrade notes
39 ^^^^^^^^^^^^^
40
41 - Un-scheduled release addressing problems in 4.19.X releases.
@@ -0,0 +1,52
1 |RCE| 4.19.2 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2020-06-10
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13 - Files: landing refs will be the default for files view, resulting in names of branches instead of hashes.
14 This fixes some problems reported with navigation, and also SVN.
15 - Diffs: expose per-file comment counts.
16
17
18 General
19 ^^^^^^^
20
21 - Navigation: explicitly link to summary page for summary link.
22 - Main Page: simplify footer, and expose docs link.
23 - Docs: added mention how to change default integration templates.
24 - Files: use ref names in the url, and make usage of default landing refs.
25 - Files: report the name of missing commit.
26 - Sweet alerts: reduced font size.
27
28
29 Security
30 ^^^^^^^^
31
32 - Branch permissions: fix XSS on branch permissions adding screen.
33
34
35 Performance
36 ^^^^^^^^^^^
37
38
39
40 Fixes
41 ^^^^^
42
43 - Emails: improved styling, and fixed problems with some email clients rendering.
44 - Files: fixed label for copy-path action.
45 - Files: use a common function to handle url-by-refs, and fix landing refs for SVN.
46
47
48 Upgrade notes
49 ^^^^^^^^^^^^^
50
51 - Un-scheduled release addressing problems in 4.19.X releases.
52 It brings some added features that weren't ready for 4.19.0.
@@ -62,3 +62,6 f37a3126570477543507f0bc9d245ce75546181a
62 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1
62 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1
63 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2
63 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2
64 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3
64 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3
65 ddef396a6567117de531d67d44c739cbbfc3eebb v4.19.0
66 c0c65acd73914bf4368222d510afe1161ab8c07c v4.19.1
67 7ac623a4a2405917e2af660d645ded662011e40d v4.19.2
@@ -25,3 +25,10 transition status id in the *Workflow* s
25
25
26 Once you have the transition status id, you can create a JIRA integration
26 Once you have the transition status id, you can create a JIRA integration
27 as outlined in :ref:`creating-integrations`.
27 as outlined in :ref:`creating-integrations`.
28
29
30 .. note::
31
32 There's an option to configure integration templates.
33 Please see :ref:`integrations-rcextensions` section.
34 rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py
@@ -26,3 +26,9 available.
26
26
27 Once you have the API key, create a Redmine integration as outlined in
27 Once you have the API key, create a Redmine integration as outlined in
28 :ref:`creating-integrations`.
28 :ref:`creating-integrations`.
29
30
31 .. note::
32
33 There's an option to configure integration templates. Please see :ref:`integrations-rcextensions` section.
34 rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py No newline at end of file
@@ -9,6 +9,8 Release Notes
9 .. toctree::
9 .. toctree::
10 :maxdepth: 1
10 :maxdepth: 1
11
11
12 release-notes-4.19.2.rst
13 release-notes-4.19.1.rst
12 release-notes-4.19.0.rst
14 release-notes-4.19.0.rst
13 release-notes-4.18.3.rst
15 release-notes-4.18.3.rst
14 release-notes-4.18.2.rst
16 release-notes-4.18.2.rst
@@ -531,8 +531,6 class BaseReferencesView(RepoAppView):
531 """
531 """
532 def load_default_context(self):
532 def load_default_context(self):
533 c = self._get_local_tmpl_context()
533 c = self._get_local_tmpl_context()
534
535
536 return c
534 return c
537
535
538 def load_refs_context(self, ref_items, partials_template):
536 def load_refs_context(self, ref_items, partials_template):
@@ -562,7 +560,9 class BaseReferencesView(RepoAppView):
562 'repo_files',
560 'repo_files',
563 repo_name=self.db_repo_name,
561 repo_name=self.db_repo_name,
564 f_path=ref_name if is_svn else '',
562 f_path=ref_name if is_svn else '',
565 commit_id=commit_id)
563 commit_id=commit_id,
564 _query=dict(at=ref_name)
565 )
566
566
567 else:
567 else:
568 files_url = h.route_path(
568 files_url = h.route_path(
@@ -570,7 +570,8 class BaseReferencesView(RepoAppView):
570 repo_name=self.db_repo_name,
570 repo_name=self.db_repo_name,
571 f_path=ref_name if is_svn else '',
571 f_path=ref_name if is_svn else '',
572 commit_id=ref_name,
572 commit_id=ref_name,
573 _query=dict(at=ref_name))
573 _query=dict(at=ref_name)
574 )
574
575
575 data.append({
576 data.append({
576 "name": _render('name', ref_name, files_url, closed),
577 "name": _render('name', ref_name, files_url, closed),
@@ -187,6 +187,7 Check if we should use full-topic or min
187 I think something like this would be better
187 I think something like this would be better
188
188
189 ```py
189 ```py
190 // markdown renderer
190
191
191 def db():
192 def db():
192 global connection
193 global connection
@@ -226,10 +227,26 def db():
226 'comment_body': '''
227 'comment_body': '''
227 I like this !
228 I like this !
228
229
229 But please check this code::
230 But please check this code
230
231
231 def main():
232 .. code-block:: javascript
232 print 'ok'
233
234 // THIS IS RST CODE
235
236 this.createResolutionComment = function(commentId) {
237 // hide the trigger text
238 $('#resolve-comment-{0}'.format(commentId)).hide();
239
240 var comment = $('#comment-'+commentId);
241 var commentData = comment.data();
242 if (commentData.commentInline) {
243 this.createComment(comment, commentId)
244 } else {
245 Rhodecode.comments.createGeneralComment('general', "$placeholder", commentId)
246 }
247
248 return false;
249 };
233
250
234 This should work better !
251 This should work better !
235 ''',
252 ''',
@@ -158,7 +158,7 class TestHomeController(TestController)
158 ('Enabled', True),
158 ('Enabled', True),
159 ])
159 ])
160 def test_index_show_version(self, autologin_user, name, state):
160 def test_index_show_version(self, autologin_user, name, state):
161 version_string = 'RhodeCode Enterprise %s' % rhodecode.__version__
161 version_string = 'RhodeCode %s' % rhodecode.__version__
162
162
163 sett = SettingsModel().create_or_update_setting(
163 sett = SettingsModel().create_or_update_setting(
164 'show_version', state, 'bool')
164 'show_version', state, 'bool')
@@ -178,10 +178,10 class TestFilesViews(object):
178 commit_id='tip', f_path='/'))
178 commit_id='tip', f_path='/'))
179
179
180 # make sure Files menu url is not tip but new commit
180 # make sure Files menu url is not tip but new commit
181 landing_rev = backend.repo.landing_rev[1]
181 landing_rev = backend.repo.landing_ref_name
182 files_url = route_path('repo_files:default_path',
182 files_url = route_path('repo_files:default_path',
183 repo_name=backend.repo_name,
183 repo_name=backend.repo_name,
184 commit_id=landing_rev)
184 commit_id=landing_rev, params={'at': landing_rev})
185
185
186 assert landing_rev != 'tip'
186 assert landing_rev != 'tip'
187 response.mustcontain(
187 response.mustcontain(
@@ -125,7 +125,7 class RepoFilesView(RepoAppView):
125 self.db_repo_name, branch_name)
125 self.db_repo_name, branch_name)
126 if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
126 if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
127 message = _('Branch `{}` changes forbidden by rule {}.').format(
127 message = _('Branch `{}` changes forbidden by rule {}.').format(
128 branch_name, rule)
128 h.escape(branch_name), rule)
129 h.flash(message, 'warning')
129 h.flash(message, 'warning')
130
130
131 if json_mode:
131 if json_mode:
@@ -137,7 +137,7 class RepoFilesView(RepoAppView):
137 raise HTTPFound(files_url)
137 raise HTTPFound(files_url)
138
138
139 def _get_commit_and_path(self):
139 def _get_commit_and_path(self):
140 default_commit_id = self.db_repo.landing_rev[1]
140 default_commit_id = self.db_repo.landing_ref_name
141 default_f_path = '/'
141 default_f_path = '/'
142
142
143 commit_id = self.request.matchdict.get(
143 commit_id = self.request.matchdict.get(
@@ -181,8 +181,8 class RepoFilesView(RepoAppView):
181 raise HTTPFound(
181 raise HTTPFound(
182 h.route_path('repo_summary', repo_name=self.db_repo_name))
182 h.route_path('repo_summary', repo_name=self.db_repo_name))
183
183
184 except (CommitDoesNotExistError, LookupError):
184 except (CommitDoesNotExistError, LookupError) as e:
185 msg = _('No such commit exists for this repository')
185 msg = _('No such commit exists for this repository. Commit: {}').format(commit_id)
186 h.flash(msg, category='error')
186 h.flash(msg, category='error')
187 raise HTTPNotFound()
187 raise HTTPNotFound()
188 except RepositoryError as e:
188 except RepositoryError as e:
@@ -589,6 +589,24 class RepoFilesView(RepoAppView):
589 raise HTTPFound(compare_url)
589 raise HTTPFound(compare_url)
590
590
591 @LoginRequired()
591 @LoginRequired()
592 @view_config(
593 route_name='repo_files:default_commit', request_method='GET',
594 renderer=None)
595 def repo_files_default(self):
596 c = self.load_default_context()
597 ref_name = c.rhodecode_db_repo.landing_ref_name
598 landing_url = h.repo_files_by_ref_url(
599 c.rhodecode_db_repo.repo_name,
600 c.rhodecode_db_repo.repo_type,
601 f_path='',
602 ref_name=ref_name,
603 commit_id='tip',
604 query=dict(at=ref_name)
605 )
606
607 raise HTTPFound(landing_url)
608
609 @LoginRequired()
592 @HasRepoPermissionAnyDecorator(
610 @HasRepoPermissionAnyDecorator(
593 'repository.read', 'repository.write', 'repository.admin')
611 'repository.read', 'repository.write', 'repository.admin')
594 @view_config(
612 @view_config(
@@ -598,9 +616,6 class RepoFilesView(RepoAppView):
598 route_name='repo_files:default_path', request_method='GET',
616 route_name='repo_files:default_path', request_method='GET',
599 renderer=None)
617 renderer=None)
600 @view_config(
618 @view_config(
601 route_name='repo_files:default_commit', request_method='GET',
602 renderer=None)
603 @view_config(
604 route_name='repo_files:rendered', request_method='GET',
619 route_name='repo_files:rendered', request_method='GET',
605 renderer=None)
620 renderer=None)
606 @view_config(
621 @view_config(
@@ -138,10 +138,10 class RepoForksView(RepoAppView, DataGri
138 url_link = h.route_path(
138 url_link = h.route_path(
139 'repo_compare',
139 'repo_compare',
140 repo_name=fork.repo_name,
140 repo_name=fork.repo_name,
141 source_ref_type=self.db_repo.landing_rev[0],
141 source_ref_type=self.db_repo.landing_ref_type,
142 source_ref=self.db_repo.landing_rev[1],
142 source_ref=self.db_repo.landing_ref_name,
143 target_ref_type=self.db_repo.landing_rev[0],
143 target_ref_type=self.db_repo.landing_ref_type,
144 target_ref=self.db_repo.landing_rev[1],
144 target_ref=self.db_repo.landing_ref_name,
145 _query=dict(merge=1, target_repo=f.repo_name))
145 _query=dict(merge=1, target_repo=f.repo_name))
146 return h.link_to(_('Compare fork'), url_link, class_='btn-link')
146 return h.link_to(_('Compare fork'), url_link, class_='btn-link')
147
147
This diff has been collapsed as it changes many lines, (3299 lines changed) Show them Hide them
@@ -6,9 +6,9
6 #, fuzzy
6 #, fuzzy
7 msgid ""
7 msgid ""
8 msgstr ""
8 msgstr ""
9 "Project-Id-Version: rhodecode-enterprise-ce 4.18.0\n"
9 "Project-Id-Version: rhodecode-enterprise-ce 4.19.0\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
11 "POT-Creation-Date: 2020-01-08 13:56+0000\n"
11 "POT-Creation-Date: 2020-05-22 09:45+0000\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,12 +57,12 msgstr ""
57 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7
57 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7
58 #: rhodecode/templates/base/issue_tracker_settings.mako:137
58 #: rhodecode/templates/base/issue_tracker_settings.mako:137
59 #: rhodecode/templates/data_table/_dt_elements.mako:173
59 #: rhodecode/templates/data_table/_dt_elements.mako:173
60 #: rhodecode/templates/data_table/_dt_elements.mako:249
60 #: rhodecode/templates/data_table/_dt_elements.mako:251
61 #: rhodecode/templates/data_table/_dt_elements.mako:262
61 #: rhodecode/templates/data_table/_dt_elements.mako:266
62 #: rhodecode/templates/data_table/_dt_elements.mako:263
62 #: rhodecode/templates/data_table/_dt_elements.mako:267
63 #: rhodecode/templates/data_table/_dt_elements.mako:276
63 #: rhodecode/templates/data_table/_dt_elements.mako:282
64 #: rhodecode/templates/debug_style/buttons.html:128
64 #: rhodecode/templates/debug_style/buttons.html:128
65 #: rhodecode/templates/files/files_add.mako:57
65 #: rhodecode/templates/files/files_add.mako:56
66 #: rhodecode/templates/files/files_edit.mako:58
66 #: rhodecode/templates/files/files_edit.mako:58
67 #: rhodecode/templates/files/files_source.mako:29
67 #: rhodecode/templates/files/files_source.mako:29
68 #: rhodecode/templates/files/files_source.mako:42
68 #: rhodecode/templates/files/files_source.mako:42
@@ -178,7 +178,7 msgid "Updated Labs settings"
178 msgstr ""
178 msgstr ""
179
179
180 #: rhodecode/apps/admin/views/svn_config.py:46
180 #: rhodecode/apps/admin/views/svn_config.py:46
181 msgid "Apache configuration for Subversion generated."
181 msgid "Apache configuration for Subversion generated at `{}`."
182 msgstr ""
182 msgstr ""
183
183
184 #: rhodecode/apps/admin/views/svn_config.py:54
184 #: rhodecode/apps/admin/views/svn_config.py:54
@@ -356,200 +356,210 msgstr ""
356 msgid "Error occurred during creation of user group %s"
356 msgid "Error occurred during creation of user group %s"
357 msgstr ""
357 msgstr ""
358
358
359 #: rhodecode/apps/admin/views/users.py:221
359 #: rhodecode/apps/admin/views/users.py:222
360 #, python-format
360 #, python-format
361 msgid "Created user %(user_link)s"
361 msgid "Created user %(user_link)s"
362 msgstr ""
362 msgstr ""
363
363
364 #: rhodecode/apps/admin/views/users.py:242
364 #: rhodecode/apps/admin/views/users.py:243
365 #, python-format
365 #, python-format
366 msgid "Error occurred during creation of user %s"
366 msgid "Error occurred during creation of user %s"
367 msgstr ""
367 msgstr ""
368
368
369 #: rhodecode/apps/admin/views/users.py:344
369 #: rhodecode/apps/admin/views/users.py:345
370 msgid "User updated successfully"
370 msgid "User updated successfully"
371 msgstr ""
371 msgstr ""
372
372
373 #: rhodecode/apps/admin/views/users.py:362
373 #: rhodecode/apps/admin/views/users.py:363
374 #, python-format
374 #, python-format
375 msgid "Error occurred during update of user %s"
375 msgid "Error occurred during update of user %s"
376 msgstr ""
376 msgstr ""
377
377
378 #: rhodecode/apps/admin/views/users.py:391
379 #, python-format
380 msgid "Detached %s repositories"
381 msgstr ""
382
383 #: rhodecode/apps/admin/views/users.py:394
378 #: rhodecode/apps/admin/views/users.py:394
384 #, python-format
379 #, python-format
380 msgid "Detached %s repositories"
381 msgstr ""
382
383 #: rhodecode/apps/admin/views/users.py:397
384 #, python-format
385 msgid "Deleted %s repositories"
385 msgid "Deleted %s repositories"
386 msgstr ""
386 msgstr ""
387
387
388 #: rhodecode/apps/admin/views/users.py:400
389 #, python-format
390 msgid "Detached %s repository groups"
391 msgstr ""
392
393 #: rhodecode/apps/admin/views/users.py:403
388 #: rhodecode/apps/admin/views/users.py:403
394 #, python-format
389 #, python-format
390 msgid "Detached %s repository groups"
391 msgstr ""
392
393 #: rhodecode/apps/admin/views/users.py:406
394 #, python-format
395 msgid "Deleted %s repository groups"
395 msgid "Deleted %s repository groups"
396 msgstr ""
396 msgstr ""
397
397
398 #: rhodecode/apps/admin/views/users.py:409
399 #, python-format
400 msgid "Detached %s user groups"
401 msgstr ""
402
403 #: rhodecode/apps/admin/views/users.py:412
398 #: rhodecode/apps/admin/views/users.py:412
404 #, python-format
399 #, python-format
400 msgid "Detached %s user groups"
401 msgstr ""
402
403 #: rhodecode/apps/admin/views/users.py:415
404 #, python-format
405 msgid "Deleted %s user groups"
405 msgid "Deleted %s user groups"
406 msgstr ""
406 msgstr ""
407
407
408 #: rhodecode/apps/admin/views/users.py:418
409 #, python-format
410 msgid "Detached %s artifacts"
411 msgstr ""
412
413 #: rhodecode/apps/admin/views/users.py:421
408 #: rhodecode/apps/admin/views/users.py:421
414 #, python-format
409 #, python-format
410 msgid "Detached %s pull requests"
411 msgstr ""
412
413 #: rhodecode/apps/admin/views/users.py:424
414 #, python-format
415 msgid "Deleted %s pull requests"
416 msgstr ""
417
418 #: rhodecode/apps/admin/views/users.py:430
419 #, python-format
420 msgid "Detached %s artifacts"
421 msgstr ""
422
423 #: rhodecode/apps/admin/views/users.py:433
424 #, python-format
415 msgid "Deleted %s artifacts"
425 msgid "Deleted %s artifacts"
416 msgstr ""
426 msgstr ""
417
427
418 #: rhodecode/apps/admin/views/users.py:454
428 #: rhodecode/apps/admin/views/users.py:482
419 msgid "Successfully deleted user `{}`"
429 msgid "Successfully deleted user `{}`"
420 msgstr ""
430 msgstr ""
421
431
422 #: rhodecode/apps/admin/views/users.py:460
432 #: rhodecode/apps/admin/views/users.py:489
423 msgid "An error occurred during deletion of user"
433 msgid "An error occurred during deletion of user"
424 msgstr ""
434 msgstr ""
425
435
426 #: rhodecode/apps/admin/views/users.py:525
436 #: rhodecode/apps/admin/views/users.py:558
427 msgid ""
437 msgid ""
428 "The user participates as reviewer in {} pull request and cannot be deleted. \n"
438 "The user participates as reviewer in {} pull request and cannot be deleted. \n"
429 "You can set the user to \"{}\" instead of deleting it."
439 "You can set the user to \"{}\" instead of deleting it."
430 msgstr ""
440 msgstr ""
431
441
432 #: rhodecode/apps/admin/views/users.py:531
442 #: rhodecode/apps/admin/views/users.py:564
433 msgid ""
443 msgid ""
434 "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
444 "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
435 "You can set the user to \"{}\" instead of deleting it."
445 "You can set the user to \"{}\" instead of deleting it."
436 msgstr ""
446 msgstr ""
437
447
438 #: rhodecode/apps/admin/views/users.py:620
448 #: rhodecode/apps/admin/views/users.py:653
439 msgid "User global permissions updated successfully"
449 msgid "User global permissions updated successfully"
440 msgstr ""
450 msgstr ""
441
451
442 #: rhodecode/apps/admin/views/users.py:638
452 #: rhodecode/apps/admin/views/users.py:671
443 #: rhodecode/apps/user_group/views/__init__.py:479
453 #: rhodecode/apps/user_group/views/__init__.py:479
444 msgid "An error occurred during permissions saving"
454 msgid "An error occurred during permissions saving"
445 msgstr ""
455 msgstr ""
446
456
447 #: rhodecode/apps/admin/views/users.py:661
457 #: rhodecode/apps/admin/views/users.py:694
448 msgid "Force password change enabled for user"
458 msgid "Force password change enabled for user"
449 msgstr ""
459 msgstr ""
450
460
451 #: rhodecode/apps/admin/views/users.py:669
461 #: rhodecode/apps/admin/views/users.py:702
452 #: rhodecode/apps/admin/views/users.py:699
462 #: rhodecode/apps/admin/views/users.py:732
453 msgid "An error occurred during password reset for user"
463 msgid "An error occurred during password reset for user"
454 msgstr ""
464 msgstr ""
455
465
456 #: rhodecode/apps/admin/views/users.py:690
466 #: rhodecode/apps/admin/views/users.py:723
457 msgid "Force password change disabled for user"
467 msgid "Force password change disabled for user"
458 msgstr ""
468 msgstr ""
459
469
460 #: rhodecode/apps/admin/views/users.py:737
470 #: rhodecode/apps/admin/views/users.py:796
461 #, python-format
471 #, python-format
462 msgid "Linked repository group `%s` as personal"
472 msgid "Linked repository group `%s` as personal"
463 msgstr ""
473 msgstr ""
464
474
465 #: rhodecode/apps/admin/views/users.py:743
475 #: rhodecode/apps/admin/views/users.py:802
466 #, python-format
476 #, python-format
467 msgid "Created repository group `%s`"
477 msgid "Created repository group `%s`"
468 msgstr ""
478 msgstr ""
469
479
470 #: rhodecode/apps/admin/views/users.py:747
480 #: rhodecode/apps/admin/views/users.py:806
471 #, python-format
481 #, python-format
472 msgid "Repository group `%s` is already taken"
482 msgid "Repository group `%s` is already taken"
473 msgstr ""
483 msgstr ""
474
484
475 #: rhodecode/apps/admin/views/users.py:752
485 #: rhodecode/apps/admin/views/users.py:811
476 msgid "An error occurred during repository group creation for user"
486 msgid "An error occurred during repository group creation for user"
477 msgstr ""
487 msgstr ""
478
488
479 #: rhodecode/apps/admin/views/users.py:775
489 #: rhodecode/apps/admin/views/users.py:834
480 #: rhodecode/apps/my_account/views/my_account.py:160
490 #: rhodecode/apps/my_account/views/my_account.py:161
481 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
491 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:22
482 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
492 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27
483 msgid "Role"
493 msgid "Role"
484 msgstr ""
494 msgstr ""
485
495
486 #: rhodecode/apps/admin/views/users.py:814
496 #: rhodecode/apps/admin/views/users.py:892
487 #: rhodecode/apps/my_account/views/my_account.py:195
497 #: rhodecode/apps/my_account/views/my_account.py:217
488 msgid "Auth token successfully created"
498 msgid "Auth token successfully created"
489 msgstr ""
499 msgstr ""
490
500
491 #: rhodecode/apps/admin/views/users.py:843
501 #: rhodecode/apps/admin/views/users.py:921
492 #: rhodecode/apps/my_account/views/my_account.py:219
502 #: rhodecode/apps/my_account/views/my_account.py:241
493 msgid "Auth token successfully deleted"
503 msgid "Auth token successfully deleted"
494 msgstr ""
504 msgstr ""
495
505
496 #: rhodecode/apps/admin/views/users.py:916
506 #: rhodecode/apps/admin/views/users.py:997
497 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
507 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117
498 msgid "Ssh Key successfully created"
508 msgid "Ssh Key successfully created"
499 msgstr ""
509 msgstr ""
500
510
501 #: rhodecode/apps/admin/views/users.py:922
511 #: rhodecode/apps/admin/views/users.py:1003
502 #: rhodecode/apps/admin/views/users.py:926
512 #: rhodecode/apps/admin/views/users.py:1007
503 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120
513 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123
504 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124
514 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:127
505 msgid "An error occurred during ssh key saving: {}"
515 msgid "An error occurred during ssh key saving: {}"
506 msgstr ""
516 msgstr ""
507
517
508 #: rhodecode/apps/admin/views/users.py:960
518 #: rhodecode/apps/admin/views/users.py:1041
509 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
519 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:157
510 msgid "Ssh key successfully deleted"
520 msgid "Ssh key successfully deleted"
511 msgstr ""
521 msgstr ""
512
522
513 #: rhodecode/apps/admin/views/users.py:1006
523 #: rhodecode/apps/admin/views/users.py:1087
514 #, python-format
524 #, python-format
515 msgid "Added new email address `%s` for user account"
525 msgid "Added new email address `%s` for user account"
516 msgstr ""
526 msgstr ""
517
527
518 #: rhodecode/apps/admin/views/users.py:1012
528 #: rhodecode/apps/admin/views/users.py:1093
519 msgid "Email `{}` is already registered for another user."
529 msgid "Email `{}` is already registered for another user."
520 msgstr ""
530 msgstr ""
521
531
522 #: rhodecode/apps/admin/views/users.py:1016
532 #: rhodecode/apps/admin/views/users.py:1097
523 msgid "An error occurred during email saving"
533 msgid "An error occurred during email saving"
524 msgstr ""
534 msgstr ""
525
535
526 #: rhodecode/apps/admin/views/users.py:1043
536 #: rhodecode/apps/admin/views/users.py:1124
527 msgid "Removed email address from user account"
537 msgid "Removed email address from user account"
528 msgstr ""
538 msgstr ""
529
539
530 #: rhodecode/apps/admin/views/users.py:1089
540 #: rhodecode/apps/admin/views/users.py:1170
531 #, python-format
541 #, python-format
532 msgid "An error occurred during ip saving:%s"
542 msgid "An error occurred during ip saving:%s"
533 msgstr ""
543 msgstr ""
534
544
535 #: rhodecode/apps/admin/views/users.py:1111
545 #: rhodecode/apps/admin/views/users.py:1192
536 msgid "An error occurred during ip saving"
546 msgid "An error occurred during ip saving"
537 msgstr ""
547 msgstr ""
538
548
539 #: rhodecode/apps/admin/views/users.py:1115
549 #: rhodecode/apps/admin/views/users.py:1196
540 #, python-format
550 #, python-format
541 msgid "Added ips %s to user whitelist"
551 msgid "Added ips %s to user whitelist"
542 msgstr ""
552 msgstr ""
543
553
544 #: rhodecode/apps/admin/views/users.py:1145
554 #: rhodecode/apps/admin/views/users.py:1226
545 msgid "Removed ip address from user whitelist"
555 msgid "Removed ip address from user whitelist"
546 msgstr ""
556 msgstr ""
547
557
548 #: rhodecode/apps/admin/views/users.py:1210
558 #: rhodecode/apps/admin/views/users.py:1291
549 msgid "Groups successfully changed"
559 msgid "Groups successfully changed"
550 msgstr ""
560 msgstr ""
551
561
552 #: rhodecode/apps/admin/views/users.py:1330
562 #: rhodecode/apps/admin/views/users.py:1411
553 msgid "Deleted {} cache keys"
563 msgid "Deleted {} cache keys"
554 msgstr ""
564 msgstr ""
555
565
@@ -573,10 +583,10 msgstr ""
573 msgid "1 month"
583 msgid "1 month"
574 msgstr ""
584 msgstr ""
575
585
576 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:50068
586 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:46848
577 #: rhodecode/public/js/scripts.min.js:1
587 #: rhodecode/public/js/scripts.min.js:1
578 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
588 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
579 #: rhodecode/public/js/src/rhodecode.js:621
589 #: rhodecode/public/js/src/rhodecode.js:625
580 msgid "Lifetime"
590 msgid "Lifetime"
581 msgstr ""
591 msgstr ""
582
592
@@ -598,10 +608,10 msgid "Deleted gist %s"
598 msgstr ""
608 msgstr ""
599
609
600 #: rhodecode/apps/gist/views.py:330
610 #: rhodecode/apps/gist/views.py:330
601 #: rhodecode/templates/admin/gists/gist_show.mako:73
611 #: rhodecode/templates/admin/gists/gist_show.mako:76
602 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36
612 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:44
603 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
613 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:49
604 #: rhodecode/templates/data_table/_dt_elements.mako:333
614 #: rhodecode/templates/data_table/_dt_elements.mako:341
605 msgid "never"
615 msgid "never"
606 msgstr ""
616 msgstr ""
607
617
@@ -627,23 +637,23 msgstr ""
627 msgid "Error occurred during update of gist %s"
637 msgid "Error occurred during update of gist %s"
628 msgstr ""
638 msgstr ""
629
639
630 #: rhodecode/apps/home/views.py:397
640 #: rhodecode/apps/home/views.py:452
631 #: rhodecode/apps/repository/views/repo_pull_requests.py:879
641 #: rhodecode/apps/repository/views/repo_pull_requests.py:914
632 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
642 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:209
633 #: rhodecode/templates/admin/repos/repo_add.mako:15
643 #: rhodecode/templates/admin/repos/repo_add.mako:15
634 #: rhodecode/templates/admin/repos/repo_add.mako:19
644 #: rhodecode/templates/admin/repos/repo_add.mako:19
635 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
645 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
636 #: rhodecode/templates/base/base.mako:107
646 #: rhodecode/templates/base/base.mako:107
637 #: rhodecode/templates/base/base.mako:126
647 #: rhodecode/templates/base/base.mako:126
638 #: rhodecode/templates/base/base.mako:1111
648 #: rhodecode/templates/base/base.mako:1172
639 msgid "Repositories"
649 msgid "Repositories"
640 msgstr ""
650 msgstr ""
641
651
642 #: rhodecode/apps/home/views.py:424
652 #: rhodecode/apps/home/views.py:479
643 #: rhodecode/templates/admin/integrations/form.mako:17
653 #: rhodecode/templates/admin/integrations/form.mako:17
644