Commit Graph
4826 Commits
Author SHA1 Message Date
John Chilton cecef90915 Merge remote-tracking branch 'jmchilton/dev' into tdt_tests 2017-11-14 21:49:15 -05:00
John Chilton 53cbbeefca Rebuild client. 2017-11-14 14:28:26 -05:00
Martin Cech 15852fcbf8 Merge branch 'dev' into remove_old_library 2017-11-13 11:21:42 -05:00
Dannon Baker 493c3e6475 Fix initialization of named ajax queue 2017-11-11 17:38:43 -05:00
guerler 7e372c908e Merge branch 'dev' into remove_old_library 2017-11-09 18:38:06 -05:00
Martin Cech 0a3b525543 Merge pull request #4967 from dannon/fix-admin-panel
Fix up reports javascript
2017-11-09 11:42:06 -05:00
Dannon Baker eac8573a3c Swap from event.path to event.target.parentElement for compatibility 2017-11-09 10:37:13 -05:00
Dannon Baker 03a033e3c7 More cleanup for reports/run_stats 2017-11-09 08:53:56 -05:00
Dannon Baker dd1f69ad5c D3 imports (note the currentEvent hack needed; babel known issue with binding) 2017-11-09 08:42:29 -05:00
Dannon Baker 92519e5a56 Fix up admin panel's run_stats. 2017-11-09 08:37:31 -05:00
Dannon Baker 372d65d239 Upgrade prettier, fixes comment formatting and handles string literals a little better. 2017-11-08 17:37:46 -05:00
guerler 991ee7d471 Merge branch 'dev' into remove_old_library 2017-11-07 13:47:51 -05:00
guerler 2e9bf40095 Fix multi operations if grid operations redirects into center panel 2017-11-07 12:18:43 -05:00
guerler e1b167bc07 Merge branch 'dev' into remove_old_library 2017-11-07 10:41:24 -05:00
Dannon Baker 9c47e957c3 Bump cssloadfiles to when the views are actually created 2017-11-06 15:25:27 -05:00
Dannon Baker 363a2e0636 Merge branch 'fix_download_button' into dev 2017-11-06 13:43:40 -05:00
Dannon Baker c10da91220 Merge branch 'ajax-es6' into dev 2017-11-06 13:39:17 -05:00
mvdbeek 63a3fa483f Point download button for collections to api/dataset_collections 2017-11-06 12:35:51 +01:00
John Chilton e30df782e4 Rebuild client. 2017-11-05 14:38:29 -05:00
John Chilton b8a33ed500 ES6 client/galaxy/scripts/utils/ajax-queue.js
- Use ``class``, ``super``, ``static``, and ``constructor`` to clean up object declaration.
- Eliminate ``self``.
2017-11-05 11:18:51 -05:00
guerler ebd6ee5040 Merge branch 'dev' into remove_old_library 2017-11-03 19:06:37 -04:00
Dannon Baker d464fe166e Prettier formatting change; rerun. 2017-11-02 18:19:53 -04:00
Dannon Baker f7ccdd7c74 Fix jupyter javascript; this all needs a ton of disentanglement and standardization. 2017-11-02 16:08:38 -04:00
Dannon Baker 2d388bc743 Export default function for galaxy.interactive_environments. 2017-11-02 15:14:58 -04:00
Dannon Baker 93660098f1 Remove some old, dead code from workflow view (should have been removed with the rewrite when PJA display was reimplemented) 2017-11-02 13:21:21 -04:00
Dannon Baker e8a8c5179d Comment dead code instead of leaving an 'if false' disable. 2017-11-02 13:08:21 -04:00
Dannon Baker 5ed511c749 Fix another undefined 'that'; swap to self for clarity. 2017-11-02 13:04:46 -04:00
Dannon Baker a2c3da5f0b Specify window.top as in other places. 2017-11-02 13:01:30 -04:00
Dannon Baker 06030b145d Fix undefined (and then duplicate) scope of 'creator'; use self. 2017-11-02 12:52:11 -04:00
Dannon Baker 152d895d2f Fix undefined 'that', standardize to self. 2017-11-02 12:42:02 -04:00
Dannon Baker 3b776753eb Slight refactoring/reorg in history-contents for clarity. 2017-11-02 12:36:57 -04:00
Dannon Baker 000b3c08c3 Merge remote-tracking branch 'upstream/dev' into es6imports 2017-11-02 11:20:45 -04:00
guerler 927ff6501a Merge branch 'dev' into remove_old_library 2017-11-02 10:59:04 -04:00
guerler b5c8d6c6d1 Remove wrong str statement 2017-11-01 17:11:13 -04:00
guerler 4de8912c14 Fix status handling for grids 2017-11-01 15:27:21 -04:00
guerler b17eea8566 Merge branch 'dev' into remove_old_library 2017-11-01 15:19:49 -04:00
Dannon Baker baf5352fff Merge branch 'dev' into es6imports 2017-11-01 15:15:09 -04:00
Dannon Baker 6f2c899d76 Merge remote-tracking branch 'upstream/dev' into es6imports 2017-11-01 14:21:12 -04:00
Dannon Baker d6d6f4c595 Template literals instead of string construction across the app; this does not handle the loaders for *large* templates or where we were using a helper to construct large strings, yet. 2017-11-01 13:58:30 -04:00
Martin Cech 3f14454d57 run prettier 2017-11-01 13:45:50 -04:00
Martin Cech 48ff086efc Merge branch 'dev' into remove_reload_buttons 2017-11-01 13:42:34 -04:00
Dannon Baker 01cbe01560 Arrow functions for callbacks across the codebase 2017-11-01 13:41:37 -04:00
Dannon Baker 5803e6f7d5 Explicit vars from multi-declarations. 2017-11-01 13:31:10 -04:00
guerler 30e0be57f9 Merge branch 'dev' into remove_old_library 2017-11-01 13:23:28 -04:00
Dannon Baker 9297da0ee2 Refactoring of GridView usage in galaxy.pages; fix dependencies. 2017-11-01 11:24:55 -04:00
Evgeny Anatskiy f419c85955 add test for TDT 2017-11-01 15:21:25 +01:00
guerler fe5983aafc Remove library common controller 2017-11-01 08:18:33 -04:00
Dannon Baker 2f7de58d29 Roll page editor dependencies into javascript. 2017-10-31 14:53:11 -04:00
Dannon Baker 8eee8dadf5 Fix galaxy page editor creation; onloads. 2017-10-31 14:50:43 -04:00
Dannon Baker cb4f74b9f2 Fix a bad merge of grid-view. 2017-10-31 10:51:55 -04:00