Commit Graph
2243 Commits
Author SHA1 Message Date
Martin Cech cb9fe3efe8 implement more restrictive selector, use jquery each isntead of _
thanks to jmchilton and dannon
2017-12-20 13:23:28 -05:00
Martin Cech 40a5ddde01 fix image proxy prefix in tool form
alternatively I think this could be fixed at the point
 when this image url is being generated on backend
2017-12-20 11:37:22 -05:00
Dannon Baker 83b363d520 Merge branch 'release_17.01' into release_17.05 2017-09-14 15:10:07 -04:00
Dannon Baker a9facdc756 Merge branch 'release_16.10' into release_17.01 2017-09-14 14:54:27 -04:00
Dannon Baker 7fdce2efd9 Allow fetchMore to actually specify a 0 offset when intentional. This should fix the mysterious missing history in multiview bug. 2017-09-14 11:53:25 -04:00
guerler 3ef39b390c Fix drag and drop from history for firefox 2017-08-25 12:09:34 -04:00
John Chilton 12f0acba1d Revert "Revert "[release_17.05] Patch bug preventing creation of dataset library folders"" 2017-07-28 16:10:03 -04:00
John Chilton ecfb90ef9f Revert "[release_17.05] Patch bug preventing creation of dataset library folders" 2017-07-28 16:07:41 -04:00
E Rasche 6c6c804ab6 When a page is involved, the ID will be wrong 2017-07-28 17:10:42 +00:00
Dannon Baker d4d558b27a Merge remote-tracking branch 'guerler/fix_id_encoding' into release_17.05
Includes client rebuild.
2017-07-17 09:22:10 -04:00
Martin Cech e58b24db61 Merge pull request #4228 from bagnacan/release_17.05_backport_4062
[17.05] conditional postclick execution onNext
2017-07-10 10:42:17 -04:00
guerler c8eff858d6 Remove float style from color picker label 2017-06-26 17:52:06 +02:00
Andrea Bagnacani f439fd30eb conditional postclick execution onNext 2017-06-26 15:03:23 +02:00
guerler 368be188d0 Unescape tool id before parsing to tool form builder 2017-06-26 03:15:25 +02:00
guerler a498390bef Fix basic version changes for reloaded tools 2017-06-21 23:06:15 -04:00
guerler 69e76f98fa Remove redundancy of tool_id parameter 2017-06-21 17:10:52 -04:00
guerler 268ee7f1b7 Improve resilience of tool url building 2017-06-21 14:52:56 -04:00
guerler 9d0f9efbba Disable feature for forms which auto refresh with a server validation 2017-06-02 15:51:59 -04:00
guerler fdc712fb88 Hide error highlighting if user interacts with highlighted field 2017-06-02 15:49:41 -04:00
Dannon Baker c260e0b0c8 Sort tags for display (note, this is stupid to have in 3 places -- refactor) 2017-06-01 10:38:13 -04:00
guerler c409572ef8 Handle potential regex expression in workflow parameter names 2017-05-31 16:28:18 -04:00
Dannon Baker 2ac04bbf09 Uniqueify hashtag display 2017-05-26 13:30:21 +01:00
guerler bd83608a2f Fix global grid action events 2017-05-15 14:21:17 -04:00
John Chilton 04bb1e85cd [17.05] Fix FTP upload of multiple files in collection uploader. 2017-05-11 15:37:50 -04:00
Dannon Baker ced568a9e5 Fix destructive tag rerender to be a simple replacement. Left the original template/render in place, we could refactor as this becomes more standardized. 2017-05-10 16:59:58 -04:00
John Chilton 06d0e4fce5 Merge remote-tracking branch 'upstream/release_17.01' into dev 2017-05-02 14:54:05 -04:00
John Chilton 86ebe28667 Enhance filenames with collection context when downloading datasets from GUI.
- Reduce duplication related to calculating filename.
- Formalized pattern for normal dataset download using string.Tempalte - "Galaxy${hid}-[${name}].${ext}".
- In the context of collections, hid and name of the datasets are pretty worthless so I used a second pattern for collections based on where it is in the current GUI frame. The new pattern is "Galaxy${hdca_hid}-[${hdca_name}__${element_identifier}].${ext}".
- The patterns make this a little more tweakable - for people who want something different it should be pretty straight forward to make these patterns configurable.

Fixes #2140 I think.
2017-05-01 21:19:13 -04:00
Dannon Baker 7b50ae39b0 Merge remote-tracking branch 'upstream/dev' into hashtags 2017-05-01 16:15:25 -04:00
Dannon Baker d638e37705 Quick fix for displaying a message instead of just redirecting on clientside routes when login is required. TODO: refactor both message display and the decoration of routes. 2017-05-01 14:58:59 -04:00
Nicola Soranzo dab18fb238 Merge branch 'wiki-to-hub' into dev
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
2017-04-28 16:29:30 +01:00
Nicola Soranzo f074013683 Small tweaks for data-libraries URLS 2017-04-28 16:14:15 +01:00
Dannon Baker 89e692d980 Tweaks for @nsoranzo. 2017-04-28 09:42:20 -04:00
Dannon Baker 1d9b7d592b Merge remote-tracking branch 'upstream/dev' into hashtags 2017-04-28 09:24:55 -04:00
Dannon Baker 26afd36a4d Merge remote-tracking branch 'guerler/login_routes' into dev 2017-04-27 15:41:51 -04:00
Martin Cech 3fcd785646 Merge pull request #3962 from jmchilton/workflow_editor_mapping_test
[17.01] Fix edge case for workflow mapping handling when tools not available.
2017-04-27 15:37:17 -04:00
John Chilton 291426a5dc Merge pull request #3943 from guerler/show_default_value_for_runtime_values
Show default value for runtime values
2017-04-27 09:16:17 -04:00
Dannon Baker 29aa00e421 Merge remote-tracking branch 'upstream/dev' into wiki-to-hub 2017-04-26 17:09:40 -04:00
Dannon Baker 04a32064f1 Update wiki.galaxyproject.org links in client 2017-04-26 17:02:46 -04:00
Dannon Baker a2b8a7d26a Merge remote-tracking branch 'upstream/dev' into hashtags 2017-04-26 14:55:17 -04:00
Dannon Baker 9f36bea7f1 Slight refactoring, also name->hash for recommended tags. 2017-04-26 14:53:07 -04:00
Nicola Soranzo d398c90dbd Merge branch 'release_17.01' into dev
Conflicts:
	static/maps/mvc/ui/ui-select-content.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/ui/ui-select-content.js
2017-04-26 19:05:28 +01:00
Dannon Baker f3dbf55aad Render 'name:' as hashtags. I personally like the display better and
it'll nudge people towards using them I think, while still giving us the
'real' tagging hierarchy to work with.
2017-04-26 09:20:08 -04:00
Dannon Baker d082f1c334 Purely clientside implementation of hashtag shortcut for nametags. These are translated to 'name:nametag_value' prior to saving and are persisted in that form. 2017-04-26 09:12:56 -04:00
guerler 6c51f5232a Remove unused classes from code file 2017-04-25 12:24:14 -04:00
guerler 722c294165 Use first/last child selector 2017-04-25 12:22:15 -04:00
guerler 9aa7c6d2e9 Merge branch 'dev' into fix_color_input_style 2017-04-24 16:08:16 -04:00
guerler a6a920cb5e Remove unused label attribute, fix styles within color selector, remove encoded style attributes 2017-04-24 16:03:55 -04:00
guerler d41ad57761 Fix margin style values for color picker element 2017-04-24 15:27:50 -04:00
John Chilton 60e00088c8 Fix edge case for workflow mapping handling when tools not available.
Fixes #3960.
2017-04-24 14:12:14 -04:00
Martin Cech 1fa8c837ac improve french localization of the new menu item 2017-04-21 15:23:36 -04:00