Commit Graph
471 Commits
Author SHA1 Message Date
Job van der Voort d718209b47 responsive sidebar on dashboard 2014-06-14 11:18:00 +02:00
Job van der Voort 8b6dd9d4a8 responsive sidebar 2014-06-14 11:17:11 +02:00
skv-headless 1f3a69c1d1 fix double check for all issues 2014-06-12 22:39:08 +04:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets ed610043a8 Merge branch 'milestone-issue-position' into 'master'
Milestone issues sorting

Now issues save sort position inside milestone lists

Part of #1207
2014-06-11 12:14:44 +00:00
Dmitriy Zaporozhets dd86ce3f06 Sort issues in milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-11 14:09:45 +03:00
Marvin Frick 587502390b fixes gitlab.com issue #229
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
2014-06-10 22:28:11 +02:00
Dmitriy Zaporozhets 336d50d008 Merge request drag-n-drop on milestone page
Allows moving milestone between 3 columns: unassigned, assigned,
declined

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 13:01:49 +03:00
Dmitriy Zaporozhets 9654b098c6 Milestone drag-n-drop with 3 columns
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 09:29:24 +03:00
Dmitriy Zaporozhets 47937802a2 Add js milestone class. Activate drag-drop for issues on milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-04 18:51:01 +03:00
Dmitriy Zaporozhets 3398e0a3d7 Revert "Implements and refactors clipboard feature for markdown."
This reverts commit 2273234653.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/issues/_form.html.haml
	app/views/projects/merge_requests/_form.html.haml
	app/views/projects/merge_requests/_new_submit.html.haml
	app/views/projects/milestones/_form.html.haml
	app/views/projects/notes/_form.html.haml
	app/views/projects/wikis/_form.html.haml
2014-06-03 10:56:40 +03:00
Dmitriy Zaporozhets a2b3eb134a Move from ui-box to panels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:57:27 +03:00
erbunao 2273234653 Implements and refactors clipboard feature for markdown. 2014-05-28 22:51:47 +08:00
Dmitriy Zaporozhets 1bb9aeb565 Fix specs. Fix note form reset after submit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-24 14:10:36 +03:00
Dmitriy Zaporozhets 5cfaf945cd Improve notes form UI/UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-24 13:06:44 +03:00
Marin Jankovski 6990f8a846 Replace jquery deprecated .live with .on 2014-05-23 14:07:42 +02:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets eee14a0c74 Merge branch 'fix-scroll-to' into 'master'
Fix js error when use scroll to highlighted line
2014-05-22 20:17:15 +00:00
Dmitriy Zaporozhets 74079fe236 Fix scroll to highlighted line. Replace scrollTO js file with gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 18:19:50 +03:00
Olaf Mandel c18e2778b2 Fix avatar URLs in JS-lists for relative_url_root
In user lists created when entering a (partial) user name into
a field, the URL to the user avatar was invalid if running with
relative_url_root.

This patch is the result of:
sed -i 's/\(= *\)\(user\.avatar_url\)/\1gon.relative_url_root + \2/' \
    app/assets/javascripts/*.coffee
2014-05-20 15:22:23 +02:00
Evgeniy Sokovikov 24b68fdada fix ctrl+enter note send
use argument e instead of event
2014-05-14 13:13:05 +04:00
Dmitriy Zaporozhets 4ca1a29de8 Merge pull request #6934 from skv-headless/ctrl_enter_form_submit
submit notes forms by pressing ctrl+enter
2014-05-08 21:31:25 +03:00
Dmitriy Zaporozhets 2da289cf22 Add assignee and milestone to 2nd step
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-08 15:52:59 +03:00
skv-headless a8624cbe59 submit notes forms by pressing ctrl+enter 2014-05-07 17:50:56 +04:00
Jacob Vosmaer 0b914e7ceb Refresh notes when the page becomes visible 2014-04-29 17:21:58 +02:00
Jacob Vosmaer e52f50c22f Do not refresh notes on hidden tabs 2014-04-29 17:21:58 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Evan Lucas 4134b38a84 Fix syntax highlighting
Don't break highlighting on multi-line spans (multi-line comments for
example)
2014-04-22 17:06:16 -05:00
Thomas MoschnyandMarin Jankovski 5b123dbf7f Fix avatars in the network graph for relative-url setups. 2014-04-10 10:05:40 +02:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
2014-04-06 13:54:54 +03:00
Dmitriy Zaporozhets 76c4421b26 Merge pull request #6639 from yatish27/ConsistentJSFormat
Consistent format for class objects in javascript
2014-04-03 11:36:44 +03:00
Marin Jankovski 7ab46b969f Do not require modernizr. 2014-04-03 08:49:34 +02:00
Yatish Mehta fcdb34373f Consistent format for class objects in javascript 2014-03-28 14:01:06 +05:30
Dmitriy Zaporozhets 3ef0a625ac Applications js to coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 16:12:23 +02:00
Marin Jankovski 5e985a7eed Use emoji assets on autocomplete. 2014-03-24 14:22:11 +01:00
Dmitriy Zaporozhets c1fd25ce6e Replace turbolink spinner with nprogress
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19 12:59:23 +02:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 15:15:08 +02:00
Robert Speicher 1688a29023 Add GFM autocompletion for MergeRequests
Requested
[here](http://feedback.gitlab.com/forums/176466-general/suggestions/5507440-auto-complete-merge-requests-in-gitlab-markdown).
2014-03-05 23:24:03 -05:00
Jason Blanchard 3ada1d7ec3 Added option to remove issue assignee on project issue page and issue edit page 2014-03-02 13:10:45 -05:00
Dmitriy Zaporozhets 8907a95869 Fix commit image js
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 21:54:12 +02:00
Dmitriy Zaporozhets 58634dfb6a New class names in notes css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 09:43:45 +02:00
Dmitriy Zaporozhets b05a67f4e3 Split merge request coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:22:57 +02:00
Dmitriy Zaporozhets 8a55636f89 Dont replace all issue context when change assignee/milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 13:15:43 +02:00
Dmitriy Zaporozhets 67798492bc Add placeholder support for project_users_select_tag
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 16:16:23 +02:00
Dmitriy Zaporozhets f0f88390c1 project_user selectbox with ajax autocomplete
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 16:08:26 +02:00
Dmitriy Zaporozhets 1d48904ac8 Show avatars in ajax user selectbox
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 15:45:24 +02:00
Dmitriy Zaporozhets 348e44ef06 Dont use avatars for user select if avatar is disabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-11 15:49:39 +02:00
Dmitriy Zaporozhets 1794f606bd Use ace editor as gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 16:18:46 +02:00
robertd b8e81e558f Show avatars of groups on profile screen that user belongs to 2014-02-06 23:27:32 -07:00