home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,414 Commits 48 Branches 340 Tags
ca823065a905f8c19b2003a67e79831ba1ceff2e
Commit Graph
112 Commits
Author SHA1 Message Date
Phil Hughes f62d7d261b Removed console.log from notes 2016-04-04 10:49:08 +01:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +01:00
Phil Hughes 7dde8b2cf0 Fix spacing below edit note form 
Also changed to allow the CSS to decide what should be hidden when editting
 2016-03-18 17:23:54 +00:00
Phil Hughes 4885423fea Fixes issue with close button not working on MR 
Closes #14383
 2016-03-18 11:36:48 +00:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master' 
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
 2016-03-17 20:35:06 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master' 
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 2016-03-11 13:07:43 +00:00
Phil Hughes 6690d8e25b Correctly uses a variable with the text 2016-03-11 10:03:35 +00:00
Jacob Schatz 4f954d6adc Add error for ajax:error when submitting comments 
Fixes #13814
 2016-03-10 12:20:00 -05:00
Phil Hughes 3c6fdc7a0a Fixed quick submit on note edit 
Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094
 2016-03-10 11:02:22 +00:00
Phil Hughes 3d99ffc862 Edited timeago text on comments 
Unified the 'edited text' to be the same in descriptions and comments

Closes #5538
 2016-03-10 08:39:47 +00:00
Phil Hughes da6e38a889 Fixed tests for comment forms 2016-03-04 10:44:04 +00:00
Phil Hughes e033b9a7f1 Added discard button to comment form 
Also changed the labels on the buttons to better match the action they are completing.

Closes #8057
 2016-03-04 08:42:22 +00:00
Alfredo Sumaran 74d41f8950 Use camelCase for variable names 2016-03-03 15:20:02 -05:00
Alfredo Sumaran d9a1b6629d Set @max_polling_steps to 4 so the last interval will be 120 seconds 2016-03-03 15:20:01 -05:00
Alfredo Sumaran 948ebfeb01 Provide @max_polling_steps instead of @limit_polling_interval 2016-03-03 15:20:01 -05:00
Alfredo Sumaran 5bd22b28fa Prevent multiple refreshes if a refresh is happening 2016-03-03 15:20:01 -05:00
Roberto DipandAlfredo Sumaran 3fbdca214c Increase the notes polling timeout over time 
A file called notes is loaded every ~15 seconds which checks for
updates to content on the page. This commit increases the polling
timeout over time (15, 30, 60, 120 seconds) and resets
it to 15 seconds if the AJAX call returns new notes

Fixes issue #13300
 2016-03-03 15:20:00 -05:00
Phil HughesandJacob Schatz 741cf430f7 Correcly updates the status of the comment buttons on reload 
Closes #5534
 2016-03-03 12:39:50 -05:00
Jacob Schatz ed8256a28b Adds comment about event listener 2016-01-26 00:28:27 -05:00
Jacob Schatz 55e031a0d0 Adds feature: Ajax Close/Open updates discussion automatically 
Triggers jQuery event
Fixes #5544
 2016-01-26 00:25:41 -05:00
Rémy Coutable dfdf189135 Fix indentation of methods chaining in Coffee 
[ci skip]
 2016-01-20 23:24:13 +01:00
Rémy Coutable 12da27090f Address some JS coding-style and HTML semantic issues 
- Replace 'rel' attributes with 'data' or 'id' attributes
- Style jQuery methods chaining according to Jacob's guidelines
- Rename a method
 2016-01-20 22:39:32 +01:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab 
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
 2016-01-19 18:22:01 +01:00
Robert Speicher 6754caed3c Autosize the textarea in showEditForm 
[ci skip]
 2016-01-16 22:17:57 -05:00
Jacob Schatz daf60957d9 Fix javascript error with deleting messages in issue or merge request 
Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery
Fixes #8109
 2016-01-14 19:09:46 -05:00
Dmitriy Zaporozhets fc9a2a3e70 Merge remote-tracking branch 'origin/rs-autosize' 2016-01-14 16:19:16 +01:00
Jacob Schatz 1eb3e8acb6 fixes bug with commenting on merge requests 2016-01-13 16:57:46 -05:00
Robert Speicher 5987e88306 Fix missing autosize require 2016-01-13 16:13:34 -05:00
Robert Speicher 552c179acd Autosize textareas 2016-01-13 14:51:07 -05:00
Jacob Schatz 5a997a02a2 removes commented out code. 2015-12-30 06:29:56 -05:00
Jacob Schatz 8e74460534 adds ajax to bottom discussion buttons. Now submits issue and closes via ajax. 2015-12-29 12:53:21 -05:00
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Robert Speicher 48eccdb2fc Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' 
Fix delete notes on merge request diff

Fixes #3971

See merge request !2061
 2015-12-11 12:49:55 -05:00
Grzegorz Bizon d1211e0ada Fix award-emojis alert flash message 
This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996
 2015-12-11 13:50:14 +01:00
Douglas Barbosa Alexandre 1f893022fd Remove note from MR discussion when deleting it in the changes tab 2015-12-10 22:07:25 -02:00
Douglas Barbosa Alexandre 429932a8b4 Ensure new notes are highlighted properly on a merge request diff 2015-12-09 12:17:00 -02:00
Douglas Barbosa Alexandre 9e5ac7285c Ensure notes are replaced on a merge request diff when they're updated 2015-12-09 11:30:21 -02:00
Dmitriy Zaporozhets bdb4945dcf Fix random failing test - delete attachment 
Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-07 23:40:17 +01:00
Grzegorz Bizon bfe91b692a Remove space before exclamation mark in award alert 
[ci skip]
 2015-12-05 22:18:13 +01:00
Grzegorz Bizon 7af67f619a Combine new javascript Flash methods into one 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 554f468462 Pin flash message to top if award note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 6fc1b94856 Show flash message instead of alert when note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon a527f5c27f Notify user when award-emoji comment is invalid 2015-12-03 13:38:59 +01:00