Marcin Kuzminski
862e0c122b
commits: hide evolve commits. Fixes #5392
2017-10-03 16:37:39 +02:00
Marcin Kuzminski
3718a47d3f
changelog: fix and optimize loading of chunks for file history.
...
- load-next/prev wasn't working
- make sure pagination works as expected
- speed up certain actions by pre-loading more attributes
2017-09-27 13:21:57 +02:00
Marcin Kuzminski
bffc3ecda9
git: added identify command for checking the current checkout commit
2017-08-24 18:44:31 +02:00
Mathieu Cantin
761e973359
mercurial: Add option to close a branch before merging
2017-08-08 13:46:42 -04:00
Marcin Kuzminski
91c104ae49
largefiles: enabled download of largefiles for git and mercurial from web interface.
...
- fixes #2817
2017-03-27 14:00:36 +02:00
Marcin Kuzminski
ae3b38d628
git-lfs: create default LFS storage on new installation
...
- ref #4635
2017-03-18 12:28:23 +01:00
Marcin Kuzminski
a06ed60656
vcs-core: add a shadow-repo extractor for pull-requests, and git objects.
2017-01-23 22:53:53 +01:00
Marcin Kuzminski
07a595c030
vcs: added possibility to pre-load attributes for FileNodes.
2017-01-25 12:45:05 +01:00
Marcin Kuzminski
c50ec095c3
hg,git: change method of extracting last_change to use actualy date object
...
instead of re-parsing it again.
2017-01-24 15:26:14 +01:00
Marcin Kuzminski
9effdf9ee6
git: show stderr only if it happen for calling GIT commands
2017-01-10 10:42:46 +01:00
Marcin Kuzminski
fcc027c282
license: updated copyright year to 2017
2017-01-02 09:30:39 +01:00
Marcin Kuzminski
c68c339c0b
system-info: fetch vcs settings from vcsserver. Fixes #4276
...
- redone the system info page. Errors/Warnings now show next to the
data, and also show up in API call.
- implemented fetching of git/hg/svn version from running vcsserver
- implemented fetching of vcsserver version from itself
- added more warnings/errors detection on RAM/Inodes etc
- few cleanups
2016-11-14 21:14:29 +01:00
Martin Bornhold
66a336156c
vcs: Use more specific merge error reason (either target or source ref missing)
2016-10-27 12:50:02 +02:00
Martin Bornhold
929f1ab661
vcs: Return merge reference in merge response.
...
Previously we returned only the merge commit id. Now we set a bookmark(hg)
or branch reference(git) to point to the merge commit. By returning a
merge reference we have both informations available (id and name)
2016-10-23 16:02:41 +02:00
Martin Bornhold
d6e0fb2739
pep8: Remove unused imports and variables.
2016-10-23 16:00:16 +02:00
Martin Bornhold
939cf321a7
pr-shadow: Set reference in git shadow repositories on successful merge. #1055
2016-10-23 14:33:45 +02:00
Daniel Dourvaris
12ebe4382a
diffs: replace compare controller with new html based diffs:
...
* side/side + unified support
* redesign of diff changes/operations
* added button to see file before the change
* auto collapses large diffs
refs #4232
2016-10-19 14:29:51 +03:00
Daniel Dourvaris
091418c182
vcs: change way refs are retrieved for git so same name branch/tags
...
and remotes can be supported, fixes #298
2016-09-12 06:56:30 +03:00
Martin Bornhold
488bd2df2f
settings: Add argument to select rebase as merge strategy.
2016-06-27 13:16:10 +02:00
Daniel Dourvaris
bf510fd33c
vcs: make commit datetimes utc
2016-06-09 05:20:58 +03:00
Daniel Dourvaris
dbb993b0d4
logging: log the original error when a merge failure occurs
2016-05-31 16:08:21 +03:00
Marcin Kuzminski
9a0d8c0b77
project: added all source files and assets
2016-05-24 15:56:53 +02:00
