Commit graph

348 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 4df4b38185 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-12-12 19:23:01 +02:00
Dmitriy Zaporozhets 5bc97fbd3f middle panel 2011-12-12 19:22:01 +02:00
Saito 7b7549bea6 tree view readme support 2011-12-13 00:42:07 +08:00
Dmitriy Zaporozhets f34b1be281 dashboard tabs 2011-12-12 09:38:37 +02:00
Dmitriy Zaporozhets cd779e56e1 dashboard v1 2011-12-08 22:17:53 +02:00
Dmitriy Zaporozhets 4107f2cc2e mixed dashboard - first try 2011-12-08 21:17:53 +02:00
Dmitriy Zaporozhets 8e0126e9ec Merge branch 'issue_dashboard' into improved_dashboard 2011-12-08 15:05:01 +02:00
Ariejan de Vroom 0ffed126e2 fixed tab highlighting for issues 2011-12-08 01:13:11 +01:00
Ariejan de Vroom e4b1f38c27 Added merge request dashboard, showing all merge requests assigned to
you across projects.
2011-12-08 01:07:02 +01:00
Dmitriy Zaporozhets 2677bc3acb network graph header, fixed test 2011-12-08 01:45:36 +02:00
Dmitriy Zaporozhets 23a1ba7362 Fix different styles/button positions 2011-12-08 01:35:57 +02:00
Ariejan de Vroom f512418b27 Added "Issues" dashboard
This shows issues assigned to you, across all your projects, in one
place.

References #173
2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets c2789dae34 fix project creation 2011-12-08 00:22:46 +02:00
Dmitriy Zaporozhets d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets 1b8f082061 new access rights implemented 2011-12-07 10:04:57 +02:00
Dmitriy Zaporozhets cb021e5831 repo & project access separated. critical gitolite bugfix 2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets 1bf775d55d fixed commits links from tree view 2011-12-05 22:20:46 +02:00
Dmitriy Zaporozhets 9e089efe5a gitolite & gitosis support 2011-12-04 01:44:59 +02:00
gitlabhq 6a2c7d80cb fixed image preview 2011-12-01 09:16:53 -05:00
Saito 42ba6d04f8 refactor each_line detect to detect all diff file 2011-12-01 15:59:49 +08:00
Dmitriy Zaporozhets c2cfc52e44 fix merge request diff 2011-12-01 01:51:16 +02:00
Dmitriy Zaporozhets 570f63daaf line links for commit diff, css fixed for line diff 2011-12-01 01:51:04 +02:00
Dmitriy Zaporozhets b60b7b2e2b restyle commit show page pt1 2011-12-01 00:24:28 +02:00
Dmitriy Zaporozhets 1ce55d161a new team memeber selectbox replaced 2011-11-30 23:41:00 +02:00
Dmitriy Zaporozhets 6686834c8d fix spelling 2011-11-30 21:24:50 +02:00
Dmitriy Zaporozhets c34092ebdc fixed commit date 2011-11-30 21:23:17 +02:00
Saito 12c01d7401 fix encode bugs on diff not utf-8 encode's code 2011-11-30 15:05:37 +08:00
Dmitriy Zaporozhets f114a4f349 css fixes 2011-11-29 20:10:48 +02:00
Dmitriy Zaporozhets 958497fecb fix issue count 2011-11-28 23:34:24 +02:00
Dmitriy Zaporozhets 017dfaee65 Issue sidebar counter should show count of assigned to you 2011-11-28 23:29:46 +02:00
Dmitriy Zaporozhets bfb0bdbe72 fixed link names 2011-11-28 23:14:43 +02:00
Dmitriy Zaporozhets 22ac0cc7eb Merge branch 'feature/merge_requests' 2011-11-28 22:43:42 +02:00
Dmitriy Zaporozhets 8803fbb593 merge request: notes, diffs, commits 2011-11-28 22:16:57 +02:00
Dmitriy Zaporozhets 6b941cf92c merge request list 2011-11-28 20:30:35 +02:00
Saito 46cbe54189 fix the issue on github #157.
directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.
2011-11-28 17:46:41 +08:00
Dmitriy Zaporozhets 6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets a031813887 Commit, network graph refactoring 2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets 32ebd438c2 Issue #263 - dont display ajax loader on commit page if commits < limit 2011-11-27 10:36:28 +02:00
Dmitriy Zaporozhets 3aee553523 colorscheme for code view 2011-11-26 01:42:42 +02:00
Dmitriy Zaporozhets 0accbaae15 snippets restyle 2011-11-26 00:19:14 +02:00
Dmitriy Zaporozhets a9928eae48 fixed sidebar zero count 2011-11-25 23:44:02 +02:00
Dmitriy Zaporozhets 15fa14f1d6 get rid off modal window for issue create/edit 2011-11-25 23:40:12 +02:00
Dmitriy Zaporozhets 16bd018f08 clickable news feed on dashboard 2011-11-25 22:26:44 +02:00
Dmitriy Zaporozhets 8209a2ff49 cleaning side menu 2011-11-25 21:56:05 +02:00
gitlabhq a8e4fb6144 Merge branch 'feature/issue_with_branch' 2011-11-25 06:13:15 -05:00
gitlabhq 4aad057f23 issues style fixed 2011-11-25 05:49:28 -05:00
gitlabhq 4e55cc67f5 Issue show page restyled 2011-11-25 05:41:30 -05:00
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 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
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 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
Dmitriy Zaporozhets 4bf4efe712 decorators & tree model 2011-11-20 22:32:12 +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 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 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 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
Drew 91d5a906f9 Resolved issue #235 2011-11-18 01:52:13 -05: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 459c9ba27d bugfix back button on page admin/project/new 2011-11-17 00:13:14 +03: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
gitlabhq af08ed6b66 refactoring 2011-11-16 08:38:53 +03: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
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 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 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 48a1e31010 snippet table restyle 2011-11-12 12:41:34 +02: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
Nihad Abbasov f295ff84d9 create atom feed for issues 2011-11-11 13:29:58 +04: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
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 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 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 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 526752479d correct html on project page 2011-11-06 20:48:57 +02:00
Aleksei Kvitinskii 98fcd3b38a correct html on project page 2011-11-06 20:48:21 +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
Aleksei Kvitinskii b946da4469 added tags to form 2011-11-04 10:11:14 +02:00
Dmitriy Zaporozhets 687290a00d fixed brach switch 2011-11-04 09:46:58 +02:00
Dmitriy Zaporozhets a9639776d7 fixed/fluid layout switch 2011-11-04 00:37:02 +02:00
gitlabhq 3ba392b3cb new ref switch 2011-11-03 12:28:33 -04:00