Commit Graph
4840 Commits
Author SHA1 Message Date
Dannon f0df34eaca Merge pull request #6967 from guerler/workflow_style_1
Refactor workflow editor styles and move from mako to css
2018-11-07 13:47:00 -05:00
Dannon eb57469eef Merge pull request #6970 from Nerdinacan/jquery_bundle
Normalized jquery bundle
2018-11-06 15:13:49 -05:00
Dannon a4f21fca77 Merge pull request #6980 from bgruening/optipng
optimize images with optipng
2018-11-06 13:03:37 -05:00
John Chilton 82a8eb05d6 Merge remote-tracking branch 'jmchilton/release_18.09' into dev_merge_1 2018-11-06 09:10:22 -05:00
Bjoern Gruening 443170e912 optimize images with optipng 2018-11-06 15:05:56 +01:00
Dannon Baker dbf5ef3360 Merge pull request #6974 from istevenshen/patch-2
Update locale.js
2018-11-06 07:35:09 -05:00
Steven Shen 5d3d8f5559 Update locale.js 2018-11-06 17:04:21 +08:00
Mason 9b7b6ab04d Added jquery.custom.js to lib folder 2018-11-05 19:13:27 -08:00
Mason c42ea4d9c5 Fixed monitor Proxy set function 2018-11-05 19:06:24 -08:00
Dannon Baker 4405d15fea Merge branch 'window_monitor' into dev 2018-11-05 18:02:51 -05:00
Dannon Baker 38e9225aff Client format 2018-11-05 18:02:35 -05:00
Dannon e9f2693933 Merge pull request #6729 from scrathat/admin.data.manager.vue.steps
Vue rewrite of admin data manager (local data) in steps
2018-11-05 15:00:20 -05:00
Dannon Baker 4b3606f1ac Target top with rerun to avoid nested Galaxy. 2018-11-05 14:47:18 -05:00
guerler cfc4ed8799 Move callout button specification to scss 2018-11-05 13:54:26 -05:00
guerler 4417632cea Consolidate module representation specifications 2018-11-05 13:29:31 -05:00
guerler ec97b380df Remove duplicate border highlighting for module forms 2018-11-05 13:22:20 -05:00
guerler 6e41c8a404 Fix callout style, currently global, attached to body 2018-11-05 13:20:17 -05:00
guerler c01f7d2b63 Move custom step margins to scss 2018-11-05 13:04:14 -05:00
guerler e0d891b274 Move error highlighting to scss 2018-11-05 12:59:23 -05:00
guerler e9255599bd Remove unused title row specification 2018-11-05 12:51:23 -05:00
guerler 5e0921cc9e Consolidate module step titles 2018-11-05 12:48:15 -05:00
guerler 496e353e86 Move callout for hidden outputs to scss 2018-11-05 12:45:49 -05:00
guerler 1f82b33e70 Move ruler style to scss 2018-11-05 12:43:53 -05:00
guerler 6247955ebb Move panel margins from mako to scss 2018-11-05 12:34:33 -05:00
guerler 3e3021d6f3 Remove title and row styles from mako to scss 2018-11-05 12:33:09 -05:00
guerler cd1a6b2ef8 Move disabled tool style from mako to scss 2018-11-05 12:30:52 -05:00
Mason 11375a5692 Merge branch 'dev' into window_monitor 2018-11-05 09:19:27 -08:00
Mason 5ffd438ebf Updated install console functions and instructions 2018-11-05 09:17:59 -08:00
Mason d7d5e04f92 Changed toggle to installation toggle instead of logging toggle 2018-11-05 07:49:03 -08:00
Martin Cech 61bda3d11a Merge pull request #6960 from dannon/collection_ext_dl
[18.09] Allow deferring 'to_ext' extension to the server
2018-11-05 10:11:11 -05:00
Mason 19b2fdd73b Reorganized config scripts, fleshed out comments and instructions 2018-11-03 14:13:18 -07:00
Sebastian Kapust 91df3971be DataManagerRouter, DataManager, DataManagerJobs: Fix routing problem
* Forward path following the data manager url to DataManagerRouter
* encode id in DataManager and DataManagerJobs
2018-11-03 14:06:46 +01:00
Sebastian Kapust 8789713b95 Merge branch 'dev' into admin.data.manager.vue.steps 2018-11-03 09:59:36 +01:00
Mason c2f71c3a3e Added missing settings on special qunit webpack config 2018-11-01 22:28:50 -07:00
Mason a7a73bcfcd Documented differences bretween different webpack configs, used cleaner tool and ignore-loader for true unit-tests 2018-11-01 22:14:14 -07:00
Mason b06957e906 Added existing mocha tests back 2018-11-01 21:14:43 -07:00
Mason e92ce87092 Removed bad test just to test build 2018-11-01 20:48:24 -07:00
Mason 31d3c97e75 Remove one failing test just to check build 2018-11-01 20:28:40 -07:00
Mason b637c7575a Modified test script calls 2018-11-01 20:15:56 -07:00
Mason 2cc0417530 Added chrome to qunit build, tried no sandbox flag on chrome 2018-11-01 20:06:26 -07:00
Dannon Baker 69b447169f Allow deferring 'to_ext' extension to the server, implement for collections. 2018-11-01 15:22:52 -04:00
Dannon Baker 18644f91cf Avoid using var; let. 2018-11-01 13:04:54 -04:00
Dannon Baker 03eac8315d Fix for workflow parameter collection in workflows view. 2018-11-01 12:55:04 -04:00
Mason 1490b6ae83 Merge branch 'dev' into karma_chromeheadless 2018-10-31 22:34:36 -07:00
Mason e8a64a8622 Split qunit and mocha tests, clean up karma configs 2018-10-31 22:28:50 -07:00
guerler 20f3c04a42 Use existing overflow utility instead of overwriting card defaults 2018-10-31 15:34:23 -04:00
Mason 294cfbf671 Updated provide monitored proxy for Galaxy references 2018-10-31 12:31:52 -07:00
Mason 66a7db9405 Merged dev 2018-10-31 12:25:27 -07:00
Martin Cech 31905f1402 Merge pull request #6917 from dannon/unified_webpack4
Unified webpack4
2018-10-31 14:52:32 -04:00
Dannon Baker 51273658fb Merge remote-tracking branch 'upstream/dev' into unified_webpack4 2018-10-30 11:06:24 -04:00