Commit graph

6198 commits

Author SHA1 Message Date
Unknwon
c6277cce51 Minor fixes for #2761 2016-03-11 17:57:44 -05:00
Unknwon
6530375dbf Merge pull request #2761 from soudy/grey-out-merge-commit
Grey out merge commits
2016-03-11 17:51:17 -05:00
Unknwon
449a6e490b Merge pull request #2815 from allonsy/develop
remove errant debug statement
2016-03-11 17:49:13 -05:00
Alec S
ebea20b4e7 remove errant debug statement 2016-03-11 16:44:09 -06:00
Unknwon
f76d821bda fix #2804 2016-03-11 17:12:37 -05:00
Unknwon
263304b6b7 #13 fix postgres aggregate 2016-03-11 16:11:33 -05:00
Unknwon
73e98c91c3 Update locales 2016-03-11 15:47:49 -05:00
Unknwon
2bf8494332 #13 finish user and repository search
Both are possible on explore and admin panel
2016-03-11 15:33:12 -05:00
Unknwon
df2bdf7ea3 Use glide 2016-03-11 12:18:27 -05:00
Unknwon
514382e2eb Rename module: middleware -> context 2016-03-11 11:56:52 -05:00
Unknwon
cb1eadc276 Merge pull request #2810 from maxlazio/fix_updated_and_created
Update uses of updated and created
2016-03-11 10:15:55 -05:00
Marin Jankovski
1314ba219e Updated and created were appended with _unix. Fresh databases have only the newly named fields. 2016-03-11 12:43:35 +01:00
Unknwon
5267dce210 Fix ref comment from commit create empty feed 2016-03-11 05:11:58 -05:00
Unknwon
97c48da49f Merge pull request #2803 from Rukenshia/develop
Using HTML Description of repositories in the 'Explore' view. Fixes #…
2016-03-10 16:17:40 -05:00
Jan Christophersen
1e74ee51ff Using HTML Description of repositories in the 'Explore' view. Fixes #2800 2016-03-10 21:31:13 +01:00
Unknwon
067edcdb90 Merge pull request #2802 from allonsy/develop
readd 'dashboard' to title
2016-03-10 13:52:33 -05:00
Alec S
792c13cf0a readd 'dashboard' to title 2016-03-10 12:10:03 -06:00
Unknwon
3bd7d3b1c5 Merge pull request #2797 from allonsy/develop
Create custom dashboard title
2016-03-10 08:37:11 -05:00
Alec S
af847ef94e Merge branch 'develop' of github.com:gogits/gogs into develop 2016-03-09 22:56:52 -06:00
Alec S
bfed3ea7d3 fix indentation 2016-03-09 22:56:03 -06:00
Unknwon
b44e4d7cb0 Merge pull request #2785 from Rukenshia/develop
Allowing site admins to view private repositories in org/home
2016-03-09 23:20:08 -05:00
Unknwon
eed9966ad6 #2727 fix incompatible SQL in PostgreSQL 2016-03-09 23:18:39 -05:00
Alec S
affa3c2dbf Remove dashboard keyword from title 2016-03-09 21:01:43 -06:00
Alec S
6775ac7334 change page titles for user and org dashes 2016-03-09 20:46:36 -06:00
Rodrigo Saboya
2c626371b0 Adding APP_DATA_PATH entry to the default app.ini. 2016-03-09 23:16:43 -03:00
Rodrigo Saboya
3cacec9163 Making AppDataPath customizable. 2016-03-09 22:53:42 -03:00
Unknwon
ad513a20e9 #2302 Replace time.Time with Unix Timestamp (int64) 2016-03-09 19:53:30 -05:00
Jan Christophersen
72a8fa3bc8 Allowing site admins to view private repositories in org/home 2016-03-08 18:20:00 +01:00
Unknwon
0c9a616326 Update frontend resources 2016-03-07 00:11:12 -05:00
Unknwon
0e9bc2d410 Fix pull request availability check 2016-03-06 23:57:46 -05:00
Unknwon
0ea0c5ec4f Prepare release 2016-03-06 19:55:38 -05:00
Unknwon
58f0c68151 Some minor changes 2016-03-06 16:40:04 -05:00
Unknwon
12b5a76b0d Minor fix for #2772 2016-03-06 15:37:49 -05:00
Unknwon
a4452864ea Merge pull request #2772 from OhDaeto/master
Add ru-RU to home template
2016-03-06 15:36:40 -05:00
OhDaeto
d57be01485 Merge pull request #1 from xDShot/patch-1
Small correction
2016-03-06 23:02:55 +03:00
xDShot
d8738f5bfd минимальные -> низкие (системные требования) 2016-03-06 22:59:49 +03:00
Unknwon
9cf7f3e46f Remove duplicated of code 2016-03-06 14:44:22 -05:00
Lourens
14aba3489e Add ru-RU to home template 2016-03-06 22:22:41 +03:00
Unknwon
13bd16af92 Minor fixes for #2766 2016-03-06 13:24:42 -05:00
Unknwon
922a6f13a3 Merge pull request #2766 from moltam/feature/delete-org-avatar
Added: Ability to delete org avatar.
2016-03-06 13:20:37 -05:00
Tamás Molnár
9c91e27933 Added: Ability to delete org avatar. 2016-03-06 17:36:30 +01:00
Unknwon
c2ca103d30 #2623 fix wrong font for webhook history 2016-03-05 23:09:16 -05:00
Unknwon
c18f67ac6a Add Finnish support 2016-03-05 21:13:04 -05:00
Unknwon
a5b0400be7 #1146 finish new access rights for collaborators 2016-03-05 20:45:23 -05:00
Unknwon
045f14fbd0 #1146 finsih UI work for access mode of collaborators
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
2016-03-05 18:08:42 -05:00
Unknwon
05d8664f15 Merge pull request #2762 from rom1504/patch-1
Fix grammar in README
2016-03-05 14:18:17 -05:00
Romain Beaumont
52fdecf97b Fix grammar in README 2016-03-05 19:46:32 +01:00
Unknwon
9c0f84cee8 Update README notes 2016-03-05 13:09:31 -05:00
Unknwon
414eb22ef9 #1597 fix activitity feeds for pull requests 2016-03-05 12:58:51 -05:00
Steven Oud
1d3ec27cb7 Put if statement of grey merge commits on one line 2016-03-05 17:59:07 +01:00