Unknwon
|
b0b11fd7b1
|
Merge branch 'access' of github.com:gogits/gogs into dev
|
2015-02-28 21:50:29 -05:00 |
|
Unknwon
|
f44204e944
|
REAMDE: update
|
2015-02-28 21:50:04 -05:00 |
|
Unknwon
|
473e265727
|
models: done testing on new access system
|
2015-02-28 21:44:09 -05:00 |
|
无闻
|
3a6ba39a61
|
Merge pull request #992 from theangryangel/fix/ldap-auth
Attempt 3 to fix LDAP login issues when git pushing after password change
|
2015-02-28 06:57:43 -05:00 |
|
Unknwon
|
0d90a16d9f
|
conf/locale: update Russian and Spanish
|
2015-02-28 06:45:08 -05:00 |
|
Unknwon
|
e3dece1371
|
modules/setting: simple behave change in startup
|
2015-02-26 19:45:38 -05:00 |
|
无闻
|
d5de48df89
|
Merge pull request #982 from nicolai86/bugfix/label-num_issues-2nd
Properly calculate the number of open issues per label
|
2015-02-24 12:33:18 -05:00 |
|
Unknwon
|
8896c82d34
|
models: fix issue with transfer repository
README: fix typo
|
2015-02-24 00:27:22 -05:00 |
|
无闻
|
f92bfabf86
|
Merge pull request #960 from phsmit/access_action
Fix that owners also see actions on their repositories
|
2015-02-23 13:51:02 -05:00 |
|
无闻
|
cd8b43d984
|
Merge pull request #915 from Lafriks/dev
Get username, name, surname and e-mail from LDAP server
|
2015-02-23 13:41:29 -05:00 |
|
Unknwon
|
ee68a826a5
|
v4 migration, merge 'dev', clean code and mirror fix
|
2015-02-23 02:15:53 -05:00 |
|
Unknwon
|
e90f014e4a
|
Merge branch 'access' of github.com:gogits/gogs into access
|
2015-02-22 23:34:05 -05:00 |
|
无闻
|
125fe92a19
|
Merge pull request #961 from phsmit/access_removecoll
Remove collaborators when removing and transferring repository
|
2015-02-22 23:33:13 -05:00 |
|
Unknwon
|
10e4b5b6c6
|
Merge branch 'access' of github.com:gogits/gogs into access
|
2015-02-22 22:55:35 -05:00 |
|
Unknwon
|
7ccab9cd09
|
Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
gogs.go
models/models.go
models/user.go
templates/.VERSION
templates/org/home.tmpl
|
2015-02-22 22:51:25 -05:00 |
|
Unknwon
|
2369881808
|
Merge branch 'dev' of github.com:gogits/gogs into dev
|
2015-02-22 18:24:52 -05:00 |
|
Unknwon
|
04164eada3
|
models: able to rename user with diff letter cases #981
- templates/org: mirror fix on name output
- routers: add missing error check
|
2015-02-22 18:24:49 -05:00 |
|
无闻
|
e97a6ff911
|
Merge pull request #978 from albang/dev
[docker] openssh-client provide ssh-keygen.
|
2015-02-22 17:59:12 -05:00 |
|
Unknwon
|
74a8bb93d8
|
Merge branch 'dev' of github.com:gogits/gogs into dev
|
2015-02-22 09:49:28 -05:00 |
|
Unknwon
|
059338139c
|
routers: able to migrate repo from local path
- modules/middleware/context.go: add HandleAPI method
|
2015-02-22 09:49:25 -05:00 |
|
无闻
|
aa670ce660
|
Merge pull request #977 from albang/dev
$DIRECTORY variable is never set
|
2015-02-22 07:13:06 -05:00 |
|
Unknwon
|
c753fdceaf
|
templates/org/home.tmpl: fix org member can't see public repo
|
2015-02-22 03:07:04 -05:00 |
|
Unknwon
|
a6a99d49cf
|
reword
|
2015-02-22 00:12:55 -05:00 |
|
Unknwon
|
9dfa17faf2
|
modules/git: able to parse RFC1123Z date format #663
|
2015-02-21 23:37:32 -05:00 |
|
Unknwon
|
3fcc39c26b
|
Merge branch 'dev' of github.com:gogits/gogs into dev
|
2015-02-21 22:13:50 -05:00 |
|
Unknwon
|
1654e9ecab
|
templates/user/settings/emial.tmpl: little fix on UI
- routers/user: little code format
- conf/locale: update French locale
|
2015-02-21 22:13:47 -05:00 |
|
无闻
|
bbee7b7196
|
Merge pull request #975 from nicolai86/bugfix/label-num_issues
Bugfix for wrong label count
|
2015-02-21 03:42:24 -05:00 |
|
无闻
|
fc4dff1b17
|
Merge pull request #959 from phsmit/access_update
Updating context and fixing permission issues
|
2015-02-21 02:55:30 -05:00 |
|
无闻
|
065f8d1f56
|
Merge pull request #973 from uchti/dev
Fix: 504 5.5.2 <localhost>: Helo command rejected
|
2015-02-20 18:25:18 -05:00 |
|
无闻
|
8f1d2d9f24
|
Merge pull request #972 from makhov/the-new-new-highlighting
fix typo mistake in highlighting
|
2015-02-19 19:33:25 -05:00 |
|
无闻
|
77ac1e6ff6
|
Merge pull request #970 from makhov/the-new-new-highlighting
The new new highlighting
|
2015-02-18 21:55:57 -05:00 |
|
无闻
|
be19fe48d7
|
Merge pull request #968 from Stefan-Code/dev
Changed repo-clone url behavior on bare repo page, added LESS compile script
|
2015-02-18 05:33:58 -05:00 |
|
无闻
|
a307574fbc
|
Merge pull request #962 from phsmit/dont_mention_php
Remove the "PHP" style formatting function
|
2015-02-17 23:19:25 -05:00 |
|
无闻
|
58e28e5d9d
|
Merge pull request #958 from phsmit/fix_mirror_access
Make sure that a mirror can't be written to by http or ssh
|
2015-02-17 23:09:53 -05:00 |
|
无闻
|
4e18bbf1cf
|
Merge pull request #963 from phsmit/goget
Remove GoGet option from repository and handle it with ?go-get=1 instead
|
2015-02-17 16:18:26 -05:00 |
|
Unknwon
|
d85366930c
|
update travis.yml
|
2015-02-16 02:51:39 -05:00 |
|
无闻
|
d047811c1a
|
Merge pull request #956 from bpollack/docfix
Fix a bunch of small typos and formatting quirks
|
2015-02-14 17:07:38 -05:00 |
|
无闻
|
cd6a2b78a7
|
Merge pull request #951 from phsmit/fix_team_update
Fix access for team mode update
|
2015-02-13 16:25:18 -05:00 |
|
无闻
|
cdd8f7c53a
|
Merge pull request #949 from phsmit/different_access_migration
Rewrite of access migration
|
2015-02-13 15:15:09 -05:00 |
|
无闻
|
7fda0cdb93
|
Merge pull request #941 from phsmit/access_refactor
Access refactor
|
2015-02-12 21:34:27 -05:00 |
|
无闻
|
31eb49c3ae
|
Merge pull request #940 from phsmit/migration_update
Some comments and improvements for migrations
|
2015-02-12 12:42:51 -05:00 |
|
无闻
|
e805fdb29c
|
Merge pull request #925 from phsmit/newcollaboration
Collaboration
|
2015-02-11 12:43:13 -05:00 |
|
无闻
|
0af74b36ad
|
Merge pull request #937 from Stefan-Code/dev
Changes to repo-header-download-drop
|
2015-02-11 12:27:29 -05:00 |
|
无闻
|
b61ef40406
|
Merge pull request #924 from phsmit/fix_921
Fixes #921
|
2015-02-09 10:54:24 -05:00 |
|
无闻
|
767bf82eab
|
Merge pull request #923 from phsmit/fix_922
Fix #922
|
2015-02-09 10:45:41 -05:00 |
|
无闻
|
6ed96b7a20
|
Merge pull request #911 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 |
|
无闻
|
cd0ee35b3f
|
Merge pull request #905 from phsmit/conf_on_cli
Add option to provide configuration file on command line
|
2015-02-08 20:22:02 -05:00 |
|
无闻
|
17a34949eb
|
Merge pull request #919 from Stefan-Code/dev
Updated gogs.css - monospace font for hash
|
2015-02-08 12:51:58 -05:00 |
|
无闻
|
19525abfc4
|
Merge pull request #845 from compressed/token_http
allow http push by token - #842
|
2015-02-07 15:27:59 -05:00 |
|
无闻
|
87b90372a7
|
Merge pull request #908 from nicolai86/feature/hide-signup-button-884
Make Signup button display configurable - #884
|
2015-02-06 21:03:31 -05:00 |
|
无闻
|
ddddad9792
|
Merge pull request #826 from deringer/dev
Fix user mention bug when parsing markdown documents
|
2015-02-06 19:03:35 -05:00 |
|
无闻
|
15d4f32825
|
Merge pull request #907 from makhov/new-lines-highlighting-format
fix highlighting css for del code
|
2015-02-05 08:21:01 -05:00 |
|
无闻
|
23f3f60dcf
|
Merge pull request #904 from makhov/new-lines-highlighting-format
new lines highlighting format
|
2015-02-05 07:30:37 -05:00 |
|
无闻
|
02c5bade0f
|
Merge pull request #892 from EtienneBruines/commit_reference
Referencing issues from commit messages is now possible.
|
2015-02-04 23:21:20 -05:00 |
|
无闻
|
3e307e7862
|
Merge pull request #901 from makhov/fix-diff-view
fix lines highlighting at diff view
|
2015-02-04 19:13:40 -05:00 |
|
无闻
|
43bf94e1aa
|
Merge pull request #897 from makhov/makhov/fix-admin-config
fix error at admin/config
|
2015-02-03 12:21:50 -05:00 |
|
无闻
|
e8b62e8957
|
Merge pull request #895 from makhov/makhov/fix-settings-email-html
fix settings/email html&css
|
2015-02-03 06:50:57 -05:00 |
|
无闻
|
902f19f70b
|
Merge pull request #821 from phsmit/fix_819
Fix #819 by fetching the repository from db before updating
|
2015-02-02 23:38:04 -05:00 |
|
无闻
|
cd6376f093
|
Merge pull request #818 from fzerorubigd/master
add a function to rewrite all public keys on admin request
|
2015-02-01 16:56:34 -05:00 |
|
无闻
|
d4fc8880eb
|
Merge pull request #889 from mgdelacroix/patch-1
Add Miguel de la Cruz as a translator
|
2015-02-01 16:48:48 -05:00 |
|
无闻
|
facd491a6d
|
Merge pull request #888 from tstorch/docker_hp_update
correction: updated docker link
|
2015-02-01 14:38:36 -05:00 |
|
无闻
|
69d98e9edd
|
Merge pull request #885 from clinta/dev
Add a freebsd init script.
|
2015-01-30 23:00:51 -05:00 |
|
无闻
|
61608f13a0
|
Merge pull request #870 from phsmit/migrations
Create db migrations framework
|
2015-01-22 21:07:11 +08:00 |
|
无闻
|
161774d4fb
|
Merge pull request #825 from phsmit/ssh2_keys
Implement #798 Flexible ssh-key input
|
2015-01-22 19:39:35 +08:00 |
|
无闻
|
edbfbfa66e
|
Merge pull request #822 from phsmit/fix_807
Fix #807 parse the userinfo with the golang tools
|
2015-01-22 19:31:51 +08:00 |
|
无闻
|
830bc75107
|
Merge pull request #866 from vitalvas/dev
Fix in url if cache avatar is enabled
|
2015-01-20 13:38:17 +08:00 |
|
无闻
|
210306bd64
|
Merge pull request #865 from clinta/patch-1
Allow start.sh from any working directory
|
2015-01-18 14:08:12 +08:00 |
|
无闻
|
f99690a545
|
Merge pull request #861 from phsmit/change_chardet
Change chardet to gogits
|
2015-01-17 14:45:48 +08:00 |
|
无闻
|
bdd6aef746
|
Merge pull request #849 from gittex/translate
Translation update
|
2015-01-17 14:43:27 +08:00 |
|
无闻
|
9e61ec316e
|
Merge pull request #830 from TonyTsangHK/dev
Add max-width to commit message of repo-files-table
|
2015-01-05 20:45:06 +08:00 |
|
无闻
|
9b0858b1ad
|
Merge pull request #823 from phsmit/fix_799
Fix #799 by adding a tooltip for all dates in all settings/panels
|
2015-01-02 20:25:48 +08:00 |
|
无闻
|
52cc58fd9d
|
Merge pull request #797 from Mikayex/dev
Fix #795
|
2014-12-29 20:09:50 +08:00 |
|
无闻
|
477bea574a
|
Merge pull request #782 from estetsenko/dev
fix for #747
|
2014-12-29 20:08:39 +08:00 |
|
无闻
|
37566f71a9
|
Merge pull request #787 from andre-hub/dev
flexible the build scripts and add a freebsd build script
|
2014-12-29 20:07:10 +08:00 |
|
无闻
|
afdb0c7f9d
|
Merge pull request #790 from euank/master
Initialize unset git user.email / user.name correctly; fix Dockerfile
|
2014-12-29 20:06:27 +08:00 |
|
无闻
|
46742a79ca
|
Merge pull request #785 from joshk/patch-1
Use the new build env on Travis
|
2014-12-27 12:25:08 +08:00 |
|
无闻
|
d61def86e1
|
Merge pull request #780 from morpheyesh/master
spellcheck
|
2014-12-27 12:24:21 +08:00 |
|
无闻
|
e193005c66
|
Merge pull request #773 from phsmit/golang_x_text_encoding
Golang x text encoding
|
2014-12-22 05:30:49 -05:00 |
|
无闻
|
0f77ad219c
|
Merge pull request #771 from phsmit/multiple_email_cleanup
Create English locale keys for multiple e-mails feature
|
2014-12-22 02:43:20 -05:00 |
|
无闻
|
0d7bb9af46
|
Merge pull request #769 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
|
2014-12-21 02:58:38 -05:00 |
|
无闻
|
350e0080e6
|
Merge pull request #767 from phsmit/fix_email_query
Fix for wrong email query
|
2014-12-21 02:23:36 -05:00 |
|
无闻
|
030b3d751e
|
Merge pull request #766 from phsmit/correct_from
Correct usage of FROM in email creation
|
2014-12-21 01:55:28 -05:00 |
|
无闻
|
a18decf4cc
|
Merge pull request #755 from phsmit/multiple_emails
Multiple emails
|
2014-12-20 22:47:05 -05:00 |
|
无闻
|
e6e2cf7855
|
Merge pull request #764 from phsmit/fix_mailer
Remove standard mailer port lines
|
2014-12-19 17:20:13 -05:00 |
|
无闻
|
d01e7b0173
|
Merge pull request #762 from phsmit/crammd5
Crammd5
|
2014-12-18 16:49:11 -05:00 |
|
无闻
|
bb267e30b6
|
Merge pull request #761 from phsmit/mailer_rewritten
Rewrite of SendMail function
|
2014-12-18 16:37:24 -05:00 |
|
无闻
|
35140f1cc7
|
Merge pull request #731 from cryptix/dev
increase minimum version for HTTPS to TLS 1.0 (POODLE, fixes #730)
|
2014-12-11 18:32:49 -05:00 |
|
无闻
|
b2c6a6920f
|
Merge pull request #727 from Mageti/master
Correction for #723
|
2014-12-10 05:03:50 -05:00 |
|