Commit Graph

34 Commits

Author SHA1 Message Date
Filipa Lacerda 6a6a1e5b9e Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master'
Resolve "'Please select a file' when attempting to upload or replace from the UI"

Closes #35052

See merge request !12863
2017-08-08 14:45:49 +00:00
Simon Knox f363479808 disable file upload button while uploading
hide placeholder text when files have been added
vertically center dropzone area content
close modal after file upload succeeds
2017-08-08 22:12:08 +10:00
Luke "Jared" Bennett 9c521c8526
Made BlobViewer jasmine integration spec use snippets view instead of pblob view 2017-07-17 17:55:50 +01:00
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Filipa Lacerda b261fb7b33 Merge branch 'adopt-es-module-syntax' into 'master'
Adopt ES module syntax

See merge request !9567
2017-05-22 16:07:43 +00:00
Luke "Jared" Bennett 1f9a9629db Fix clicking disabled clipboard button toolip 2017-05-18 20:53:15 +00:00
Mike Greiling 283f968ef2 update frontend specs to use ES module syntax 2017-05-16 16:01:51 -05:00
Luke "Jared" Bennett b504b09b68 Added balsamiq jasmine integration test 2017-05-15 07:48:54 +00:00
Filipa Lacerda 269c0fe007 Replace old isObject for underscore methods 2017-05-10 16:17:31 +00:00
Clement Ho 0d540530ca Standardize jasmine test describe block names that test specific methods 2017-05-05 17:17:08 -05:00
Luke "Jared" Bennett ef7001c9c6 Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
#   spec/features/projects/commit/cherry_pick_spec.rb
#   spec/features/projects/environments/environment_spec.rb
2017-05-02 09:11:55 +00:00
Phil Hughes 54beb93ac3 Merge branch 'pdflab-in-repo' into 'master'
Move PDFLab assets into repo

See merge request !10642
2017-05-02 07:35:49 +00:00
Sam Rose 9f3985c613 Move PDFLab into GitLab 2017-04-28 12:52:36 -04:00
Luke "Jared" Bennett 2ef7c6f070
Fixed specs 2017-04-28 17:32:50 +01:00
Luke "Jared" Bennett cde3760bb4
Merge branch 'master' into balsalmiq-support 2017-04-28 11:32:40 +01:00
Phil Hughes 88380a04c6 Added specs for JS method to switch views 2017-04-27 12:23:27 -05:00
Phil Hughes 95658fb62a Fixed failing JS tests 2017-04-27 12:23:27 -05:00
Douwe Maan a7fd95cd22 Render viewer error synchronously so that 'view the source' link will work 2017-04-27 12:23:26 -05:00
Douwe Maan 7cc4546bc9 Add specs 2017-04-27 12:23:26 -05:00
Luke "Jared" Bennett c3633db617 Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
#   config/webpack.config.js
2017-04-26 11:26:10 +00:00
Eric Eastwood 5f7b4cb5d8 Use jQuery niceness on blob_fork_suggestion
Fix
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10602#note_27871752
2017-04-22 11:51:07 -05:00
Eric Eastwood 36387ce1b4 Add Fork/Cancel confirmation to "Replace"/"Delete" buttons
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637
2017-04-20 13:34:18 -05:00
Kushal Pandya d586b6cced Add ES lint support to identify poorly written Promises 2017-04-20 11:11:51 +00:00
Luke "Jared" Bennett 897d8d547c
Further review changes 2017-04-11 11:28:17 +01:00
Luke "Jared" Bennett 40e2be25c7
Added unit tests 2017-04-10 20:26:57 +01:00
Jacob Schatz a1db7c5b9f Merge branch 'pdf-js-spec-loading-wait' into 'master'
Wait for the PDF to be loaded before doing anything

Closes #30531

See merge request !10493
2017-04-06 11:18:28 +00:00
Phil Hughes e992799ce5 STL file viewer 2017-04-06 10:02:24 +00:00
Phil Hughes 5e67b2fdb0 Wait for the PDF to be loaded before doing anything
Closes #30531
2017-04-06 10:08:33 +01:00
Sam Rose dad30d6bbf Use PDFLab to render PDFs in GitLab 2017-04-05 11:22:12 -04:00
Jacob Schatz fd8a40783d Load a preview of Sketch 43 files
Sketch 43 files are technically a zip file, so the JavaScript opens the
zip file & locates a preview.png which is just a quick preview of the
last sketch page edited. After that is loaded it simply places the image
into the DOM
2017-04-05 11:49:08 +01:00
Phil Hughes 68f863bdda Fixed spec checking for highlightjs class 2017-03-23 17:24:24 +00:00
Phil Hughes 0ef8585726 Added tests 2017-03-23 12:37:24 +00:00
Mike Greiling 29e0cb4b91 Organize our polyfills and standardize on core-js 2017-03-13 21:48:32 +00:00
Jacopo e0fe2834eb New file from interface on existing branch
Now you can create a new file and select a target_branch != source_branch.
If the file that you want to create already exists on the target branch an error message is shown
A glDropdown is used to select and create a new branch instead of a text field.
2017-03-13 16:36:11 +01:00