Commit graph

1099 commits

Author SHA1 Message Date
Dmitriy Zaporozhets e8d6c3c1b6 Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency
Refactor tree views and improve consistency
2012-10-15 23:33:49 -07:00
Riyad Preukschas 866b9f6d91 Make history link for trees look like action links for blobs 2012-10-16 00:57:15 +02:00
Riyad Preukschas 763022d698 Remove redundant branch labels from MR form
Fixes #1525
2012-10-16 00:46:48 +02:00
Riyad Preukschas d40d2dd809 Fix offered links in tree/blob_actions partial 2012-10-15 23:42:08 +02:00
Riyad Preukschas b80a019598 Use tree/blob_actions partial for blame view and fix file name encoding 2012-10-15 23:40:56 +02:00
Riyad Preukschas 3304262c3d Display more accurate file size in tree/blob/download partial 2012-10-15 23:40:21 +02:00
Riyad Preukschas d96a807db7 Display file size instead of mode in tree/blob partial 2012-10-15 23:40:18 +02:00
Riyad Preukschas d060856044 Extract out tree/blob/* partials 2012-10-15 23:40:06 +02:00
Riyad Preukschas 1f4d8eac24 Extract tree/readme partial 2012-10-15 23:40:02 +02:00
Riyad Preukschas 5cff72ad1e Extract tree/blob_actions partial 2012-10-15 23:39:49 +02:00
Riyad Preukschas 2f05ab1491 Rename tree/tree_file partial to tree/blob 2012-10-15 23:38:35 +02:00
Dmitriy Zaporozhets e84d90c1e7 Merge pull request #1692 from riyad/saner-note-methods
Small Note code cleanup
2012-10-15 10:11:00 -07:00
randx bd5dbe14e4 Merge branch 'web_editor' 2012-10-15 19:52:10 +03:00
randx 809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Riyad Preukschas e26acd52b2 Fix link to wiki page in wiki comment notification 2012-10-14 17:12:38 +02:00
Riyad Preukschas b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Valeriy Sizov 2a78ae60eb WebEditor: commit message is required now 2012-10-12 20:07:24 +03:00
Valeriy Sizov 42bdfd021b WebEditor: base implementation 2012-10-12 20:07:24 +03:00
Valeriy Sizov e53b47b447 WebEditor: sceleton 2012-10-12 20:07:24 +03:00
Dmitriy Zaporozhets 02c83f122a Design improved 2012-10-12 20:07:24 +03:00
Valeriy Sizov 57e2b5ed1a WebEditor: integrated editor 2012-10-12 20:07:24 +03:00
Valeriy Sizov f6a8e69449 WebEditor: base form 2012-10-12 20:07:23 +03:00
Riyad Preukschas 19560a4b5f Fix displaying events for deleted things 2012-10-12 13:37:44 +02:00
Robert Speicher 7d145adf35 Move 'closed' attribute to the row instead of the cell 2012-10-10 13:06:34 -04:00
Robert Speicher ce6e5f34d5 Remove unused li classes from milestone issue filter 2012-10-10 12:43:59 -04:00
Robert Speicher ace816354f Add toggle to show closed issues on Milestones#show
Progress on #1167
2012-10-10 12:43:59 -04:00
Riyad Preukschas 81ee69381d Add links to the note source if the note is mixed in 2012-10-10 12:14:48 +02:00
Riyad Preukschas fb0279f311 Fix vote counting to only count main target notes (not mixed in ones) 2012-10-10 12:09:45 +02:00
Dmitriy Zaporozhets dda852a0d5 Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests
Show numer of notes for commits and merge requests
2012-10-10 01:45:39 -07:00
Dmitriy Zaporozhets 60b4c88e3a Merge pull request #1664 from riyad/auto-complete-everywhere
Cleanup auto-completion and add it to all GFM inputs
2012-10-10 01:45:03 -07:00
Riyad Preukschas 6dc8c0eac2 Make MRs also count and display its commits' notes 2012-10-10 01:31:36 +02:00
Riyad Preukschas 77bde9a0e4 Add notes count to commits in lists. 2012-10-10 01:31:36 +02:00
Riyad Preukschas 4d843d2ce1 Fix auto-completion for forms that are inserted with JS 2012-10-10 00:53:57 +02:00
Riyad Preukschas e4aa5a5c8f Extract and split GFM auto-completion setup JS
* static initialization and setup moved to assets
* per request initialization moved to layout partial
2012-10-10 00:53:55 +02:00
Robert Speicher cda5e66d7c Use History.js for better Tree browsing
Closes #1578
2012-10-09 18:38:59 -04:00
Riyad Preukschas 682f62fd4a Mark all GFM capable inputs 2012-10-09 23:06:33 +02:00
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