summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'access' of github.com:gogits/gogs into devUnknwon2015-02-2836-1299/+1364
|\
| * REAMDE: updateUnknwon2015-02-283-2/+3
| * models: done testing on new access systemUnknwon2015-02-285-71/+129
| * modules/setting: simple behave change in startupUnknwon2015-02-264-12/+7
| * models: fix issue with transfer repositoryUnknwon2015-02-248-72/+80
| * Merge pull request #960 from phsmit/access_action无闻2015-02-231-8/+14
| |\
| | * Update/simplify fix that owners also see actions on their repositoriesPeter Smit2015-02-181-12/+12
| | * Fix that owners also see actions on their repositoriesPeter Smit2015-02-161-6/+12
| * | v4 migration, merge 'dev', clean code and mirror fixUnknwon2015-02-2311-234/+343
| * | Merge branch 'access' of github.com:gogits/gogs into accessUnknwon2015-02-221-0/+15
| |\ \
| | * \ Merge pull request #961 from phsmit/access_removecoll无闻2015-02-221-0/+15
| | |\ \
| | | * | Remove collaborators when removing and transferring repositoryPeter Smit2015-02-161-0/+15
| | | |/
| * | | Merge branch 'access' of github.com:gogits/gogs into accessUnknwon2015-02-2214-136/+161
| |\| |
| | * | Merge pull request #959 from phsmit/access_update无闻2015-02-2110-72/+68
| | |\ \
| | | * | Updating context and fixing permission issuesPeter Smit2015-02-1610-72/+68
| | | |/
| | * | Merge pull request #958 from phsmit/fix_mirror_access无闻2015-02-172-0/+10
| | |\ \ | | | |/ | | |/|
| | | * Make sure that a mirror can't be written to by http or sshPeter Smit2015-02-162-0/+10
| | |/
| | * Merge pull request #951 from phsmit/fix_team_update无闻2015-02-131-4/+5
| | |\
| | | * Fix access for team mode updatePeter Smit2015-02-131-4/+5
| | |/
| | * Merge pull request #949 from phsmit/different_access_migration无闻2015-02-131-60/+78
| | |\
| | | * Rewrite of access migrationPeter Smit2015-02-131-60/+78
| | |/
| * | Merge branch 'dev' of github.com:gogits/gogs into accessUnknwon2015-02-2265-463/+478
| |\ \ | | |/ | |/|
| * | some fixes, but not done yet!Unknwon2015-02-131-7/+12
| * | fix mirror issues uncaught #941Unknwon2015-02-136-80/+50
| * | code fix #941 caution: undertestUnknwon2015-02-1310-256/+306
| * | models/migrations: finish accessRefactorUnknwon2015-02-121-5/+90
| * | Merge pull request #941 from phsmit/access_refactor无闻2015-02-1212-729/+244
| |\ \
| | * \ Merge remote-tracking branch 'mine/access_refactor' into access_refactorPeter Smit2015-02-1210-42/+44
| | |\ \
| | | * | Change constants to UPPERCASE_WITH_UNDERSCORE stylePeter Smit2015-02-099-42/+42
| | | * | Refactoring of the Access TablePeter Smit2015-02-0612-681/+235
| | * | | Refactoring of the Access TablePeter Smit2015-02-1212-730/+243
| * | | | models/migrations: fix little logic errorUnknwon2015-02-121-10/+12
| * | | | Merge pull request #940 from phsmit/migration_update无闻2015-02-121-14/+16
| |\| | |
| | * | | Some comments and improvements for migrationsPeter Smit2015-02-121-14/+16
| |/ / /
| * | | models/migartions: make Migration as interface and use sessionUnknwon2015-02-111-22/+61
| * | | first pass work on migration #925Unknwon2015-02-119-164/+226
| * | | Merge branch 'dev' of github.com:gogits/gogs into accessUnknwon2015-02-1124-95/+120
| |\ \ \
| * \ \ \ Merge branch 'access' of github.com:gogits/gogs into accessUnknwon2015-02-119-116/+237
| |\ \ \ \
| | * \ \ \ Merge pull request #925 from phsmit/newcollaboration无闻2015-02-119-116/+237
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'dev' into newcollaborationPeter Smit2015-02-0547-358/+1296
| | | |\ \ \
| | | * | | | Fix dashboard issue after collaboration migrationPeter Smit2015-02-041-0/+4
| | | * | | | Fix collaboration migration codePeter Smit2015-02-041-4/+15
| | | * | | | Introducing Collaboration StructPeter Smit2015-01-239-124/+230
* | | | | | | Merge pull request #992 from theangryangel/fix/ldap-auth无闻2015-02-282-13/+6
|\ \ \ \ \ \ \
| * | | | | | | Attempt #3 of ldap fixesGogs2015-02-272-13/+6
* | | | | | | | conf/locale: update Russian and SpanishUnknwon2015-02-282-148/+148
* | | | | | | | Merge pull request #982 from nicolai86/bugfix/label-num_issues-2nd无闻2015-02-242-0/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Properly calculate the number of open issues per labelRaphael Randschau2015-02-232-0/+41
|/ / / / / / / /
* | | | | | | | Merge pull request #915 from Lafriks/dev无闻2015-02-236-44/+75
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Get username, name, surname and e-mail from LDAP serverLauris BH2015-02-086-44/+75