Commit graph

1889 commits

Author SHA1 Message Date
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
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
Aleksei Kvitinskii 6977150f04 integrate tags plugins 2011-11-04 09:44:43 +02:00
Aleksei Kvitinskii 5d526717d6 increase max size of public to 1600 bytes 2011-11-04 01:16:12 +02:00
Dmitriy Zaporozhets 287c3c167b Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-11-04 00:37:47 +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
gitlabhq 5f900772c2 new favicon 2011-11-03 10:36:02 -04:00
gitlabhq a767a86ce8 Merge branch 'dev' 2011-11-03 10:18:32 -04:00
gitlabhq 3abd977822 fixed error with ascii error for dashboard 2011-11-03 06:56:26 -04:00
gitlabhq 020e1a8eee dashboard 2011-11-02 22:14:03 +02:00
gitlabhq 83c1194d52 Merge branch 'dev' into user_dashboard 2011-11-02 20:59:06 +02:00
gitlabhq 5fb1b9ffe3 view refactoring 2011-11-02 11:21:17 -04:00
gitlabhq a6fa80529a body class 2011-11-02 00:19:29 +02:00
gitlabhq e9b22a2def Merge branch 'dev' into user_dashboard
Conflicts:
	app/views/layouts/_head_panel.html.erb
2011-11-01 22:56:58 +02:00
gitlabhq 5e12f10c14 fixes 2011-11-01 22:51:20 +02:00
gitlabhq 82d16ccfd1 commits + tree in progress 2011-11-01 22:11:24 +02:00
gitlabhq babd0557cb Merge branch 'dev' into new_layout
Conflicts:
	app/assets/stylesheets/projects.css.scss
2011-11-01 20:29:46 +02:00
gitlabhq e8d10b3217 issues fix layout 2011-11-01 13:17:36 +02:00
gitlabhq 84397ce88c commits page 2011-11-01 12:48:26 +02:00
gitlabhq 0903932320 updated 2011-11-01 11:22:16 +02:00
gitlabhq d405292388 project page fixed 2011-11-01 11:00:59 +02:00
gitlabhq 485c5199b7 user dashboard 2011-10-31 22:57:16 +02:00
Nihad Abbasov 267bd6068c Merge branch 'issue-101' into dev 2011-10-31 23:37:09 +04:00
Nihad Abbasov 11b70c97e3 fix issue notification properly 2011-10-31 23:21:28 +04:00
Nihad Abbasov 3e95a6d73b make commit messages multiline 2011-10-31 17:34:22 +04:00
Nihad Abbasov 43c1039957 don't send notification to issue creator 2011-10-31 16:49:38 +04:00
gitlabhq 9bf39477de commit 2011-10-31 13:30:53 +03:00
gitlabhq fb33ccd87f Merge branch 'dev' into new_layout 2011-10-31 13:11:46 +03:00
gitlabhq 3becd06423 icons & css 2011-10-31 13:11:22 +03:00
Nihad Abbasov ded7d08d70 Merge branch 'refs/heads/markdown_notes' into dev 2011-10-31 13:49:33 +04:00
Nihad Abbasov 31280cd4cb fix markdown truncation on dashboard 2011-10-31 13:47:10 +04:00
Nihad Abbasov 406076731e Merge branch 'refs/heads/markdown_notes' into dev 2011-10-30 19:49:09 +04:00
Nihad Abbasov 1f3323f908 use helper to markdown text 2011-10-30 17:41:57 +04:00
gitlabhq 0dc5364aec reset pwd 2011-10-28 18:29:52 +03:00
gitlabhq 5d879a0643 signin page 2011-10-28 18:25:00 +03:00
gitlabhq 487ae906a9 project layout 2011-10-28 15:07:58 +03:00
gitlabhq 1ffb4b98c0 new design/layout started. projects page 2011-10-28 14:41:39 +03:00
gitlabhq ae47d69281 Merge branch 'dev' 2011-10-28 12:33:07 +03:00
gitlabhq 3fa770dd10 Merge branch 'new_issue' into dev 2011-10-28 12:26:25 +03:00
gitlabhq a017181339 new issue format 2011-10-28 12:22:09 +03:00
VSizov fb40d27d1e remove spaces 2011-10-28 11:34:30 +03:00
Nihad Abbasov 6c7706eb17 process notes w/ rdiscount 2011-10-28 00:57:10 +05:00
Nihad Abbasov 89fa800e28 Merge branch 'refs/heads/snippets_expiration' into dev
Conflicts:
	db/schema.rb
2011-10-28 00:28:37 +05:00
Nihad Abbasov b6cdd1c819 test expired snippets 2011-10-28 00:25:50 +05:00
gitlabhq 56d9761844 moving out of body 2011-10-27 18:46:30 +03:00
gitlabhq 2258db66c2 issue can be edit from show page 2011-10-27 18:18:50 +03:00
gitlabhq 9611a27e0c note as text 2011-10-27 17:33:20 +03:00
gitlabhq 5fe736ab28 little fix 2011-10-27 17:08:40 +03:00
gitlabhq e41bc4dd50 #173 2011-10-27 16:50:35 +03:00
DZ 84457708d8 Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev 2011-10-27 16:47:39 +03:00
gitlabhq d64f23e294 code cleaning 2011-10-27 16:44:29 +03:00
Nihad Abbasov 00613d0d50 Merge branch 'refs/heads/assets-refactoring' into dev 2011-10-27 14:51:05 +05:00
Nihad Abbasov be364d1004 move jquery ui images to vendor directory 2011-10-27 14:47:56 +05:00
Nihad Abbasov 2801589c41 remove jquery ui css from application layout. it's already included in assets 2011-10-27 14:47:06 +05:00
Nihad Abbasov 325b84545c don't count expired snippets 2011-10-27 13:12:12 +05:00
Nihad Abbasov 000c032482 display recent snippets at top 2011-10-27 12:14:50 +05:00
Nihad Abbasov 5e584ee626 refactor lifetime_select helper 2011-10-27 12:11:42 +05:00
Nihad Abbasov 8e1e17763f implement snippets lifetime 2011-10-27 11:46:21 +05:00
Nihad Abbasov f1e6d9be90 Merge branch 'assets-refactoring' into dev
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/index.html.haml
2011-10-26 23:35:17 +05:00
Nihad Abbasov e0f4a37f3d update project's dashboard every 5 minutes 2011-10-26 23:22:42 +05:00
Nihad Abbasov f1e25f2563 move lib assets to vendor directory 2011-10-26 22:42:24 +05:00
Nihad Abbasov 3228b62755 fix repo url selecting on click 2011-10-26 22:17:46 +05:00
Nihad Abbasov d62200cad4 clean-up code
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
2011-10-26 18:46:25 +05:00
gitlabhq 1beb84161c search field style 2011-10-26 07:44:02 +03:00
gitlabhq fb01f45890 issue search styleup 2011-10-26 07:34:02 +03:00
Adam Leonard 92f6de0370 If terms are removed show all results for current status 2011-10-25 20:15:11 -04:00
Adam Leonard 0955863489 Merge branch 'master' of dev.gitlabhq.com:gitlabhq into feature/issues_search 2011-10-25 18:34:59 -04:00
gitlabhq f6a67fbad5 Issue #87 2011-10-25 21:04:31 +03:00
gitlabhq 9afee5ad52 Add critical status to issues 2011-10-25 07:34:02 +03:00
gitlabhq afe98ae74a Issue #149 fixed 2011-10-25 07:32:02 +03:00
gitlabhq 5baa5fad0a Issue #149 2011-10-24 22:38:03 +03:00
Sairam Kunala 61e6751ea6 bug fix: history in commit history not working as expected for tags and branches 2011-10-23 15:10:33 +05:30
gitlabhq 00290b9214 test cov 2011-10-22 14:08:03 +03:00
gitlabhq 72d15cc7ca error fields highlight 2011-10-22 14:08:03 +03:00
gitlabhq 1a9531c9a4 fix #140, commit lil refactor 2011-10-22 14:08:03 +03:00
gitlabhq 29e11d1461 link to file for commit diff 2011-10-22 14:08:03 +03:00
gitlabhq 9fa4df16ec now you can view comrade profile info #134 2011-10-22 14:08:03 +03:00
gitlabhq b3279b9b51 moved from albino -> pygments.rb 2011-10-22 14:08:03 +03:00
gitlabhq d49645a013 fixed wall --all option 2011-10-22 14:08:03 +03:00
gitlabhq 24f04c0a61 recent radio button 2011-10-22 14:08:02 +03:00
gitlabhq c66c30c821 Add check to ensure that a team member has atleast one Access Role selected 2011-10-22 14:08:02 +03:00
Adam Leonard 5b284f6adf Add ability to Search issues 2011-10-22 00:06:38 -04:00
Aleksei Kvitinskii dde2879589 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-10-21 16:00:27 +03:00
Aleksei Kvitinskii cee932500c now you can view comrade profile info #134 2011-10-21 15:56:37 +03:00
gitlabhq 1477a6c8aa moved from albino -> pygments.rb 2011-10-21 15:35:42 +03:00
gitlabhq f280819189 fixed wall --all option 2011-10-21 14:25:42 +03:00
gitlabhq a07923a549 recent radio button 2011-10-21 14:03:34 +03:00
gitlabhq c463eeb090 refactoring 2011-10-20 22:00:00 +03:00
gitlabhq 48924dfeea Wall redesign 2011-10-20 19:21:58 +03:00
Aleksei Kvitinskii 59704f481e extended user profile with social fields 2011-10-20 01:34:05 +03:00
gitlabhq 9ad444f02e dashboard updated, links from project to dasdhboard 2011-10-19 20:41:14 +03:00
gitlabhq 69e0ea6265 dashboard 2011-10-19 16:25:32 +03:00
Zevs 85265b1bac #40 max key length 2011-10-18 23:22:04 +03:00
gitlabhq f8b5e5f78e dashboard 2011-10-18 17:57:01 +03:00
gitlabhq 1a03b17ab5 dsaboard 2011-10-18 17:44:43 +03:00
gitlabhq dbd69d1d0e dashboard lite version 2011-10-18 15:02:05 +03:00
gitlabhq b0f216ba17 fix sort 2011-10-18 14:55:51 +03:00
gitlabhq fc177a30f7 commit time sort 2011-10-18 14:38:57 +03:00
gitlabhq f8e1766714 lost file 2011-10-18 14:34:48 +03:00
gitlabhq c29b49de66 project dashboard 2011-10-18 14:33:30 +03:00
gitlabhq 5a5845e490 few fixes 2011-10-18 11:21:44 +03:00
gitlabhq 2daa6161fd prevent double note submit 2011-10-17 20:05:47 +03:00
gitlabhq 74a89d9ed6 ajax notes load 2011-10-17 19:48:10 +03:00
gitlabhq d03f2687c5 annotated 2011-10-17 18:31:21 +03:00
gitlabhq 783ca89796 security improved 2011-10-17 13:39:03 +03:00
gitlabhq 8c88924606 fix #132 2011-10-17 01:14:48 +03:00
gitlabhq bcf55312f7 fixed #132 2011-10-17 00:30:48 +03:00
gitlabhq 9265de3d25 snippets are ready 2011-10-17 00:07:10 +03:00
gitlabhq 526ad466c8 fix issue sorting 2011-10-15 21:08:38 +03:00
gitlabhq 99777cab2a Merge branch 'issue_im'
Conflicts:
	config/initializers/rails_footnotes.rb
2011-10-15 20:54:39 +03:00
VSizov e6bba9be4f icon for handler of sortable 2011-10-15 20:41:38 +03:00
gitlabhq c37492b5dc profile in header 2011-10-15 20:37:42 +03:00
VSizov df016465cd ability for sortable 2011-10-15 20:13:51 +03:00
VSizov dd833d28ad Sortable issues 2011-10-15 19:56:53 +03:00
gitlabhq 876ebbd9ad issue #89 2011-10-15 19:46:27 +03:00
gitlabhq 57baa49bc3 project path & code regexp validation 2011-10-15 19:30:56 +03:00
gitlabhq 29158ea38c Issue #123 2011-10-15 18:57:27 +03:00
gitlabhq a9d224d36d issue #124 2011-10-15 18:51:58 +03:00
gitlabhq 3208b6747d links for admin 2011-10-15 00:12:02 +03:00
gitlabhq 53421e060a clean controllers 2011-10-15 00:05:41 +03:00
gitlabhq 5f8255ac67 Fixed: invalid browse code for commit. Perfomance test added 2011-10-14 22:43:25 +03:00
gitlabhq 153f6cd86b refactoring + remove unnecessary feature 2011-10-14 19:30:31 +03:00
gitlabhq 2d577cae9d branch/tag remember - to session instead of cookie 2011-10-14 18:33:05 +03:00
gitlabhq fc34fc86c6 branch/tag memorization 2011-10-14 18:08:25 +03:00
gitlabhq da0b50f8ec fix fuckin merge 2011-10-14 16:42:10 +03:00
gitlabhq 2cd52b492a install & update 2011-10-14 16:40:41 +03:00
gitlabhq a18924e954 issue #103 2011-10-14 15:22:07 +03:00
gitlabhq 0f6ebcb694 v1.0 2011-10-13 04:00:00 +03:00
gitlabhq eefe826f83 project tile view 2011-10-12 16:19:14 +03:00
gitlabhq ea4ded6e54 css fix 2011-10-10 00:23:33 +03:00
gitlabhq ec9e54ea94 gitosis error handle 2011-10-10 00:15:28 +03:00
gitlabhq 035196e7a8 test fix 2011-10-09 22:36:57 +03:00
Valera Sizov 67f0c62d07 Issue #83 - Project limit 2011-10-09 11:15:01 -07:00
Valera Sizov 9840102651 Issue #82 - Add owner to project 2011-10-09 04:05:31 -07:00
gitlabhq 9ba1224867 init commit 2011-10-09 00:36:38 +03:00