Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix lfs locks #8361

Merged
merged 23 commits into from
Oct 3, 2019
Merged

Fix lfs locks #8361

merged 23 commits into from
Oct 3, 2019

Commits on Sep 14, 2019

  1. Merge go-gitea/master into master

    @guillep2k
    guillep2k committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    9dbabcd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    889c619 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    d7c46c8 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2019

  1. Merge remote-tracking branch 'refs/remotes/origin/master'

    @guillep2k
    guillep2k committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    8eaacbf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 19, 2019
    Configuration menu
    Copy the full SHA
    de5aa64 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 20, 2019
    Configuration menu
    Copy the full SHA
    80c6f2b View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 22, 2019
    Configuration menu
    Copy the full SHA
    ac40f7f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    f6ac46b View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    b563158 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    6f55d1e View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 26, 2019
    Configuration menu
    Copy the full SHA
    188e164 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 27, 2019
    Configuration menu
    Copy the full SHA
    fd6fe8c View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 29, 2019
    Configuration menu
    Copy the full SHA
    54624dd View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    e2a6388 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2019

  1. Merge branch 'master' of github.com:go-gitea/gitea

    @guillep2k
    guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    b8d4abf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from go-gitea/master 

    Update to github.com/lafriks/xormstore@v1.3.0 (go-gitea#8317)
    @guillep2k
    guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    5cf823a View commit details
    Browse the repository at this point in the history

  3. [arc-green] white on hover for active menu items (go-gitea#8344) 

    * [arc-green] white on hover for active menu items

Actually, hovered active menu elements are in an unreadable black text colour.
This should be changed to white.

* [arc-green] white on hover for active menu items
Actually, hovered active menu elements are in an unreadable black text colour.
This should be changed to white.

Now editing less files and commiting with `make css`.
    @spaeps @guillep2k
    spaeps authored and guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    a9869bf View commit details
    Browse the repository at this point in the history

  4. Api: advanced settings for repository (external wiki, issue tracker e… 

    …tc.) (go-gitea#7756)

* Add API for Repo Advanced Settings of wiki and issue tracker

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Add some integration tests for tracker and wiki settings through API

* Should return StatusUnprocessableEntity in case of invalid API values.

* Add tests for invalid URLs for external tracker and wiki.

* Do not set inital values if they are default of type

* Make issue tracker and wiki units separate structures in Repository API structure.

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Fix comment of structures

Signed-off-by: David Svantesson <davidsvantesson@gmail.com>

* Rewrite API to use struct for setting tracker and wiki settings.

* LetOnlyContributorsTrackTime -> AllowOnlyContributorsToTrackTime
    @davidsvantesson @guillep2k
    davidsvantesson authored and guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    68b1381 View commit details
    Browse the repository at this point in the history

  5. Change general form binding to gogs form (go-gitea#8334)

    @aamsur @guillep2k
    aamsur authored and guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    808a477 View commit details
    Browse the repository at this point in the history

  6. [skip ci] Updated translations via Crowdin

    @GiteaBot @guillep2k
    GiteaBot authored and guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    15214fc View commit details
    Browse the repository at this point in the history

  7. Merge pull request #11 from go-gitea/master 

    Update master
    @guillep2k
    guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    a070f9e View commit details
    Browse the repository at this point in the history

  8. Extend time window for TestAPILFSLocksLogged

    @guillep2k
    guillep2k committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    ea7dc3b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. Merge branch 'master' into fix-lfs-locks

    @techknowlogick
    techknowlogick committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    5c9451e View commit details
    Browse the repository at this point in the history