deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2754 commits 6 branches 43 tags 25 MiB
Commit graph

1063 commits

Author SHA1 Message Date
Riyad Preukschas 37e579ce10 Redo the auto-completion JS for notes 2012-10-09 14:48:35 +02:00
Riyad Preukschas 3adfbe3e81 Mark inputs for notes with GFM capabilities 2012-10-09 14:48:20 +02:00
randx ce1b742b1e Group: new link on dashboard if admin. Fixed people count 2012-10-09 09:46:20 +03:00
Dmitriy Zaporozhets 26045d7a2c Merge pull request #1596 from riyad/fix-messages-for-deleted-things 
Fix messages for deleted things on dashboard
 2012-10-08 22:27:25 -07:00
Valeriy Sizov a9cce9358a Merge pull request #1627 from tsigo/tree_performance 
Tree performance improvements
 2012-10-08 05:36:31 -07:00
Dmitriy Zaporozhets 624abdfc72 Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed 
Conflicts:
	app/decorators/event_decorator.rb
 2012-10-08 13:52:07 +03:00
Dmitriy Zaporozhets 5501955d26 Merge pull request #1636 from dosire/consistent_issue_type_order 
Reversed order of progress indication so that the text matches the progress bar.
 2012-10-07 01:00:38 -07:00
Aaron Stone 7c2e67c660 Tiny fix to the add/edit groups form path field 2012-10-05 23:46:15 -07:00
joseph Borremans 82425cf358 reversed order of progress indication for visual harmony so that text matches the progress bar 2012-10-05 17:48:52 +02:00
Alex Leutgöb 987e351de7 Escape html entities in commit messages 2012-10-04 10:06:17 +02:00
Dmitriy Zaporozhets d88332709c Fixed group issues/mr. Also speedup project list of admin area 2012-10-04 10:51:35 +03:00
Robert Speicher 388d72e6bf Add render_tree helper; simplify (speed up) tree_icon 2012-10-03 19:39:27 -04:00
Robert Speicher a8fad4ff9c Remove locals from tree/submodule_item, use "object" instead 2012-10-03 19:39:27 -04:00
Robert Speicher 37c3474f68 Tree.init() JS is no longer required 2012-10-03 19:39:27 -04:00
Robert Speicher 96b4acf5e7 Remove locals from tree/tree_file and just use "object" instead 2012-10-03 19:39:27 -04:00
randx 4f7bd58307 Bigger fonts for groups box 2012-10-03 19:51:14 +03:00
Dmitriy Zaporozhets f963d37408 Merge pull request #1592 from jouve/devise_layout 
make devise controllers use devise layout
 2012-10-03 07:06:08 -07:00
Valery Sizov 9e80d2d4f7 Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq 2012-10-03 12:17:48 +00:00
Dmitriy Zaporozhets 8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
Robert Speicher 38ca52f33b Use branches.length and tags.length instead of [whatever]_count 2012-10-02 18:56:57 -04:00
randx 010ac2b17f Added back link. cleanup group show page 2012-10-02 22:08:30 +03:00
randx 1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets f9eda9b33a Group filtering on dashboard 2012-10-02 19:37:53 +03:00
Dmitriy Zaporozhets d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Riyad Preukschas 93bc1ff108 Merge branch 'master' into fix-messages-for-deleted-things 2012-10-02 14:04:34 +02:00
Dmitriy Zaporozhets b82cb2630c Use class instead id for css styles 2012-10-02 10:26:24 +03:00
Dmitriy Zaporozhets 69751aac32 Refactoring event views 2012-10-01 16:58:13 +03:00
Dmitriy Zaporozhets 663dd6fad6 Refactored events output. Added links to authors of events 2012-10-01 16:39:19 +03:00
Riyad Preukschas f5a62835bb Fix completion for per line forms 2012-09-30 12:07:45 +02:00
Riyad Preukschas 6135eeaa3e Don't link to removed ref 2012-09-30 00:53:21 +02:00
Cyril 236fd1e63b all devise controller use devise layout 2012-09-29 13:06:53 +02:00
Dmitriy Zaporozhets a79eb84289 commit show page styled a bit 2012-09-28 16:05:54 +03:00
Dmitriy Zaporozhets 68f4b59738 Merge pull request #1569 from jouve/simplify_controllers2 
Simplify controllers and layout handling
 2012-09-27 12:53:01 -07:00
Cyril be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
randx 308dfc36b8 Fix back button for tree navigation 2012-09-27 19:38:52 +03:00
randx afecb250a4 Dont show compare link if only one commit in push 2012-09-27 17:13:26 +03:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
 2012-09-27 12:25:52 +02:00
Dmitriy Zaporozhets a8870e87e4 Fix blame markup & breadcrubs for commits 2012-09-27 11:58:41 +03:00
Dmitriy Zaporozhets beb324c1c6 Fixed updir method. Fixed breadcrumbs for commits 2012-09-27 09:49:00 +03:00
Robert Speicher d8f7748dea Remove app_menu and project_menu partials 
Now it's consistent across layouts where their main menus are.
 2012-09-26 17:00:52 -04:00
Robert Speicher 36f68140d1 Replace various "active tab" checks with nav_link 
Also remove now-unused tab_class helper
 2012-09-26 16:38:28 -04:00
Robert Speicher 275db3c522 Fix paths in commits/_head 2012-09-26 16:32:25 -04:00
Robert Speicher 0887dda8e4 Use current ref for Files and Commits if available 
Closes #1452
 2012-09-26 16:32:25 -04:00
Robert Speicher b62d6a1fe2 Remove commit_tab_class helper 2012-09-26 16:32:25 -04:00
Robert Speicher 86a7864dc7 Fix various links 2012-09-26 16:32:25 -04:00
Robert Speicher b462a13387 Compare views and cleanup 
- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial
 2012-09-26 16:32:24 -04:00
Robert Speicher 8fe63dab52 Use current_controller? in layouts/_head partial 2012-09-26 16:32:24 -04:00
Robert Speicher 51c1e49900 Change active tab and nav class to "active" 
The main nav used active, the sub nav used current. This normalizes it.
 2012-09-26 16:32:24 -04:00
Robert Speicher 545dc7e47d Fix atom feed links 2012-09-26 16:32:23 -04:00
Robert Speicher 1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher 99d391332f Add a "patch" MIME type, and render it like a normal view in Commit#show 2012-09-26 16:32:23 -04:00
Robert Speicher 3574826920 Use Commits#show instead of Commits#index 
Takes tree-ish + path as ID
 2012-09-26 16:32:22 -04:00
Robert Speicher 169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher 398ba6f1bb DRY up Blame, Blob and Tree controllers 2012-09-26 16:32:22 -04:00
Robert Speicher 576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher 39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher 94af622c87 Move refs/blame view to blame/show 2012-09-26 16:32:21 -04:00
Robert Speicher 339dfa32b8 Fix ref_switcher path 2012-09-26 16:32:21 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Robert Speicher 6ddb35bd5e Move tree-related views from refs to trees 2012-09-26 16:32:21 -04:00
Robert Speicher b389247c02 Use Commit#show instead of Commits#show to view a single commit 
Commits#show (plural) is going to be for showing commit history on a
specific path.
 2012-09-26 16:32:21 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
randx 0261b0c64c Project activity inifinite scroll paging 2012-09-26 21:01:54 +03:00
Dmitriy Zaporozhets 9270b6c3c7 Fix milestone calendar, Removed unnecessary selects from admin 2012-09-26 16:49:20 +03:00
Nihad Abbasov 6df515a56d add auto-completion for +1, -1 emoji 2012-09-25 04:56:21 -07:00
Dmitriy Zaporozhets c3efcf7a62 Pollished push event 2012-09-25 13:15:06 +03:00
Alex Leutgöb 0b8e956f32 Add a more verbose dashboard event feed 
- Add project name to event title
- Push: Entry links to single commit or commits overview depending on number of pushed commits
- Push: Display first 15 commits with commit message and author and link to single commit
- Issues: Display issue description
 2012-09-24 15:12:44 +02:00
Dmitriy Zaporozhets 8ec956421c Merge pull request #1539 from NARKOZ/front-end 
auto-complete for mentions in notes
 2012-09-24 06:02:34 -07:00
Dmitriy Zaporozhets 6667f3dbf9 Colored labels for events 2012-09-24 13:33:51 +03:00
Dmitriy Zaporozhets d23022c6f6 Working on dashboard restyle and events refactoring 2012-09-24 12:32:51 +03:00
Nihad Abbasov 9c75fcbef1 auto complete team member mentions 2012-09-23 09:52:01 -07:00
Robert Speicher ad3eefdcb8 Minor grammar change 
[ci skip]
 2012-09-22 17:06:30 -04:00
Nihad Abbasov 4162566e11 separate project repositories API docs 2012-09-21 05:03:50 -07:00
Nihad Abbasov 1304331589 remove commits API section from help 2012-09-21 05:00:20 -07:00
Dmitriy Zaporozhets 10d3a30b25 APi for commits. Better api docs 2012-09-21 13:22:30 +03:00
Dmitriy Zaporozhets 4cc169d3ca Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty 2012-09-21 11:22:53 +03:00
Nihad Abbasov 81aeac46d6 update help section with session API docs 2012-09-20 08:51:26 -07:00
Dmitriy Zaporozhets 0e524aaea1 Added workaround for github-markup issue with rendering markdown 2012-09-20 13:00:18 +03:00
Robert Speicher ba72c6f683 Escape text passed directly to gfm 2012-09-19 20:21:12 -04:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04:00
Dmitriy Zaporozhets bf625b7c92 polishing UI a bit. Added footer links for dashboard 2012-09-19 09:14:07 +03:00
Dmitriy Zaporozhets 64e76a87aa Notes votes: use icons instead of borders. Removed unnecessary padding 2012-09-18 09:17:55 +03:00
Dmitriy Zaporozhets 2aafd7cf4e Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes 2012-09-18 08:56:54 +03:00
Dmitriy Zaporozhets 249cb19d96 Fix project update. Make slim form only for reversed comments 2012-09-18 08:54:17 +03:00
Dmitriy Zaporozhets b5442eb564 Merge pull request #1479 from tsigo/ref_switch 
Extract ref switcher into a partial
 2012-09-17 00:53:30 -07:00
Robert Speicher 465e40d3a6 Extract ref switcher into a partial 
Also moves onchange JS to projects.js.coffee
 2012-09-16 12:07:57 -04:00
Robert Speicher 4247ccd340 Remove unused project/_refs partial 2012-09-16 11:53:36 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Riyad Preukschas b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00
randx 348def0344 Init mr comments when naviagate via ajax to diff 2012-09-15 09:58:16 +03:00
randx 9159be3a50 Fix MR diff comments. Fix wiki comments loading error 2012-09-15 09:49:21 +03:00
randx caeb65b189 Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order 2012-09-15 01:02:58 +03:00
Riyad Preukschas 07eec9c66a Update Notes JS for reversed notes 2012-09-14 21:41:57 +02:00
Riyad Preukschas 7563abbe49 Add 'notes/reversed_notes_with_form' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas e1ca155c95 Extract 'notes/per_line_notes_with_reply' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas a3dbd99068 Extract 'notes/per_line_note_link' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas c6d71b7b8e Rename 'notes/per_line_show' partial to 'notes/per_line_note' 2012-09-14 21:41:57 +02:00
Riyad Preukschas dd1b3177c9 Renamed 'notes/notes_list' partial to 'notes/notes' 2012-09-14 21:41:57 +02:00
Riyad Preukschas 4fc66ead4f Rename 'notes/show' partial to 'notes/note' 2012-09-14 21:41:57 +02:00