Commit Graph

76 Commits

Author SHA1 Message Date
René Pfeuffer
fde26cd8b7 Create new hunks instead of expanding the existing ones
This is necessary to distinguish between "real" diff lines and those
created due to expansion.
2020-06-10 11:37:22 +02:00
René Pfeuffer
586d9ac0d3 Remove log 2020-06-10 11:37:22 +02:00
René Pfeuffer
4b54597e26 Fix expanding diffs without 'normal' line at the end 2020-06-10 11:37:21 +02:00
René Pfeuffer
f48ee91776 Fix types 2020-06-10 11:37:21 +02:00
René Pfeuffer
751a2bfa9b Implement option to load rest of files completely 2020-06-10 11:37:21 +02:00
René Pfeuffer
b86c025b37 Remove expand marker at bottom when fully expanded 2020-06-10 11:37:21 +02:00
René Pfeuffer
8c1d463e09 Give two options for diff expansion (some or all lines) 2020-06-10 11:37:21 +02:00
René Pfeuffer
e7f03378a4 Fix line number calculation for patch 2020-06-10 11:37:21 +02:00
René Pfeuffer
5bf624d087 Simplify test data 2020-06-10 11:37:21 +02:00
René Pfeuffer
ebfc267b93 Patch hunks with new lines 2020-06-10 11:37:21 +02:00
René Pfeuffer
2efd21d466 Handle added and deleted files correctly 2020-06-10 11:37:21 +02:00
René Pfeuffer
abca9e9746 Show number of lines that can be expanded 2020-06-10 11:37:21 +02:00
René Pfeuffer
99b7b92fbe Introduce expandable diffs 2020-06-10 11:37:21 +02:00
Eduard Heimbuch
abcbc6beac add some missing stories for ui-components 2020-05-06 15:58:00 +02:00
Florian Scholdei
7d4135d0ec Ensure same monospace font throughout whole scmm 2020-04-03 11:11:59 +02:00
Eduard Heimbuch
fd94746a98 reformat components with prettier 2020-03-31 17:11:16 +02:00
Sebastian Sdorra
13633fb57e un collapse menu on each interaction with it 2020-03-31 11:00:07 +02:00
Sebastian Sdorra
23f4c3cba9 move router decorator into stories
This makes it possible to define other routes that "/" inside each story.
2020-03-30 15:01:51 +02:00
Sebastian Sdorra
0c7aebb1ef fixed storyshot test which renders a DateFromNow without baseDate 2020-03-27 12:17:20 +01:00
Sebastian Sdorra
2438e980a7 improve RepositoryEntry story 2020-03-26 10:16:26 +01:00
Eduard Heimbuch
3a2aa7a55c add stories for RepositoryEntry 2020-03-25 14:10:22 +01:00
Eduard Heimbuch
16c89f4b9f Merge branch 'develop' of github.com:scm-manager/scm-manager into feature/favourite_repository 2020-03-25 10:28:58 +01:00
Eduard Heimbuch
6fb762b52f move repository components from ui-webapp to ui-components // add font-awesome regular icons 2020-03-25 10:27:38 +01:00
Florian Scholdei
f1b34eb502 Changeover to MIT license (#1066)
* prepare license-maven-plugin for license migration
* added license mapping for tsx files and added some more excludes
* Changeover to MIT license
* Fix build problems
* Delete old remaining licenses
* Add more exclude path for license checker
* Rename included netbeans license, add exclude .m2/repository/
* Specify .m2 exclude because not only repository/, also wrapper/ must match
* Add .cache/ exclude for license check
* Modify formatting of license in java classes to comply with convention and IDE
* Add IntelliJ documentation for license configuration
* Update CHANGELOG.md
* Exclude tmp/workspace/ dir for license check
* Edit README.md

Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
2020-03-23 15:35:58 +01:00
Eduard Heimbuch
d4a3d52f04 fix collapsed navLinks for plugins after collapse menu with diff side-by-side button 2020-03-10 16:48:41 +01:00
Eduard Heimbuch
e110033e3b fix review findings 2020-03-02 14:13:51 +01:00
Eduard Heimbuch
d15ef12c1c refactoring 2020-02-28 15:36:25 +01:00
Eduard Heimbuch
4df33fcc73 fix styling 2020-02-28 14:58:56 +01:00
Eduard Heimbuch
2d038327d0 fix re-render bug for changesets 2020-02-28 13:15:27 +01:00
Rene Pfeuffer
0a2253753f Fix collapse all button 2020-02-13 15:08:17 +01:00
Sebastian Sdorra
73de95efc7 Use tooltip instead of title and added aria label to DiffButton 2020-02-11 08:35:55 +01:00
Sebastian Sdorra
78e31f690a Use icon only button for diff file controls 2020-02-10 15:33:32 +01:00
Rene Pfeuffer
bcba3e28cd Move redundant prop to type 2020-02-07 15:10:54 +01:00
Rene Pfeuffer
d3d33d5d65 Change case of file name 2020-02-07 14:57:36 +01:00
Rene Pfeuffer
22943eac9a Add option to use a function for default collapse state 2020-02-07 14:27:21 +01:00
Sebastian Sdorra
82f982305b added unit tests for ChangesetDiff url decision 2020-01-27 14:06:26 +01:00
Sebastian Sdorra
3a8ae34e89 split lowlight languages out of the worker bundle 2020-01-27 13:30:46 +01:00
Sebastian Sdorra
fe8e4db10b added diff endpoint which returns a parsed diff as json 2020-01-22 15:49:50 +01:00
Sebastian Sdorra
fd15c68ca0 allow syntax highlighting in diffs 2020-01-22 12:08:28 +01:00
Rene Pfeuffer
ac3821ad6d Hide 'side by side' button when there is no diff 2020-01-16 13:05:44 +01:00
Sebastian Sdorra
3011b4d3e8 merge with default branch 2020-01-13 09:34:19 +01:00
Rene Pfeuffer
dd3949b817 Hide toggle when there are no hunks to display 2020-01-10 13:54:04 +01:00
Rene Pfeuffer
82ea53dc62 Merge with default 2020-01-10 10:22:43 +01:00
Rene Pfeuffer
917a2ba1d6 Add story for diffs with binary files 2020-01-09 16:31:28 +01:00
Rene Pfeuffer
3ff28749e1 Merge with default 2020-01-08 16:43:07 +01:00
Rene Pfeuffer
67777ff52d Fix reduce error with empty diff 2020-01-08 16:42:07 +01:00
Rene Pfeuffer
71b9567437 Fix reduce error with empty diff 2020-01-08 16:35:46 +01:00
Rene Pfeuffer
658a2bd3cd Remove empty object from parameter list 2020-01-08 14:07:50 +01:00
Rene Pfeuffer
8bdd4cf319 Make conflict marking optional 2020-01-08 13:45:18 +01:00
Rene Pfeuffer
cf96b1b998 Hack for conflict marker 2020-01-08 12:58:13 +01:00