Commit Graph

3079 Commits

Author SHA1 Message Date
Konstantin Schaper
6f5fc25d4d Merge branch 'develop' of github.com:scm-manager/scm-manager into feature/syntax-highlighting 2020-10-14 09:08:48 +02:00
Sebastian Sdorra
a94993274a Resolve plugin SystemJS modules to their correct bundle location 2020-10-14 08:06:15 +02:00
Sebastian Sdorra
5172fdb27d Treat every scm-manager plugin as external dependency 2020-10-13 16:43:56 +02:00
Sebastian Sdorra
22d5176d1a Translate SystemJS bundle names before loading
We remove @scm-manager/ prefix and add append .bundle.js before loading
modules.
2020-10-13 16:38:22 +02:00
Eduard Heimbuch
3efe23e74d Add external flag to user config 2020-10-13 16:33:05 +02:00
Eduard Heimbuch
04a4add8ee add user converter to global configuration 2020-10-13 16:19:00 +02:00
Konstantin Schaper
17f5f4b46e implement custom highlighting theme 2020-10-12 18:53:31 +02:00
CES Marvin
befd50eeef prepare for next development iteration 2020-10-12 13:26:08 +00:00
Jenkins Agent User
a3c33af20a Merge branch 'master' into develop 2020-10-12 13:25:31 +00:00
CES Marvin
abe8413802 release version 2.7.0 2020-10-12 12:41:15 +00:00
Eduard Heimbuch
eb3525a680 improve translations 2020-10-12 13:02:26 +02:00
Konstantin Schaper
a043e7f805 Merge remote-tracking branch 'origin/feature/annotate_prismjs' into feature/syntax-highlighting
# Conflicts:
#	package.json
#	scm-ui/eslint-config/package.json
#	scm-ui/ui-components/src/SyntaxHighlighter.tsx
#	scm-ui/ui-components/src/repos/annotate/Annotate.tsx
#	scm-ui/ui-plugins/package.json
#	yarn.lock
2020-10-12 11:23:56 +02:00
Florian Scholdei
db6ec1e543 Update documentation 2020-10-09 12:40:18 +02:00
Florian Scholdei
9d9531be95 Merge with upstream 2020-10-08 00:47:45 +02:00
Florian Scholdei
a2f1c88bfd Add explanatory text in logic part, rename some variables 2020-10-07 20:33:09 +02:00
Konstantin Schaper
0f25508353 Merge pull request #1349 from scm-manager/feature/modal-rework
Feature/modal rework
2020-10-07 18:22:19 +02:00
Sebastian Sdorra
6b261fa7cb Add mock for useTranslation to i18n of ui-tests 2020-10-07 15:38:45 +02:00
René Pfeuffer
82c7b86605 Use trash bin in table, again 2020-10-06 16:39:19 +02:00
René Pfeuffer
d03763671b Mind review remarks 2020-10-06 15:42:26 +02:00
Konstantin Schaper
330e974cac fix review findings 2020-10-06 13:45:17 +02:00
Florian Scholdei
6baf759df9 Move FileLink.test.ts 2020-10-06 10:27:50 +02:00
Konstantin Schaper
fcbdb6c2f7 fix dialogs not closing properly 2020-10-05 20:05:57 +02:00
Konstantin Schaper
329ef794d4 fix broken unit test 2020-10-05 18:40:15 +02:00
Florian Scholdei
68a6d09c14 Clarify meaning of icons by adding title in sources view 2020-10-05 15:57:41 +02:00
Florian Scholdei
7e37178fc5 Merge with upstream 2020-10-05 15:41:21 +02:00
Florian Scholdei
1e410a71a7 Changes behavior for relative (only hover and context) and absolute links (internal vs external) 2020-10-05 15:30:30 +02:00
Florian Scholdei
4874966305 Change icon for subRepository 2020-10-05 15:27:24 +02:00
Florian Scholdei
0c2256c264 Update storyshots 2020-10-05 15:24:47 +02:00
Konstantin Schaper
a9cf787364 replace confirmAlert function usage with the actual component 2020-10-05 13:10:53 +02:00
René Pfeuffer
e512023d82 Fix cases 2020-10-05 11:03:52 +02:00
René Pfeuffer
d5532cb9c3 Add link to permission roles 2020-10-05 10:53:30 +02:00
René Pfeuffer
52aa9e1b23 Add footer link 2020-10-05 10:53:30 +02:00
René Pfeuffer
bf0a477ab7 Clean up ui 2020-10-05 10:53:30 +02:00
René Pfeuffer
2c582c4fde Show dialog after adding new key 2020-10-05 10:53:30 +02:00
René Pfeuffer
2c507a7212 Use icon instead of text for delete button 2020-10-05 10:53:30 +02:00
René Pfeuffer
ec57dc0731 Add UI for api keys 2020-10-05 10:53:30 +02:00
Sebastian Sdorra
e36ac62a32 Align actionbar item horizontal and enforce correct margin between them 2020-10-02 08:22:07 +02:00
Florian Scholdei
362a5447d1 Add external link for git submodule with absolute urls 2020-10-01 15:52:07 +02:00
CES Marvin
bc7d4ed9f6 prepare for next development iteration 2020-09-30 08:15:47 +00:00
CES Marvin
5887c5c268 release version 2.6.1 2020-09-30 07:32:54 +00:00
CES Marvin
4e7d62ce2f prepare for next development iteration 2020-09-25 10:05:04 +00:00
CES Marvin
e2f8566a8b release version 2.6.0 2020-09-25 09:25:13 +00:00
René Pfeuffer
9f8f26e055 Merge pull request #1342 from scm-manager/feature/admin_info
Feature/admin info
2020-09-24 12:32:24 +02:00
Eduard Heimbuch
b424bc8ff0 Merge branch 'develop' into feature/admin_info 2020-09-24 10:41:17 +02:00
Eduard Heimbuch
804a6498a7 fix review findings 2020-09-24 10:38:40 +02:00
Konstantin Schaper
e69e918d55 update storyshots 2020-09-24 10:18:43 +02:00
Florian Scholdei
b72dc36f3e Fix TagDetail title on mobile view 2020-09-24 09:52:54 +02:00
Konstantin Schaper
a169e64e09 revert deprecation for later redeclaration 2020-09-24 09:12:37 +02:00
Konstantin Schaper
3e5349d5d1 refactor modal and confirm alert 2020-09-23 14:34:21 +02:00
Eduard Heimbuch
6014eea193 update documentation 2020-09-22 16:53:08 +02:00