Commit Graph

5757 Commits

Author SHA1 Message Date
无闻 d047811c1a Merge pull request from bpollack/docfix
Fix a bunch of small typos and formatting quirks
2015-02-14 17:07:38 -05:00
Unknwon 685ed1f807 models: fix XORM API break
cmd/web.go: check version after load config
2015-02-14 17:01:33 -05:00
Benjamin Pollack 8c1986181d Fix a bunch of small typos and formatting quirks 2015-02-14 15:32:56 -05:00
Unknwon a38e4a0b02 routers/install.go: able to keep previous custom settings for 2nd time install
- .gopmfile: update all commits
2015-02-13 16:48:23 -05:00
无闻 cd6a2b78a7 Merge pull request from phsmit/fix_team_update
Fix access for team mode update
2015-02-13 16:25:18 -05:00
Peter Smit 0009a1d2b1 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Unknwon def39d191b conf/locale: update all locales 2015-02-13 15:48:10 -05:00
无闻 cdd8f7c53a Merge pull request from phsmit/different_access_migration
Rewrite of access migration
2015-02-13 15:15:09 -05:00
Peter Smit ddf7014b9b Rewrite of access migration
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)
2015-02-13 13:58:19 +02:00
Dmitry Azhichakov 2692d4aa49 Make conf/app.ini changes match the style 2015-02-13 11:06:12 +03:00
Unknwon 25f5a8d798 some fixes, but not done yet! 2015-02-13 02:56:42 -05:00
Dmitry Azhichakov 3aaf292ba8 Fix "forcing" client certificate for SMTP 2015-02-13 10:33:55 +03:00
Unknwon 6b7d35eade fix mirror issues uncaught 2015-02-13 02:14:57 -05:00
Unknwon 6d0f3a07d4 code fix caution: undertest 2015-02-13 00:58:46 -05:00
Unknwon b99c4baab2 models/migrations: finish accessRefactor 2015-02-12 22:43:32 -05:00
无闻 7fda0cdb93 Merge pull request from phsmit/access_refactor
Access refactor
2015-02-12 21:34:27 -05:00
Unknwon 0b3722c359 models/migrations: fix little logic error 2015-02-12 12:46:21 -05:00
无闻 31eb49c3ae Merge pull request from phsmit/migration_update
Some comments and improvements for migrations
2015-02-12 12:42:51 -05:00
Unknwon 67a9416ae5 templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled 2015-02-12 12:38:44 -05:00
Dmitry Azhichakov 8a6c86644e New feature: SMTP connection may use client certificate.
New config keys in [mailer] section:
 - CERT_FILE: path to a certificate file.
 - KEY_FILE: path to a key file.
2015-02-12 18:54:51 +03:00
Peter Smit 6c1ee384f1 Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts:
	cmd/serve.go
	models/access.go
	models/migrations/migrations.go
	models/org.go
	models/repo.go
	models/user.go
	modules/middleware/org.go
	modules/middleware/repo.go
	routers/api/v1/repo.go
	routers/org/teams.go
	routers/repo/http.go
	routers/user/home.go
2015-02-12 14:25:07 +02:00
Peter Smit 0a4cda0dd4 Refactoring of the Access Table
This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.
2015-02-12 14:14:45 +02:00
Peter Smit 2804784df9 Some comments and improvements for migrations 2015-02-12 13:59:42 +02:00
Unknwon 876a856759 models/migartions: make Migration as interface and use session 2015-02-11 23:10:30 -05:00
Unknwon 7e7160eefd first pass work on migration 2015-02-11 21:58:37 -05:00
Unknwon c5c467a9cd Merge branch 'dev' of github.com:gogits/gogs into access 2015-02-11 19:25:59 -05:00
Unknwon c7a042ef36 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-11 12:43:43 -05:00
无闻 e805fdb29c Merge pull request from phsmit/newcollaboration
Collaboration
2015-02-11 12:43:13 -05:00
无闻 0af74b36ad Merge pull request from Stefan-Code/dev
Changes to repo-header-download-drop
2015-02-11 12:27:29 -05:00
Unknwon d02e45f985 better naming on 2015-02-11 12:04:01 -05:00
Stefan-Code e5d6f4ce56 Changes to repo-header-download-drop, different repo-clone-url input behaviour 2015-02-11 07:28:51 +01:00
Unknwon 485ea6f14f models: make code change for session issue with SQLite3 2015-02-10 23:44:16 -05:00
Unknwon 28580aee63 modules/middleware/auth.go: remove uncheck login for watch a repo 2015-02-10 22:53:46 -05:00
Unknwon 6a23252edc able to allow insecure certification of webhook for 2015-02-10 21:06:59 -05:00
Unknwon e407df54f0 update gopmfile and README 2015-02-09 13:32:22 -05:00
Unknwon bad533a219 models/repo.go: add update hook when migrate for 2015-02-09 12:42:53 -05:00
Unknwon 7d3932b9cd templates/ng/base: change year to 2015, fix
- conf/locale: update Japanese locale
2015-02-09 11:04:17 -05:00
无闻 b61ef40406 Merge pull request from phsmit/fix_921
Fixes 
2015-02-09 10:54:24 -05:00
无闻 767bf82eab Merge pull request from phsmit/fix_922
Fix 
2015-02-09 10:45:41 -05:00
Peter Smit 0d158e569b Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit 5cd887dba5 Fixes
Fixes  and makes the Mention regexp be in line with the others
2015-02-09 12:56:46 +02:00
Peter Smit b7e26aa5e3 Improve argument parsing for serve command 2015-02-09 12:32:42 +02:00
Peter Smit aa35be975f Fix 2015-02-09 12:27:15 +02:00
无闻 6ed96b7a20 Merge pull request from TonyTsangHK/dev
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-09 00:31:16 -05:00
Unknwon 3cc04682c5 modules/setting: mirror path issue 2015-02-08 22:23:01 -05:00
Unknwon f15fa9167a cmd: code fix for
- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)
2015-02-08 21:26:14 -05:00
无闻 cd0ee35b3f Merge pull request from phsmit/conf_on_cli
Add option to provide configuration file on command line
2015-02-08 20:22:02 -05:00
Unknwon 3a44143b81 modules/ans1-ber: fix LDAP UTF8 string decoding for 2015-02-08 14:39:54 -05:00
Unknwon 9420eecb87 public/ng/css: code generation for 2015-02-08 13:00:22 -05:00
无闻 17a34949eb Merge pull request from Stefan-Code/dev
Updated gogs.css - monospace font for hash
2015-02-08 12:51:58 -05:00