Commit graph

386 commits

Author SHA1 Message Date
Martin Knoll
07fefc9206 Fixes issue with logo linking to the server root, instead of the app root.
If using multiple Rails apps in subfolders, the upper left "GITLAB" button links to '/' and thats kinda wrong.
This fix creates a link to the root_url instead, which works in every case.
2011-11-25 01:01:58 +01:00
gitlabhq
b7f4f67b9b issue show finished 2011-11-24 11:47:27 -05:00
gitlabhq
2fbf45b2e0 issue message output 2011-11-24 10:15:30 -05:00
gitlabhq
ee2d3de1a6 ability to attach branch to issue 2011-11-24 08:08:20 -05:00
Dmitriy Zaporozhets
b4c40c212c removed activities page cache cause some bugs 2011-11-23 22:12:36 +02:00
Dmitriy Zaporozhets
21d566ea76 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:52:15 +02:00
Valery Sizov
d61268e4f1 [#169] – Move email 'from' & 'host' settings to config file 2011-11-22 23:36:14 +02:00
Dmitriy Zaporozhets
7ebba27db2 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:15:09 +02:00
Valery Sizov
a4fbe13fce [#243] – When user adds first key the add a key message should go away 2011-11-22 22:26:07 +02:00
Valery Sizov
540d0aa406 fixd key length 2011-11-22 21:56:22 +02:00
Dmitriy Zaporozhets
b56024100d lil style fixes 2011-11-22 19:57:25 +02:00
Dmitriy Zaporozhets
4451b8df8a 3 events on dashboard, fixed issue gl#250 2011-11-22 19:54:36 +02:00
gitlabhq
86829cae50 fixed min height for menu 2011-11-22 09:03:27 -05:00
gitlabhq
3f56202713 dashboard replaced [event] by tag 2011-11-22 08:33:42 -05:00
gitlabhq
78e6dc5fa5 #222 2011-11-22 08:26:53 -05:00
gitlabhq
b5d7fb5eed restyled user profile 2011-11-22 08:14:23 -05:00
gitlabhq
3f0d807955 file name overflow fixed 2011-11-22 07:50:47 -05:00
gitlabhq
a59b709021 file code view restyled 2011-11-22 06:59:20 -05:00
gitlabhq
31e51dd116 button common style + flash messages fix 2011-11-21 02:26:10 -05:00
gitlabhq
46bebac983 commit restyle 2011-11-21 02:16:10 -05:00
gitlabhq
3f35cccfbd ref controller refactored 2011-11-21 01:16:10 -05:00
Dmitriy Zaporozhets
4bf4efe712 decorators & tree model 2011-11-20 22:32:12 +02:00
Dmitriy Zaporozhets
6721ef01f4 fixed flash container 2011-11-20 20:30:00 +02:00
Alexander Randa
7c5e83c0c2 changing admin disign for userss update 2011-11-19 00:33:10 +03:00
Alexander Randa
84fc40f198 changing admin disign for projects update 2011-11-19 00:32:26 +03:00
Alexander Randa
bc591f929d admin button style update 2011-11-19 00:31:06 +03:00
Alexander Randa
22be0785bd changing admin disign for users finish 2011-11-18 23:55:13 +03:00
Alexander Randa
f950d7881c changing admin disign for projects finish 2011-11-18 23:54:56 +03:00
Alexander Randa
5488f17389 changet button disign 2011-11-18 23:54:06 +03:00
Alexander Randa
46d7ecacd7 table header align bugfix 2011-11-18 22:19:55 +03:00
Alexander Randa
0c19b1afd9 disabled empty notice 2011-11-18 22:10:07 +03:00
user
ed63d28e7a Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into admin-panel-disign 2011-11-18 21:31:56 +03:00
Saito
baa4fc8c17 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-18 20:58:25 +08:00
Saito
6bd9b90fb6 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-18 20:20:24 +08:00
Saito
4281704fb3 fix diff bug with utf-8 2011-11-18 20:16:59 +08:00
Saito
139c4c2f18 fix diff bug 2011-11-18 19:48:23 +08:00
gitlabhq
ccefc95e12 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-18 04:18:26 -05:00
Drew
91d5a906f9 Resolved issue #235 2011-11-18 01:52:13 -05:00
Drew
15016ae68d resolved issue 244 and updated test 2011-11-18 01:32:22 -05:00
Ricardo Rauch
2a874a00dc fixing aside on dashboard 2011-11-17 16:49:02 -03:00
Ricardo Rauch
c0dbebb11d fixing error messages 2011-11-17 16:30:57 -03:00
Alexander Randa
c3eac16fe9 update notice and show-info view 2011-11-17 01:19:00 +03:00
Alexander Randa
4dee4bdb57 change back button position when project creating 2011-11-17 00:22:18 +03:00
Alexander Randa
9987ec934c added 10px in bottom 2011-11-17 00:17:55 +03:00
Alexander Randa
459c9ba27d bugfix back button on page admin/project/new 2011-11-17 00:13:14 +03:00
Alexander Randa
930455f065 change the highlight color from pink to blue 2011-11-16 23:55:10 +03:00
Nihad Abbasov
c4a575b70b Merge pull request #105 from SaitoWu/annotate
annotate models
2011-11-16 09:50:05 -08:00
gitlabhq
c226558644 qfix broken css 2011-11-16 12:23:09 -05:00
gitlabhq
bb35ef2f60 fix branch/tag select 2011-11-16 12:19:18 -05:00
gitlabhq
aa02a3b757 fix projects page 2011-11-16 11:43:16 -05:00
Saito
7b5fd14515 annotate models 2011-11-16 16:32:35 +08:00
gitlabhq
af08ed6b66 refactoring 2011-11-16 08:38:53 +03:00
gitlabhq
f294b8d4c3 activity page cache 2011-11-15 10:47:24 -05:00
Nihad Abbasov
ed5e19a518 allow user to reset his private token 2011-11-15 17:08:20 +04:00
Dmitriy Zaporozhets
32ca0b8cae Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-15 11:09:59 +02:00
gitlabhq
12782adf03 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-15 04:09:13 -05:00
gitlabhq
6b9f221a27 perfomance fix 2011-11-15 04:09:07 -05:00
Nihad Abbasov
dd64b761c6 move non-app assets to vendor 2011-11-15 12:45:15 +04:00
Nihad Abbasov
368deb5992 clean up whitespace from project 2011-11-15 12:34:30 +04:00
Nihad Abbasov
415eddaf39 green specs 2011-11-15 12:13:59 +04:00
Nihad Abbasov
7b36b8d130 access project feeds via private token 2011-11-15 11:25:26 +04:00
Nihad Abbasov
003bf61258 add auth token for users 2011-11-15 11:08:05 +04:00
Nihad Abbasov
8d74123d61 Merge branch 'master' into features/feeds 2011-11-14 17:42:12 +04:00
Saito
e2b4fe3538 fix project new link 2011-11-14 16:15:26 +08:00
Valery Sizov
762946995e Merge remote-tracking branch 'origin/master' into network_graph
Conflicts:
	app/assets/stylesheets/projects.css.scss
	lib/commit_ext.rb
2011-11-13 15:57:34 +02:00
Valery Sizov
dc844f0138 Graph: small refactoring 2011-11-13 15:31:18 +02:00
Valery Sizov
c89682605f Graph: is done. v1 2011-11-13 15:12:52 +02:00
Valery Sizov
94690bd2c4 Graph: base implementation 2011-11-13 13:58:45 +02:00
Valery Sizov
6b66a766d1 Graph: build json 2011-11-13 00:30:51 +02:00
Dmitriy Zaporozhets
2f790001a0 project -> show refactor 2011-11-12 16:28:14 +02:00
Dmitriy Zaporozhets
8786aff25a project avtivity page 2011-11-12 16:19:34 +02:00
Dmitriy Zaporozhets
4dd5d9c8cc Issue #185 – Show branch name for commits on activities & dashboard pages 2011-11-12 15:18:56 +02:00
Dmitriy Zaporozhets
c1c64d985e css refactor 2011-11-12 14:45:32 +02:00
Dmitriy Zaporozhets
ef08872534 css refactor 2011-11-12 13:04:43 +02:00
Dmitriy Zaporozhets
60f4576d5d top panel -> search -> css 2011-11-12 12:50:25 +02:00
Dmitriy Zaporozhets
48a1e31010 snippet table restyle 2011-11-12 12:41:34 +02:00
Dmitriy Zaporozhets
9d91378980 Merge pull request #91 from lukasberns/master
Add support for custom SSH ports
2011-11-12 01:45:51 -08:00
lukasberns
a1fff682de Add support for custom SSH ports 2011-11-12 08:30:42 +09:00
Ricardo Rauch
d5da9d32b5 fixes css 2011-11-11 17:04:18 -03:00
gitlabhq
49b2fb24bc remove fluiod layout 2011-11-11 11:35:51 -05:00
gitlabhq
c092f3972a fix view mode selection 2011-11-11 11:04:32 -05:00
gitlabhq
97cf5659aa fixed layout as default 2011-11-11 10:57:16 -05:00
gitlabhq
03b9369007 fixed link to issue from project dashboard 2011-11-11 10:45:44 -05:00
Nihad Abbasov
f295ff84d9 create atom feed for issues 2011-11-11 13:29:58 +04:00
Dmitriy Zaporozhets
6f915d5a01 add fix code align 2011-11-11 10:28:06 +02:00
Nihad Abbasov
2b04c2a67f create atom feed for commits 2011-11-11 12:11:27 +04:00
Dmitriy Zaporozhets
a5058229e4 restored .git-url, truncate project name for thumb 2011-11-11 09:36:01 +02:00
Dmitriy Zaporozhets
22bb925a40 Merge pull request #88 from iamntz/master
small UI changes
2011-11-10 23:28:57 -08:00
Staicu Ionut
594451563c - added notification for users with no ssh key
- moved project urls into input fields to avoid text expanding out of the box (on very long url)
- removed extra markup for header menu arrow (:before ftw!)
- small style changes on url inputs
2011-11-11 08:13:43 +02:00
Ricardo Rauch
e5852d41cf code pre fix 2011-11-10 21:00:22 -03:00
Ricardo Rauch
c0a30b3a0c Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-10 20:42:18 -03:00
Ricardo Rauch
e2d0f42adf fixing buttons 2011-11-10 20:42:01 -03:00
Dmitriy Zaporozhets
d730e3ef8b refactoring project, commits controllers 2011-11-11 01:28:26 +02:00
Dmitriy Zaporozhets
dab072c1ab refactor code: repository.rb 2011-11-11 00:51:33 +02:00
Ricardo Rauch
99bd00158c fixing errors style 2011-11-10 19:42:34 -03:00
Ricardo Rauch
88466881b8 new layout for add project 2011-11-10 19:24:44 -03:00
Dmitriy Zaporozhets
60a9c051db removed br tag 2011-11-11 00:22:04 +02:00
Dmitriy Zaporozhets
4ecf17cf9a annotated 2011-11-11 00:08:20 +02:00
Ricardo Rauch
1155f2d1d2 fix css 2011-11-10 18:57:47 -03:00
Ricardo Rauch
56e449df50 fixing account box dropdown 2011-11-10 18:55:55 -03:00
Ricardo Rauch
ff0dc87e3d fixes css 2011-11-10 18:15:47 -03:00
Saito
f7756b8404 chmod -x style.scss 2011-11-10 16:24:11 +08:00
Dmitriy Zaporozhets
9a5f328313 notes should depends on user when destroy 2011-11-10 09:46:04 +02:00
Dmitriy Zaporozhets
eb96336de1 1. Set Helvetica as primary font; 2. removed tabs 2011-11-09 21:26:24 +02:00
Ariejan de Vroom
e608eacc4b Show commits as 'Commit' instead of 'Grit::Commit'
Conflicts:

	app/helpers/dashboard_helper.rb
2011-11-09 20:52:20 +02:00
Ariejan de Vroom
85468fb4ce Use secure.gravatar.com when running over SSL 2011-11-09 20:51:22 +02:00
Dmitriy Zaporozhets
8513526bfe Merge branch 'dev' 2011-11-09 20:31:52 +02:00
Nihad Abbasov
3f70316c5f fix elsif statement 2011-11-09 17:53:15 +04:00
gitlabhq
b78f658143 dashboard beautify 2011-11-09 06:37:01 -05:00
Dmitriy Zaporozhets
a44e329222 project dashboard updated 2011-11-09 01:56:10 +02:00
Aleksei Kvitinskii
1d85197b08 Merge branch 'issue-184' into dev
Conflicts:
	app/views/layouts/project.html.haml
	app/views/projects/_form.html.haml
2011-11-08 23:19:42 +02:00
Aleksei Kvitinskii
5b1634cd4b implemented cookie remember option for issue page filter 2011-11-08 23:02:57 +02:00
gitlabhq
49bced3a24 project form fixed 2011-11-08 12:23:13 -05:00
Aleksei Kvitinskii
1fa01cbcc9 fix typo 2011-11-08 00:02:50 +02:00
Dmitriy Zaporozhets
1c543bdfa8 restored sortable ability 2011-11-07 22:48:55 +02:00
Dmitriy Zaporozhets
32abaa33f8 Merge branch 'issues_restyle' into dev 2011-11-07 22:32:01 +02:00
Dmitriy Zaporozhets
67b9fa51dc fixed tests 2011-11-07 22:31:51 +02:00
Aleksei Kvitinskii
9e3915b259 fix typo in the template 2011-11-07 21:39:24 +02:00
Aleksei Kvitinskii
444b69ddc2 Merge branch 'dev' into issue-184
Conflicts:
	app/views/layouts/project.html.haml
2011-11-07 21:29:28 +02:00
Aleksei Kvitinskii
4a1b70f7b2 add tags to admin project form 2011-11-07 20:38:54 +02:00
Aleksei Kvitinskii
9054f64c53 correct padding in user, keys, password forms 2011-11-07 20:37:32 +02:00
Aleksei Kvitinskii
eb5fa8344e correct padding in issue form and in profile form 2011-11-07 20:21:42 +02:00
Aleksei Kvitinskii
af7bed2aa5 add tag links to project page 2011-11-07 19:48:58 +02:00
gitlabhq
60f083ad61 issues table header 2011-11-07 11:31:05 -05:00
gitlabhq
c07d3dfc04 issue restyle example 2011-11-07 10:55:16 -05:00
Aleksei Kvitinskii
3fe9f3ebe6 implemented cookie remember option for issue page filter 2011-11-07 14:12:46 +02:00
Aleksei Kvitinskii
060a2e2257 move tag path to the appropriate helper 2011-11-07 13:40:22 +02:00
Dmitriy Zaporozhets
06e916743e lil css style 2011-11-07 00:24:09 +02:00
Dmitriy Zaporozhets
7ac38b7a1e fixed duplicate on wall 2011-11-06 23:32:37 +02:00
Dmitriy Zaporozhets
63c2c2cc23 Merge branch 'dev' 2011-11-06 22:53:54 +02:00
Dmitriy Zaporozhets
e29a25662d fixed 1click repo url selection 2011-11-06 22:53:36 +02:00
Dmitriy Zaporozhets
b4868a8972 Improved commit author detection 2011-11-06 22:38:08 +02:00
Dmitriy Zaporozhets
f87f0201f0 link to author on tree view item 2011-11-06 22:21:48 +02:00
Aleksei Kvitinskii
1d1b5186c3 fix small bug in top menu (buttons change height on press in chrome) 2011-11-06 21:43:34 +02:00
Aleksei Kvitinskii
526752479d correct html on project page 2011-11-06 20:48:57 +02:00
Aleksei Kvitinskii
81847a9335 Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-11-06 19:21:51 +02:00
Dmitriy Zaporozhets
671e261e90 lil design changes 2011-11-06 15:52:23 +02:00
Aleksei Kvitinskii
072b2d5de8 Implement tags cloud support for projects 2011-11-05 22:22:26 +02:00
Aleksei Kvitinskii
62112dc0c7 add tags to project list 2011-11-05 22:16:13 +02:00
Aleksei Kvitinskii
6e08b5cc85 create tags page and made tag filter for projects 2011-11-05 21:00:05 +02:00
Dmitriy Zaporozhets
0499759204 issues & fixed layout 2011-11-05 15:31:54 +02:00
Aleksei Kvitinskii
1e5aa0efff add tags autocomplete 2011-11-05 14:57:40 +02:00
Dmitriy Zaporozhets
31a9d6531d commits notes under diff. tab removed 2011-11-05 14:45:52 +02:00
Dmitriy Zaporozhets
5eecbfdb10 commit paging fixes 2011-11-05 14:26:06 +02:00
Dmitriy Zaporozhets
586c53ea05 fixed notes loading/paging 2011-11-05 13:59:43 +02:00
Aleksei Kvitinskii
6323cdda68 Merge branch 'dev' into issue-184 2011-11-05 08:15:31 +02:00
gitlabhq
0b0e0225ad css fixes 2011-11-04 12:20:52 -04:00
gitlabhq
2ed5211dad fixes 2011-11-04 11:59:00 -04:00
gitlabhq
8a23682fc5 refactored too 2011-11-04 11:46:51 -04:00
gitlabhq
ca1e3d0579 wall login in progress 2011-11-04 09:37:38 -04:00