aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'access' of github.com:gogits/gogs into accessUnknwon2015-02-22
|\
| * Merge pull request #961 from phsmit/access_removecoll无闻2015-02-22
| |\ | | | | | | Remove collaborators when removing and transferring repository
| | * Remove collaborators when removing and transferring repositoryPeter Smit2015-02-16
| | |
* | | Merge branch 'access' of github.com:gogits/gogs into accessUnknwon2015-02-22
|\| |
| * | Merge pull request #959 from phsmit/access_update无闻2015-02-21
| |\ \ | | | | | | | | Updating context and fixing permission issues
| | * | Updating context and fixing permission issuesPeter Smit2015-02-16
| | |/ | | | | | | | | | | | | | | | The boolean flags in the repo context have been replaced with mode and two methods Also, the permissions have been brought more in line with https://help.github.com/articles/permission-levels-for-an-organization-repository/ , Admin Team members are able to change settings of their repositories.
| * | Merge pull request #958 from phsmit/fix_mirror_access无闻2015-02-17
| |\ \ | | |/ | |/| Make sure that a mirror can't be written to by http or ssh
| | * Make sure that a mirror can't be written to by http or sshPeter Smit2015-02-16
| |/
| * Merge pull request #951 from phsmit/fix_team_update无闻2015-02-13
| |\ | | | | | | Fix access for team mode update
| | * Fix access for team mode updatePeter Smit2015-02-13
| |/
| * Merge pull request #949 from phsmit/different_access_migration无闻2015-02-13
| |\ | | | | | | Rewrite of access migration
| | * Rewrite of access migrationPeter Smit2015-02-13
| |/ | | | | | | | | | | | | | | The old migration had a few issues: - It left old column names around - It did not give the right access levels for owners and admins Also, this includes a migration that fixes the authorization of owner teams, which was previously ORG_ADMIN (instead of ORG_OWNER)
* | Merge branch 'dev' of github.com:gogits/gogs into accessUnknwon2015-02-22
|\ \ | |/ |/| | | | | | | | | | | | | Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl
| * Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2015-02-22
| |\
| | * Merge pull request #978 from albang/dev无闻2015-02-22
| | |\ | | | | | | | | [docker] openssh-client provide ssh-keygen.
| | | * openssh-client provide ssh-keygen. GOGS needs that binary to add a ssh key ↵Alban Garrigue2015-02-22
| | | | | | | | | | | | | | | | to a user
| * | | models: able to rename user with diff letter cases #981Unknwon2015-02-22
| |/ / | | | | | | | | | | | | - templates/org: mirror fix on name output - routers: add missing error check
| * | Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2015-02-22
| |\ \
| | * | Merge pull request #977 from albang/dev无闻2015-02-22
| | |\| | | | | | | | | $DIRECTORY variable is never set
| | | * $DIRECTORY variable is never setAlban Garrigue2015-02-22
| | |/
| * / routers: able to migrate repo from local pathUnknwon2015-02-22
| |/ | | | | | | - modules/middleware/context.go: add HandleAPI method
| * templates/org/home.tmpl: fix org member can't see public repoUnknwon2015-02-22
| |
| * rewordUnknwon2015-02-22
| |
| * modules/git: able to parse RFC1123Z date format #663Unknwon2015-02-21
| |
| * Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2015-02-21
| |\
| | * Merge pull request #975 from nicolai86/bugfix/label-num_issues无闻2015-02-21
| | |\ | | | | | | | | Bugfix for wrong label count
| | | * Fix #933Raphael Randschau2015-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why, but xorm ignores the num_issues and num_closed_issues columns when updating, even though the values changed. Listing them explicitly fixes the issue with the wrong issue counts
| * | | templates/user/settings/emial.tmpl: little fix on UIUnknwon2015-02-21
| |/ / | | | | | | | | | | | | - routers/user: little code format - conf/locale: update French locale
| * | Merge pull request #973 from uchti/dev无闻2015-02-20
| |\ \ | | |/ | |/| Fix: 504 5.5.2 <localhost>: Helo command rejected
| | * add error for hello funcGogs2015-02-20
| | |
| | * Fix: 504 5.5.2 <localhost>: Helo command rejectedGogs2015-02-19
| | |
| * | Merge pull request #972 from makhov/the-new-new-highlighting无闻2015-02-19
| |\ \ | | | | | | | | fix typo mistake in highlighting
| | * | js fix R1-L1 highlightAlexey Makhov2015-02-19
| | | |
| | * | fix typo mistakeAlexey Makhov2015-02-19
| | | |
| * | | Merge pull request #970 from makhov/the-new-new-highlighting无闻2015-02-18
| |\| | | | |/ | |/| The new new highlighting
| | * remove not using varsAlexey Makhov2015-02-19
| | |
| | * gitlab-like hash namingAlexey Makhov2015-02-19
| |/
| * Merge pull request #968 from Stefan-Code/dev无闻2015-02-18
| |\ | | | | | | Changed repo-clone url behavior on bare repo page, added LESS compile script
| | * Merge branch 'dev' of https://github.com/gogits/gogs into devStefan-Code2015-02-18
| | |\ | | |/ | |/|
| * | Merge pull request #962 from phsmit/dont_mention_php无闻2015-02-17
| |\ \ | | | | | | | | Remove the "PHP" style formatting function
| | * | Remove the "PHP" style formatting functionPeter Smit2015-02-16
| | | | | | | | | | | | | | | | | | | | | | | | The "PHP" formatting function doesn't add anything, except an undocumented date format. All usages in the templates have been replaced with DateFmtShort and DateFmtLong for convenience.
| * | | Merge pull request #963 from phsmit/goget无闻2015-02-17
| |\ \ \ | | |/ / | |/| | Remove GoGet option from repository and handle it with ?go-get=1 instead
| | * | Remove GoGet option from repository and handle it with ?go-get=1 insteadPeter Smit2015-02-17
| |/ / | | | | | | | | | The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
| * | update travis.ymlUnknwon2015-02-16
| | |
| * | modules/setting: add abs path check before add workdir prefixUnknwon2015-02-14
| | |
| * | Merge pull request #956 from bpollack/docfix无闻2015-02-14
| |\ \ | | | | | | | | Fix a bunch of small typos and formatting quirks
| | * | Fix a bunch of small typos and formatting quirksBenjamin Pollack2015-02-14
| | | |
| * | | models: fix XORM API breakUnknwon2015-02-14
| |/ / | | | | | | | | | cmd/web.go: check version after load config
| * | routers/install.go: able to keep previous custom settings for 2nd time installUnknwon2015-02-13
| | | | | | | | | | | | - .gopmfile: update all commits
| * | conf/locale: update all localesUnknwon2015-02-13
| | |