010ba5ec22
Remove duplicated setupNoteForm method
2014-08-04 09:55:57 +02:00
b72ce57da6
Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-07-28 22:55:57 +03:00
420ba2119b
Move star button to sidebar. Add counter to forks too
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-24 22:14:12 +03:00
e21ca9f8b1
Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-07-24 10:54:42 +03:00
824821b4e9
Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions.
2014-07-17 21:33:21 +00:00
ecd771ccdf
Move coffee to assets/project
2014-07-17 22:47:16 +02:00
0b1cf50060
Added .closest() to find Reply button on click; fixes #401
...
This is to fix the issue where the icon-comment icon is clicked in the
Reply button of a note; the icon is used as the target and incorrectly
assumed to be the button itself, which causes the reply form to spawn
inside the button.
2014-07-09 18:16:24 -04:00
437cccf9a9
Update highlight.js to 8.1
...
Also added support for less common languages. All languages from
http://highlightjs.org/download/ now supported
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-09 09:47:06 +03:00
1057251150
fix high cpu usage issue that occured in Firefox
...
fixes issue related with #342 (Merge Request view causes 100% CPU in firefox)
2014-07-02 12:57:30 +09:00
2f962a40e8
Merge pull request #7170 from cirosantilli/add-trailing-newlines
...
[minor-refactor] Add trailing newline to all text files.
2014-06-30 09:41:06 +02:00
674cbe1534
Fix diff comments toggle button
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-25 11:40:33 +03:00
69baa3afb2
Dont render difscussion for commit diffs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 20:22:33 +03:00
de6a1a3e96
prevent events loading while loading events refs #49759
2014-06-24 18:01:36 +04:00
30912c75b8
Improve merge request comments
...
When add diff note on 'Changes' page - and then go to 'Discussions' tab
you will not see this discussion unless you reload a page. This commit
fixes it by rendering discussion on 'Discussion' page as soon as you
submit comment on 'Changes' page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 14:57:59 +03:00
d7eb6e5515
Merge pull request #7082 from erbunao/fix_clipboard
...
Fix for copy-pasting formatted text to markdown area
2014-06-24 10:33:49 +03:00
a7e0ca9e83
Add trailing newline to all text files.
...
Present in the large majority of files of each respective type.
2014-06-21 11:20:22 +02:00
8401ec56e3
Show spinner when loading MR diff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:17:06 +03:00
8d240fb0e7
Show/hide issue assignee avatar depends on drag-n-drop column in milestone view
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-16 12:17:34 +03:00
dbb7610365
Merge branch 'responsive-sidebar' into 'master'
...
Responsive sidebar fixes
This fixes two major issues with the responsive sidebar
1. Overlapping content by the label:
The label and sidebar is now always on the right side of the screen. This makes it always easy to find (better UX) and prevents it from overlapping most content. Additionally, on xs screens, instead of the side-attached label, for some pages it will show an extra button in the head instead of a buttons that overlaps.
2. Pop up of sidebar on changing pages.
2014-06-15 06:02:12 +00:00
204fee4f41
move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content
2014-06-14 22:44:23 +02:00
1555146adf
Merge branch 'responsive-sidebar' into 'master'
...
Responsive sidebar
Puts the sidebar on the dashboard in a off-screen sidebar that can be called by pressing a button with a fixed position.
Any sidebar with the .responsive-sidebar class will follow this behavior. Button must be added manually.
2014-06-14 13:50:30 +00:00
9c843041fa
add responsive sidebar to issues, milestones and MRs
2014-06-14 14:32:41 +02:00
d718209b47
responsive sidebar on dashboard
2014-06-14 11:18:00 +02:00
8b6dd9d4a8
responsive sidebar
2014-06-14 11:17:11 +02:00
ae564c97d4
Dont expose user email via API
...
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.
What user can get via API:
* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 17:46:48 +03:00
15c27192c0
Merge branch 'remove-wall'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-06-13 15:19:14 +03:00
d3d0775acd
Exclude info rows from milestone sorting items
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 15:18:23 +03:00
1355ede49d
Wipe wall notes feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:24:54 +03:00
1f3a69c1d1
fix double check for all issues
2014-06-12 22:39:08 +04:00
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
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
dd86ce3f06
Sort issues in milestone
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-11 14:09:45 +03:00
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
23626780c4
Fix for copy paste formatted text
2014-06-05 21:26:00 +08:00
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
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
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
3398e0a3d7
Revert "Implements and refactors clipboard feature for markdown."
...
This reverts commit 2273234653
2014-06-03 10:56:40 +03:00
a2b3eb134a
Move from ui-box to panels
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:57:27 +03:00
2273234653
Implements and refactors clipboard feature for markdown.
2014-05-28 22:51:47 +08:00
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
5cfaf945cd
Improve notes form UI/UX
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-24 13:06:44 +03:00
6990f8a846
Replace jquery deprecated .live with .on
2014-05-23 14:07:42 +02:00
6a85cdf162
Implements drag and drop upload in creating issues
2014-05-23 16:22:42 +08:00
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
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
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
24b68fdada
fix ctrl+enter note send
...
use argument e instead of event
2014-05-14 13:13:05 +04:00
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
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
a8624cbe59
submit notes forms by pressing ctrl+enter
2014-05-07 17:50:56 +04:00
0b914e7ceb
Refresh notes when the page becomes visible
2014-04-29 17:21:58 +02:00
e52f50c22f
Do not refresh notes on hidden tabs
2014-04-29 17:21:58 +02:00
7ec5ff4dba
Pass last_fetched_at for notes to javascript
2014-04-28 12:21:49 +02:00
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
5b123dbf7f
Fix avatars in the network graph for relative-url setups.
2014-04-10 10:05:40 +02:00
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
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
76c4421b26
Merge pull request #6639 from yatish27/ConsistentJSFormat
...
Consistent format for class objects in javascript
2014-04-03 11:36:44 +03:00
7ab46b969f
Do not require modernizr.
2014-04-03 08:49:34 +02:00
fcdb34373f
Consistent format for class objects in javascript
2014-03-28 14:01:06 +05:30
3ef0a625ac
Applications js to coffee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 16:12:23 +02:00
5e985a7eed
Use emoji assets on autocomplete.
2014-03-24 14:22:11 +01:00
c1fd25ce6e
Replace turbolink spinner with nprogress
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19 12:59:23 +02:00
7157f79caa
Refactor js behaviours helpers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 15:15:08 +02:00
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
3ada1d7ec3
Added option to remove issue assignee on project issue page and issue edit page
2014-03-02 13:10:45 -05:00
8907a95869
Fix commit image js
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 21:54:12 +02:00
58634dfb6a
New class names in notes css
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 09:43:45 +02:00
b05a67f4e3
Split merge request coffee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:22:57 +02:00
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
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
f0f88390c1
project_user selectbox with ajax autocomplete
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 16:08:26 +02:00
1d48904ac8
Show avatars in ajax user selectbox
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 15:45:24 +02:00
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
1794f606bd
Use ace editor as gem
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 16:18:46 +02:00
b8e81e558f
Show avatars of groups on profile screen that user belongs to
2014-02-06 23:27:32 -07:00
a184fcf368
Merge pull request #6178 from Popl7/add_group_avatars
...
added group avatars
2014-01-28 00:26:18 -08:00
251df827a5
added group avatars
2014-01-28 08:38:00 +01:00
891ea6f6e6
Improve highlight for notes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 18:18:18 +02:00
f304f975d6
Fix blob multiline highlight
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 14:21:40 +02:00
ffee5bb090
Improve themes. Load highlight.js properly
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-26 22:00:23 +02:00
76be57fcf2
Init highlgiht js and render for blob. Improve css for it
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-26 21:34:22 +02:00
c7966a426b
Include highlight.js assets
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-26 21:33:04 +02:00
073a269831
Refactor search autocomplete. Use ajax for source
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-18 14:16:46 +02:00
38d8d749d7
Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq
2014-01-15 10:36:12 +00:00
e19d05ddd6
Fix issues selects
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 21:07:59 +02:00
99a2b31e98
Dont allow merge without commit message
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 19:56:52 +02:00
d5bb466fe4
Fix for #5767
...
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
2014-01-13 22:22:46 +01:00
9c7d821cf7
Show selected attachment in comment form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-12 18:47:58 +02:00
4434f93aa9
Select2 dropdown autoWidth
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:36:10 +02:00
8a17961126
Replace chosen with select2
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:11:54 +02:00
04baf0b569
Update clone panel to use input group.
...
Use clone panel in `Git Access` section of wiki.
2014-01-08 10:06:03 -06:00
ac6c050773
Fix network tests. Removed console.log
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:41:09 +02:00
b765d7d739
Scale graphs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:25:35 +02:00
8c1d414674
Include tw bootstrap manually. Fix hide class
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 21:42:42 +02:00
010a770b3f
Migrate forms and inputs pt1
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 02:50:36 +02:00
9a7e2399dd
Use jquery timeago plugin
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:38:42 +02:00
00056c82f2
Update votes ferom comments dynamically
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-27 14:25:03 +02:00
32c7310f4a
Clear refresh interval for notes. Fixes duplicate note rendering
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-27 14:11:19 +02:00
d4ec23b8b5
fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-26 09:39:55 +02:00
21b028b548
Improve tests and make preview for notes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 23:21:26 +02:00
9305ef8940
Remove old methods and classes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 22:33:40 +02:00
923bd2ecd2
Write new Notes coffee class to handle comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 22:31:18 +02:00
f7e7dc7ebb
Make note anchors actually work
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 13:32:43 +02:00
2008361b8e
Merge pull request #5889 from skv-headless/master
...
coffee interpolation for template of user select
2013-12-22 00:53:04 -08:00
ae3cb2d6ce
coffee interpolation for template of user select
2013-12-20 21:31:45 +04:00
aef944ba7f
Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev
2013-12-19 19:58:40 +02:00
f811495429
Add button for removing source branch for merged MR's.
2013-12-19 14:02:54 +01:00
0760ba3efb
Customization and previewing of broadcast messages
2013-12-18 17:43:45 -05:00
65448e2ff7
Added dropdown menus to issue#show page for assignee and milestone
2013-12-17 09:39:50 -05:00
3221dc5381
Merge pull request #5681 from chopmann/patch-2
...
FIX: Browser back button breaks "Loading..." visual
2013-12-16 02:51:23 -08:00
bc663a7383
remove GET window.updatePage method that do dataType script
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:33:27 +02:00
e3464a54d8
Remove .js format for MergeRequest controller
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02:00
da10cad1da
Drop rjs from Issues#index
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 15:05:32 +02:00
596e64e5d7
Drop rjs from Notes#index
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:46:40 +02:00
db0c353a78
Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select
...
Enable multiline select for blobs.
2013-11-29 00:18:34 -08:00
33aea41708
Drop rjs from Infinite scrolling
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 11:38:20 +02:00
568e05a73b
Enable multiline select for blobs.
...
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
2013-11-27 20:08:37 -06:00
f10a156669
FIX: Browser back button breaks "Loading..." visual
...
From: https://github.com/rails/turbolinks/
page:change the page has been parsed and changed to the new version and on DOMContentLoaded
2013-11-24 21:38:11 +01:00
dcea191314
Select2 tag for namespaces with ajax loading
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 15:25:09 +02:00
00d6ac299e
Fix no-ssh-key-message path for cookie
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:36:09 +02:00
b983e9ef0a
Add ability to hide no ssh key message
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:19:23 +02:00
92b7c569a7
FIX: note-original-content appending itself too many times
2013-11-10 13:01:29 +00:00
6173d0a92f
Show branches list (which branches contains commit) on commit page
2013-10-21 22:54:37 +04:00
36a69b0a30
Update git-clone js. Use new style on wiki git access too
2013-10-21 13:07:16 +03:00
65cad57a35
avatar upload on profile page
2013-10-09 09:05:09 +02:00
e219cf7246
Annotate!
2013-10-01 15:15:28 +03:00
91e112ffe2
Replace remote url on selection.
2013-09-13 10:12:42 +02:00
e0ca2adafd
Improve Merge Request form
...
* added description
* simplified form
* enabled gfm autocomplete
2013-09-09 17:11:58 +03:00
01ff084a4d
Improved large commit handling.
...
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.
Related to #1745 , #2259
In addition, handle large commits for MergeRequests and Compare controllers.
Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
2013-09-07 14:44:03 +03:00
643a6e5824
Improve admin user show page
...
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
2013-08-27 21:39:34 +03:00
a2a7c8093b
Use flash message for notification across app
2013-08-27 12:18:53 +03:00
17af835387
Add event filter for group and project show pages
2013-08-26 16:30:03 +03:00
20397091f1
Show iid in event feed and uatocomplete as default id for issues, mr
2013-08-19 22:12:59 +03:00
a410bc1289
Merge pull request #4670 from anezi/relative-url-patch
...
More fixes for supporting Relative URL
2013-08-19 05:42:20 -07:00
798f7db24f
Update flash message timeout to 5 seconds
2013-08-17 16:36:44 +02:00
533ef87b13
Make flash messages fixed and sticked to bottom
2013-08-17 06:32:59 -04:00
39d8a64d25
Fixes grack authentification under relative_url_root
...
Ref: e6159b8725https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228
Add Rails' variable in application.rb to support relative url
This variable is used by assets compilation and other modules.
Note that user needs to change application.rb too
Restrict session cookie to the relative path if set.
Ref: 2c2f1e3185161afda3fa
2013-08-15 21:25:09 +02:00
6579ba3e77
Increase graphs height
2013-08-14 15:14:08 +03:00
31e9f82ebc
Improve repository graph
2013-08-13 16:26:48 +03:00
a0228f94a1
Reload page during repo import
2013-08-12 19:28:10 +03:00
f79b210061
Fix wiki popup for new page
2013-08-08 11:40:42 +03:00
65eddc00ad
toggle content instead of disabling button for group members editing
2013-08-06 18:49:37 +03:00
6eabf90b80
Ability to edit group member permissions
2013-08-06 18:45:45 +03:00
498a9ce3d2
more space for months names in network graph
2013-08-05 19:10:20 +03:00
a2501d1586
more space for days in network graph
2013-08-05 19:08:51 +03:00
65197b8a8a
Sanitize issues title in autocomplete for comment
2013-08-04 17:14:15 +03:00
263b301f66
Merge pull request #4663 from jackbot/autocomplete_in_editable_notes
...
Show autocomplete list when editing notes.
2013-08-04 06:36:36 -07:00
6af4223a27
Fixed Diff suppressed link for MR
2013-08-02 12:49:20 +03:00
ce5fca4828
Fix MR modal
2013-08-01 15:59:57 +03:00
8290e7cc70
Autofocus to project name at projects#new. Added description field to projects#new. Increased timeout for flash message
2013-07-29 21:06:59 +03:00
1458dea9fe
Show autocomplete list when editing notes.
2013-07-29 14:16:36 +01:00
cd19f82e51
Fix typos
2013-07-29 12:47:06 +02:00
7a167cf1f7
Move branches list to own controller with pagination. Ability to remove branches from UI
2013-07-16 22:19:07 +03:00
16c3925927
Determine network height based on window size
2013-07-15 15:03:56 +03:00
2a07390104
Remove unnecessary title. Fix graphs width for less then 1214px resolution
2013-07-15 10:01:15 +03:00
a10f917ae8
Fix dashbord sidebar filter
2013-07-13 09:55:46 +03:00
3805797cae
scss: rename file_content to file-content etc
2013-07-13 09:52:47 +03:00
dc038a7108
Rename Group#people to Group#members
2013-07-12 19:01:39 +03:00
5181816970
Merge branch 'master' into 6-0-dev
2013-07-12 14:42:35 +03:00
11703e8ece
Merge pull request #4297 from jdurand/patch-1
...
Update api.js.coffee
2013-07-11 09:39:37 -07:00
4da48868e5
Fix multiple trigger on button attachment
2013-07-10 19:29:54 +03:00
96448d1b7b
Fix shortcuts popup
2013-07-05 15:19:31 +03:00
44ac961b8d
group filter from dashboard. Design improvements of dashboard
2013-07-03 20:10:27 +03:00
ee890f2b2a
Merge branch 'master' into 6-0-dev
...
Conflicts:
app/views/dashboard/projects.html.haml
app/views/layouts/_head_panel.html.haml
config/routes.rb
2013-07-02 11:47:09 +03:00
20b2a0b235
Ability to edit comments
2013-07-01 10:48:02 +01:00
6e550af150
Show shotcut dialog on ?
2013-06-30 22:10:52 +03:00
f50cb7fc9f
Add keyboard nav for tree view. Refactor tree-view coffee
2013-06-26 16:58:56 +03:00
0a0cdc6c61
Limit amount of contributors at graph to 100 persons
2013-06-25 17:34:50 +03:00
8fb84104e4
Use graph ticks to make axis more readable
2013-06-25 12:39:58 +03:00
d41940d36e
Merge branch 'master' into 6-0-dev
...
Conflicts:
app/views/projects/issues/show.html.haml
db/fixtures/development/09_issues.rb
db/fixtures/development/10_merge_requests.rb
2013-06-24 22:13:00 +03:00
106764ab3b
update gems. remove console.log
2013-06-24 22:03:32 +03:00
f3a9240237
we should not use `console.log` in production code...
2013-06-24 17:40:23 +02:00
2ed7cbfba4
Move projects controllers/views in Projects module
2013-06-23 19:47:22 +03:00
09daff6178
Colors for author additions/develtions in graph
2013-06-22 11:38:47 +03:00
ede746bf07
prevent document unbind since it breaks rails ujs
2013-06-21 23:47:42 +03:00
be26d2724b
Unbind all document.on click/scroll after page fetch
2013-06-21 22:34:38 +03:00
c3c849927d
Unbind note events to prevent firing twice with turbolinks
2013-06-21 22:29:30 +03:00
78680a8177
Filter projects on dashboard
2013-06-19 13:52:25 +03:00
e12c9ee2bc
Added UsersGroup scaffold. Simplify adding people to group
2013-06-18 17:47:52 +03:00
2e839cee93
Fixed tests. Fixed overrided scope. Better usability for milestone view
2013-06-17 11:57:37 +03:00
b1bdd82992
Merge pull request #4269 from dosire/scrum-view-for-milestone
...
Scrum view style milestone view.
2013-06-16 23:32:09 -07:00
3668cdf5bb
Update api.js.coffee
...
CoffeeScript doesn't like that
2013-06-13 00:44:25 -03:00
642f9f4a1c
Scrum view style milestone view.
2013-06-10 17:24:49 +00:00
c5f56ee8a0
Restyle admin:group:show. Remove .all calls fro users, projects here
2013-06-10 15:58:51 +03:00
71d67e6557
Contributors graphs feature for GitLab
...
Created tests and refactored some code along the way
Added stat graph util spec, refactored code
finsihed up tests and refactors
finsihed up tests and refactors
2013-06-05 16:51:48 +08:00
d24c1dd834
fixed commit tab page shows commit log twice
2013-06-04 14:07:33 +09:00
56b42f58e7
Added TeamMembers.js file
2013-05-30 10:57:10 +03:00
73f9474b10
Fix dashboard event filter when navigate via turbolinks
2013-05-29 21:41:12 +03:00
45f9cca9b3
Unbind document scroll on page:fetch to disable endlessScroll on pages where it is not used
2013-05-28 18:59:01 +03:00
bd6dfe7d44
respect newlines for wall messages
2013-05-24 09:49:49 +03:00
576ad4453a
Replace all occurs of {{created_at}} at project wall
2013-05-22 16:12:30 +03:00
e6224942ce
Merge pull request #3935 from hiroponz/fix-bubble-padding
...
Fix bubble padding.
2013-05-14 04:37:35 -07:00
c449dab161
Fix bubble padding.
...
fix #3823
2013-05-14 19:34:05 +09:00
f59b7409cb
Improve user expirience while create/edit project settings
2013-05-14 12:46:41 +03:00
7b6f2fb160
Merge branch 'enhancement/issue_filter_dropdown' of /home/git/repositories/gitlab/gitlabhq
2013-05-08 11:27:19 +00:00
646fbe9286
bring more usability to issues filtering. Block issues area on loading filtered results
2013-05-08 13:43:21 +03:00
439cd3ebd3
autocomplete issues and preload autocomplete data.
...
update jquery-atwho-rails to v0.3.0
add autocomplete_source action to project for gfm autocomplete
move init_autocomplete layout from head_panel to project_resource
2013-05-04 11:26:43 +08:00
fe838588ae
Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root
...
[BUGFIX] User suggest at team_members/new not working with relative_url_root
2013-05-02 05:35:26 -07:00
c8649c5d60
Fix issue with undefined dispather page
2013-05-02 15:28:07 +03:00
92f0473354
Move search autocomplete call to dispatcher
2013-05-02 14:51:47 +03:00
0b981eb9b3
coffescript refactoring pt.1
2013-05-02 14:36:53 +03:00
37f3d0f25b
Fix newlines in how-to-merge. Added steps description. Fixes #3772
2013-05-02 13:23:50 +03:00
2aa620c25a
move more inline js to handle via dispatcher
2013-05-02 11:46:45 +03:00
ca225d92c3
Replace inline document.ready with dispatcher
2013-05-02 11:18:29 +03:00
26d0e47ce4
Show emoji popup if : preceeding by space or is new line.
2013-04-30 09:29:43 -04:00
bfaa3edbf1
Remove tree history & ajax slider
2013-04-29 13:14:55 +03:00
de7d6431b1
Add turbolinks to application
2013-04-29 10:10:45 +03:00
1ae9c69734
Draging network graph is replaced by vertical scrolling.
2013-04-25 22:15:50 +00:00
85c468ec48
Render graph partially.
2013-04-25 18:29:26 +09:00
529376bb0b
[BUGFIX] User suggest at team_members/new not working with relative_url_root
...
* Closing #3540
* Closing #3704
2013-04-24 19:40:09 +02:00
546d7d44d0
Fix missing initCheck for Issues page checkbox
2013-04-09 11:17:24 +03:00
e0df75de3f
refactor Issues.js. Remove unused actions. Respect filters while searching for issue
2013-04-07 13:19:36 +03:00
9fddd5b440
Refactoring & restyle pagination:
...
- remove admin kaminari theme. Use gitlab theme everywhere
- use bootstrap styled for gitlab admin themes
- dont reload page when change issue filter
2013-04-06 22:32:23 +03:00
39f4604653
refactor scss, refove unused classes
2013-04-06 14:35:17 +03:00
278d2abaaf
show commits count when hover chart on stats page
2013-04-03 23:32:36 +03:00
6d07a97462
move js code related to repo barchart to chart.js.coffee
2013-04-03 22:33:34 +03:00
188e6a7a3f
Merge pull request #3369 from hiroponz/display-note-count
...
Display note count on network graph.
2013-03-30 15:10:26 -07:00
e29c9b7932
slower animation for tree browsing
2013-03-30 16:35:19 +02:00
21191318ae
refactor wall.js. style wall page a bit
2013-03-28 16:41:29 +02:00
ba59912072
Prepare UI for notification settings
2013-03-27 20:07:52 +02:00
62ef763a80
Refector: clean up code.
2013-03-26 09:46:10 +09:00
f5e001bd8c
Using arrowed line only if it connects to not first parent.
...
It is easy to see which branch is merged.
2013-03-22 16:09:21 +09:00
26606aa2ec
Fix style of network graph.
...
refs #3258
2013-03-22 10:11:53 +09:00
d6338a8482
Merge pull request #3258 from hiroponz/display-commit-msg
...
Display commit message on network graph.
2013-03-21 09:58:57 -07:00
a19e3d898d
Display icon and commit message on network graph.
2013-03-21 13:08:54 +00:00
916c61fc64
Refactor: clean up code.
2013-03-21 12:34:15 +00:00
3cdac0b934
Use Api.js to handle api calls to gitlab
2013-03-20 21:55:25 +02:00
1f6b6b6c62
Rotating graph orientation.
2013-03-20 12:28:22 +00:00
72db22d385
send wall message with crtl+enter
2013-03-20 09:53:39 +02:00
8ec01e0ba9
remove ajax loader from wall
2013-03-19 18:14:59 +02:00
3b42c267a6
Dont show blocked users in autocomplete
2013-03-19 18:07:14 +02:00
4403f71f45
added sanitize and linkify functions. Moved some js to lib/
2013-03-19 15:54:58 +02:00
e6c2080214
use scrollTop solution for both chrome & firefox
2013-03-19 15:04:58 +02:00
b1bd3f1252
fix tests. added jquery.timeago.js
2013-03-19 14:39:32 +02:00
124a5e270e
add attachemnts support for wall
2013-03-19 13:28:29 +02:00
4d378f3c9a
load notes for wall via api
2013-03-19 12:35:55 +02:00
5bf3a898ed
Remove wall from basic notes logic
2013-03-19 12:34:14 +02:00
175e09f167
Change graph element size.
2013-03-19 19:27:15 +09:00
351c952192
Refactor: extract method.
2013-03-19 18:42:46 +09:00
96a584211b
Refactor: Clean up code.
2013-03-19 18:08:27 +09:00
415bade302
Result of misspellings run.
...
Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check
It runs mostly clean now.
2013-03-17 19:46:54 +00:00
ef05423f47
Finish select2-ajax for users. Added Select2Helper for tests
2013-03-14 10:16:27 +02:00
bdcaf21ea7
Allow single/multiple user select
2013-03-13 23:19:09 +02:00
7316055ac8
multiselect for ajax-users-select2
2013-03-13 23:19:09 +02:00
bf17d976a7
add api users filter and integrate users select2
2013-03-13 23:19:09 +02:00
163908b393
user select2 javascript
2013-03-13 23:19:09 +02:00
1bba46d661
md5 and utf_encode js libraries
2013-03-13 23:19:09 +02:00
197f9abedf
Covert to coffee.
2013-03-11 21:41:24 +09:00
b8f070f0d1
Rename to coffee.
2013-03-11 21:32:44 +09:00
8812d9dee2
Move groups and teams to tabs on dashboard. Remember tab with cookie
2013-03-10 11:57:14 +02:00
c0d312bebe
Refactor: Removing a if statement, because the nil value is already removed in the view template.
2013-03-07 21:10:40 +09:00
784aa266bd
Refactor: grouping parent and their space by including array.
2013-03-07 15:19:42 +09:00
40f1868194
Fix loading animation while browsing tree
2013-03-06 17:12:28 +02:00
3a09f02e11
Merge pull request #3109 from hiroponz/improve-network-graph
...
Improve network graph
2013-03-04 23:02:27 -08:00
e1f77b9be0
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
...
Conflicts:
Gemfile.lock
2013-02-28 17:02:20 +02:00
ab98db73a3
Issues tracker settings enableds/disableds without page reloading now
2013-02-28 16:11:14 +04:00
54d95f5897
Restyle flash message. Not it does not overflow head panel
2013-02-28 11:06:52 +02:00
2a687dd562
Show gravatar icon on tooltip.
2013-02-28 14:56:27 +09:00
14c2a37da2
A tip is made slanting.
2013-02-28 11:44:52 +09:00
d8a40d8c93
Move graph module from lib or vendor directory to app directory.
...
Because not autoloading lib directory at development mode.
2013-02-26 20:31:39 +09:00
585259b837
Fix merge state detection
2013-02-21 09:25:07 +02:00
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
6e333d5075
Javascript widget fixed
2013-02-19 12:57:09 +04:00
97de6f851b
Fix not-working team memebership permissions change
2013-02-18 16:40:11 +02:00
8bf8c70c4b
Import repo feature
2013-02-11 23:00:12 +02:00
130f60d55b
a bit of restyling. Replace some images with icons. Simplify note form
2013-01-31 11:22:06 +02:00
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
e33debc214
Updated commit diff view with some minor visual modifications
...
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
2013-01-27 18:27:32 +01:00
ce0ec05c63
Pager.js to coffee
2013-01-27 18:47:19 +02:00
eb99feb4a7
simple refactoring
2013-01-24 22:31:48 +02:00
a5ce8696a6
remove unused autogenerated files
2013-01-24 22:31:48 +02:00
497f7ab5ba
save autogenerated files
2013-01-24 22:31:25 +02:00
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
ee43e9248c
Add warning if user own projet but not in team. Also show loading when merge MR
2013-01-21 15:05:18 +02:00
f598cc7897
change logic on line_code
2013-01-15 11:12:17 +02:00
bda7fe38d0
Merge branch 'master' into discussions
2013-01-15 00:53:00 +01:00
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
dd20da1bff
Fix pager loading on every page in application
2013-01-10 17:38:37 +02:00
d7bc121474
replace javascript:void with preventDefault
2013-01-09 21:02:41 +00:00
5133fe8efb
dashboard js -> coffee
2013-01-09 19:30:20 +00:00
3cc0458312
Reloading of events via ajax instead of page reloading.
2013-01-09 19:30:20 +00:00
0d9f73fa1e
JavaScript removed from dashboard#index template.
2013-01-09 19:30:20 +00:00
97d17cf835
Event filters stores at cookies.
2013-01-09 19:30:20 +00:00
8d8c161a7f
Speedup dashboard via loading events with ajax
2013-01-07 14:36:01 +02:00
6c777ff823
Improve milestone show page
2013-01-07 14:08:03 +02:00
891bc414b1
Fix merge_request js -> ci_path
2013-01-05 23:26:14 +02:00
eaa8cd28d0
Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee
2013-01-05 22:54:48 +02:00
1724f45f46
Remove unused styles. Restyled Issues a bit
2013-01-05 14:49:08 +02:00
a1566a9c86
Converted merge_requests.js to coffeescript and updated code
2013-01-05 02:53:34 +01:00
7335f366dc
Fix comment and reply buttons
2013-01-02 20:49:27 +01:00
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
a47032bc29
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
...
Conflicts:
vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
85d5f606f6
Labels autocomplete
2012-12-18 06:14:05 +03:00
d2be7577c1
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
...
fix gfm autocomplete for usernames
2012-12-14 13:56:06 -08:00
1d156c9c8e
Fix project lookup. Show error if project transfer fails
2012-12-13 19:20:37 +02:00
a5861b8ff3
fix gfm autocomplete for usernames
2012-12-13 01:44:25 +01:00
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
e1282d507f
BranchGraph now loads async
...
Centralized keyboard and drag events for BranchGraph
2012-12-07 19:06:46 +01:00
b47173da6a
Revamped note form options.
2012-12-03 22:51:57 +01:00
4ed8278870
Fix a bunch of smaller glitches.
2012-12-03 22:51:57 +01:00
7978f8dd2b
Fix handling form errors.
2012-12-03 22:51:57 +01:00
6fc10fa256
Unify forms for discussions and main target.
...
Allows previews and uploads in all forms.
Also fixes #1730
2012-12-03 22:51:56 +01:00
c4a7824a8c
Fix wall notes
2012-12-03 22:51:56 +01:00
140652e9b0
Fix common form and note preview
2012-12-03 22:51:56 +01:00
5d3fb35cd1
Rename JS behaviors
2012-12-03 22:51:56 +01:00
918dc87376
Move code for appending a discussion note to notes JS
2012-12-03 22:51:56 +01:00
fac4e3f2e5
Reformat notes JS
2012-12-03 22:51:56 +01:00
494ae87840
Refactor discussion reply
2012-12-03 22:51:56 +01:00
06ea122840
Refactor diff notes creation
2012-12-03 22:51:56 +01:00
bd60a4ed40
Make notes JS know which notes are new in a request
2012-12-03 22:51:56 +01:00
5c2f6d7f05
Update notes views to support discussions
2012-12-03 22:51:55 +01:00
a048c955fd
Add JS behaviors
2012-12-03 22:51:55 +01:00
46bf3a0949
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
2012-12-02 13:29:24 +02:00
a9a5497915
refactor flash
...
* make unobtrusive js
* convert js to coffee
2012-12-01 18:40:47 +01:00
c19e766f1e
Added vendor/bundle to gitignore. Removed project js slugify
2012-11-30 19:49:51 +02:00
3c13ef648b
Fix MR comments
2012-11-30 16:03:10 +02:00
ff9a2e2a93
Improve admin logs
2012-11-29 07:49:11 +03:00
e2b73513f4
fixed the bug of URIDECODE error
...
if link to a chinese file name, it will jump to error page;
for example, the chinese file name called "消息文档.md", when after urlencode, it will be "%E6%B6%88%E6%81%AF%E6%96%87%E6%A1%A3.md", but after use History.pushState, will jump to a bad decode link.
2012-11-28 10:09:55 +08:00
7392d28dca
Merge pull request #2030 from tsigo/theme_feedback
...
Improve user feedback on the Profile > Design page
2012-11-21 12:54:22 -08:00
30a66c065a
Improve user feedback on the Profile > Design page
...
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
2012-11-21 15:01:40 -05:00
3e800c3bb1
Refactor GFM JS naming and access
2012-11-21 20:25:49 +01:00
1cda62465f
Fix GFM JS code style
2012-11-21 20:05:37 +01:00
0046409970
I prefer icons on header
2012-11-21 08:14:05 +03:00
51f48392ab
Fix type error if there is a different location hash
2012-11-17 22:26:22 +01:00
b339c747a9
Merge pull request #1937 from riyad/add-file-line-links
...
Add file line links
2012-11-16 03:46:43 -08:00
ece563296b
Fix Notes JS
...
Also fixes #1983
2012-11-14 14:36:51 +01:00
578cf89812
Fix specs
2012-11-14 01:20:37 +01:00
1c5b2a5153
Stats page
2012-11-10 23:08:47 +02:00
c42ada9bee
Allow linking to file lines
...
Supported formats: "L12" for single lines and "L12-34" for multiple lines
2012-11-10 00:03:46 +01:00
45dcb1b5c4
Add jQuery.ScrollTo
2012-11-09 23:35:02 +01:00
f555578414
Added EventFilter class. Compeleted first version of dashbaord filtering
2012-11-05 20:12:26 +02:00
badb092a2d
Don't initialize Tree History unless tree-slider is present
...
This was breaking breadcrumb links on non-Tree pages
2012-11-01 17:57:12 -04:00
f417a265d7
Finalize milestones for Merge Requests
2012-10-29 23:45:11 +02:00
ecdf778e80
Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
...
Conflicts:
app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00
17cec05087
Make new/edit issue forms use containers on the page instead of adding their own
...
Fixes #1830
2012-10-27 17:54:24 +02:00
2f5e44a02d
Enable/disable from buttons on all input events (not just key events)
...
Fixes #1836
2012-10-27 17:00:51 +02:00
a7d0816933
Add Milestone information in Merge Requests
...
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
2012-10-26 16:12:40 +02:00
414080cb03
remove unnecessary snippets.js
2012-10-19 03:41:10 -07:00
c28722689d
merge graph.js into projects.js
2012-10-19 03:41:10 -07:00
41ec540033
remove unnecessary loader.js
2012-10-19 03:41:10 -07:00
57c134c39a
cleanup coffeescript code for mentions auto-complete
2012-10-19 03:41:10 -07:00
ec1bccb261
use 'js-' prefix for behavioral 'gfm-input' class
2012-10-19 03:41:10 -07:00
46921e690e
cleanup main.coffee
2012-10-19 03:41:10 -07:00
8ee8f36f6e
WebEditor: fix unknown theme in production mode
2012-10-16 23:52:44 +03:00
57e2b5ed1a
WebEditor: integrated editor
2012-10-12 20:07:24 +03:00
7d145adf35
Move 'closed' attribute to the row instead of the cell
2012-10-10 13:06:34 -04:00
ace816354f
Add toggle to show closed issues on Milestones#show
...
Progress on #1167
2012-10-10 12:43:59 -04:00
fb0279f311
Fix vote counting to only count main target notes (not mixed in ones)
2012-10-10 12:09:45 +02:00
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
4d843d2ce1
Fix auto-completion for forms that are inserted with JS
2012-10-10 00:53:57 +02:00
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
cda5e66d7c
Use History.js for better Tree browsing
...
Closes #1578
2012-10-09 18:38:59 -04:00
388d72e6bf
Add render_tree helper; simplify (speed up) tree_icon
2012-10-03 19:39:27 -04:00
b5328879f5
Rename tree.js to tree.js.coffee
2012-10-03 19:39:27 -04:00
80bcba4ee2
install jquery-atwho-rails
2012-09-23 08:53:48 -07:00
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
249cb19d96
Fix project update. Make slim form only for reversed comments
2012-09-18 08:54:17 +03:00
465e40d3a6
Extract ref switcher into a partial
...
Also moves onchange JS to projects.js.coffee
2012-09-16 12:07:57 -04:00
6aebb76b5d
Update votes when creating or refreshing notes
2012-09-15 11:55:17 +02:00
07eec9c66a
Update Notes JS for reversed notes
2012-09-14 21:41:57 +02:00
e63d7b6029
Rename note.js to notes.js
2012-09-14 21:41:57 +02:00
cee230a158
Update JS for adding and removing diff line notes
2012-09-14 21:41:56 +02:00
e802d00996
Completely redo loading of notes with JS
2012-09-14 21:41:56 +02:00
8b6dba749a
Reorder notes view elements
2012-09-14 21:41:56 +02:00
0523b4265b
Application logger
2012-09-11 23:24:53 +03:00
d6c384c20f
Reduce the amount of JavaScript written in views
...
Seeing `:javascript` all over Views feels like a code smell. This goes a
long way towards reducing the amount of JS in views, but there's still
plenty to be done on that front.
2012-09-10 02:12:36 -04:00
5dcca7e480
Remove some JS that is no longer used
2012-09-09 07:28:42 -04:00
3551df8eb1
Minor main.js refactor and docs
2012-09-09 07:28:41 -04:00
ad1aa517c7
Add "enable" and "disable" jQuery functions
...
Handles (un)setting the disabled attribute and adding/removing the
'disabled' class
2012-09-09 07:28:41 -04:00
3b89f14090
Convert main.js to coffee
...
Remove duplicate 's' hotkey code
2012-09-09 07:28:41 -04:00
93daa8c568
Move main.js to main.js.coffee
2012-09-09 07:28:41 -04:00
1c01536829
Fix spelling of "empty" in disableButtonIfEmptyField function name
2012-09-09 07:28:41 -04:00
1b83af6eed
IssueController#new refactored
2012-09-07 20:59:12 +03:00
26552051b7
Pre-selected milestone implemented
2012-09-07 16:35:59 +03:00
46b9aafc39
add missing selector to projects.js
2012-09-06 07:56:33 -07:00
66684d6d50
move code from application.js to separate file
2012-09-06 05:47:13 -07:00
88d394d396
cleanup projects.coffee
2012-09-06 05:44:44 -07:00
e7c2ee57aa
delete unnecessary team.js
2012-09-06 05:06:01 -07:00
06acc115ed
rewrite snippets.js in coffeescript
2012-09-06 04:51:42 -07:00
f8b588808e
rewrite loader.js in coffeescript
2012-09-06 04:50:01 -07:00
08d9421dd9
rewrite graph.js in coffeescript
2012-09-06 04:32:31 -07:00
60e18e2636
rewrite admin.js in coffeescript
2012-09-06 04:32:01 -07:00
7e76610d0a
Update the projects js file to coffeescript; refactor the clone panel switcher
2012-09-04 12:05:20 -04:00
c1ff89fa2a
Rename projects.js to projects.js.coffee
2012-09-04 11:30:49 -04:00
f557686eb2
git clone panel available on files tab too
2012-09-03 22:30:14 +03:00
5e510ada7a
Js validation for title presence in issue, mr, milestone
2012-08-30 22:28:45 +03:00
b9ff0c79b4
Changed filters to readable one. Styled some stuff
2012-08-30 22:15:34 +03:00
4a6596af27
Fixed bunch of js bugs with comments. Also added development tips
2012-08-30 21:31:55 +03:00
cd3d50caf2
Changed colors for buttons. Imporved preview area. Added clone panel to empty project
2012-08-30 09:27:02 +03:00
e5adca1b81
Preview as button. Disable note submit unless content
2012-08-29 08:13:38 +03:00
0e5dbd1caf
Merge pull request #1231 from NARKOZ/preview_notes
...
Preview window is not closed after post
2012-08-23 06:56:55 -07:00
8eaead6a01
Text message for mergeing MR
2012-08-19 00:45:46 +03:00
813814f02e
Application cleanup
2012-08-17 09:09:11 +03:00
0b7e67ad12
fix note preview link, and hide preview and errors after posting a comment
2012-08-14 01:24:27 -07:00
9639780359
render notes preview on server-side
2012-08-09 23:47:48 -07:00
Robert Schilling
Dmitriy Zaporozhets
GitLab
Ciro Santilli
Ali Tavakoli
Takashi AOKI
Sytse Sijbrandij
skv
Job van der Voort
Marvin Frick
erbunao
Marin Jankovski
Earle Bunao & Neil Calabroso
Olaf Mandel
Jacob Vosmaer
Evan Lucas
Thomas Moschny
Yatish Mehta
Robert Speicher
Jason Blanchard
robertd
Steven Thonus
Jeroen van Baarsen
Jason Hollingsworth
Jacob Carlborg
Andrew Tomaka
Cornelio Hopmann
Andrey Kumanyaev
Steven Thonus
Marin Jankovski
Boyan Tabakov
Mike Bajur
GitLab
amouhzi
Jack Weeden
Johannes Schleifenbaum
Yves Senn
Jim
Sytse Sijbrandij
Karlo Soriano
erkasraim
Sato Hiroyuki
ichord
Aleks Bunin
Christian Simon
Kevin Lyda
Andrew8xx8
Koen Punt
Riyad Preukschas
Alex Denisov
Valeriy Sizov
Cyril
panxiaoming
Dmitriy Zaporozhets
Sergio Visinoni
Nihad Abbasov