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

142 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
130f60d55b a bit of restyling. Replace some images with icons. Simplify note form 2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets
e2fb18a3ec replace right with pull-right 2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
fb617c61b9 refactor buttons pt2 2013-01-29 22:29:21 +02:00
Koen Punt
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
Dmitriy Zaporozhets
2e9c0e2b47 switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment 2013-01-17 22:35:45 +02:00
Dmitriy Zaporozhets
f598cc7897 change logic on line_code 2013-01-15 11:12:17 +02:00
Riyad Preukschas
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
Riyad Preukschas
74e48f070f Smaller fixes 2013-01-15 00:27:26 +01:00
Dmitriy Zaporozhets
14d0ef8f37 Show images preview in notes. Show line additions/deletions for commit 2013-01-04 22:13:32 +02:00
Riyad Preukschas
e29687552e Fix link titles 2013-01-02 21:07:02 +01:00
Riyad Preukschas
7335f366dc Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
Riyad Preukschas
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
Dmitriy Zaporozhets
9ada678819 Split commit_id and noteable_id for Note 2012-12-18 20:02:00 +02:00
Riyad Preukschas
b47173da6a Revamped note form options. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
4ed8278870 Fix a bunch of smaller glitches. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
7978f8dd2b Fix handling form errors. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
c1ffee4e65 Fix dicussion headers 2012-12-03 22:51:57 +01:00
Riyad Preukschas
c20af32ae4 Pull together and rename Notes partials 2012-12-03 22:51:57 +01:00
Riyad Preukschas
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
Riyad Preukschas
fbd345ea20 Make attachments more obvious 2012-12-03 22:51:56 +01:00
Riyad Preukschas
c4a7824a8c Fix wall notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas
140652e9b0 Fix common form and note preview 2012-12-03 22:51:56 +01:00
Riyad Preukschas
918dc87376 Move code for appending a discussion note to notes JS 2012-12-03 22:51:56 +01:00
Riyad Preukschas
494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas
06ea122840 Refactor diff notes creation 2012-12-03 22:51:56 +01:00
Riyad Preukschas
39834ec640 Move diff notes into the actual diff content column 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6d5c29dc2b Inline diff_notes_reply_button partial 2012-12-03 22:51:56 +01:00
Riyad Preukschas
3bc507e5c5 Rename diff note partials 2012-12-03 22:51:56 +01:00
Riyad Preukschas
bd60a4ed40 Make notes JS know which notes are new in a request 2012-12-03 22:51:56 +01:00
Riyad Preukschas
ae067ee322 Fix vote counting 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6c6f415cae Fix appending diff line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +01:00
Riyad Preukschas
9b919939a3 Fix parameter passing and wording for per line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
d7ce2c5c07 Fix rendering template for invalid notes 2012-11-21 20:26:37 +01:00
Riyad Preukschas
3e800c3bb1 Refactor GFM JS naming and access 2012-11-21 20:25:49 +01:00
Nihad Abbasov
ec1bccb261 use 'js-' prefix for behavioral 'gfm-input' class 2012-10-19 03:41:10 -07:00
Riyad Preukschas
b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02: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
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
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
Riyad Preukschas
f5a62835bb Fix completion for per line forms 2012-09-30 12:07:45 +02:00
Nihad Abbasov
6df515a56d add auto-completion for +1, -1 emoji 2012-09-25 04:56:21 -07:00
Nihad Abbasov
9c75fcbef1 auto complete team member mentions 2012-09-23 09:52:01 -07: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
Riyad Preukschas
b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00