Commit Graph
4769 Commits
Author SHA1 Message Date
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
Dannon Baker d85abaad31 Merge remote-tracking branch 'upstream/dev' into es6imports 2017-10-31 10:44:21 -04:00
Dannon Baker e57f3cfe32 Fix a typo. 2017-10-30 09:24:20 -04:00
Dannon Baker 26a9f8916d Merge branch 'remove_toolshed_installation_grid' into dev
(post-prettier merge was simple to resolve)
2017-10-30 09:21:35 -04:00
Dannon Baker ec82e2bf2f Prettier, rebuild for merge. 2017-10-30 09:20:24 -04:00
Dannon Baker fa18801de1 Convert library imports, adjust a few runtime requires. 2017-10-27 14:50:41 -04:00
Dannon Baker 46bddaae6a Last two entrypoint imports converted. 2017-10-27 14:10:08 -04:00
Dannon Baker bb6f45c6f9 Imports in mvc/toolshed 2017-10-27 14:06:48 -04:00
Martin Cech 81a2163c87 repack 2017-10-27 13:48:32 -04:00
Martin Cech be4ddd3cd0 Merge branch 'dev' into lib-comparators 2017-10-27 13:47:47 -04:00
Martin Cech c41225b422 datalibs add func to sort folder by desc/state
refactor the comparator a bit to not change the actual obejcts' prperties
2017-10-27 13:43:32 -04:00
Dannon Baker 4f73d32fd4 Don't transpile any i18n bundles. 2017-10-27 11:29:03 -04:00
Dannon Baker 7b3235a71c Rebuild client. 2017-10-26 17:51:34 -04:00
Dannon Baker d01802c314 Don't mangle the i18n plugin and localization -- require w/ these plugins is a fickle beast. 2017-10-26 16:20:39 -04:00
Martin Cech 987f016246 rework the comparator to work when key is missing from object 2017-10-26 16:16:53 -04:00
Martin Cech 5a276ec3e6 start work on new lirbary comparators 2017-10-26 16:16:34 -04:00
Dannon Baker 5ec7f9ea9c Minor bump to i18n.js; probably not the fix I'm looking for though. 2017-10-26 13:32:47 -04:00
Dannon Baker 66d0da6d70 Add moduleIds to babel transpiling. 2017-10-25 18:19:51 -04:00
Dannon Baker 0cbd947672 Import libs w/ named *; see interop wildcard 2017-10-25 15:47:44 -04:00
guerler 620ef86509 Merge branch 'dev' into remove_toolshed_installation_grid 2017-10-25 14:50:39 -04:00
Dannon Baker 630d9fdd9d Fix imports (batch vs single export) for apps. 2017-10-25 14:19:29 -04:00
Peter Selten b3866bae16 Ensure Galaxy doesn't crash when a tour is malformed. 2017-10-25 19:40:09 +02:00
John Chilton 0f5927b628 Merge pull request #4839 from martenson/library-expose-state
expose state, stdout, stderr, uuid in the library API
2017-10-25 13:25:10 -04:00
Dannon Baker 6eed84d4f6 Attach workflow globals to window, temporarily. We can refactor and use a singleton in a module down the road or something else. 2017-10-25 12:41:09 -04:00
Dannon Baker 125367a49e Convert mvc/workflow/*; needs a followup on global handling here. 2017-10-25 12:27:10 -04:00
Dannon Baker 8675188090 Update ui/* jquery plugin definitions, convert to es6. 2017-10-25 09:49:05 -04:00
Dannon Baker 2eed28cf74 Utils conversion, minus _l 2017-10-24 18:07:41 -04:00
Dannon Baker c771c4e67a Convert imports in mvc/ui/*; this one was clean. 2017-10-24 17:55:45 -04:00
Dannon Baker 126811849f Fix CurrentHistoryView import, kinda kludgy, may rework. 2017-10-24 17:37:03 -04:00
guerler 3dd45099ba Remove "Lab" from masthead 2017-10-24 16:42:44 -04:00
Dannon Baker b41ed6b87b Citations overhaul with 'import * from bibtex' -- this maybe works? 2017-10-24 16:40:47 -04:00
guerler 1e23a6397b Fix order in center panel information view 2017-10-24 16:16:33 -04:00
guerler d3a6af5f71 Add legacy data libraries link 2017-10-24 16:03:15 -04:00
Dannon Baker 3138e02536 Add a little bit of padding between labels. 2017-10-24 15:13:25 -04:00
guerler 8f6e5eb6f5 Merge branch 'dev' into remove_samples_000 2017-10-24 14:57:02 -04:00
Dannon Baker df1b7fbf54 Capitalize tag rendering 2017-10-24 14:56:14 -04:00
Dannon Baker 4fcf2a329f Untagged tour support/rendering. 2017-10-24 14:47:43 -04:00
Dannon Baker 4dc97ceb59 Build client/formatting. 2017-10-24 14:07:06 -04:00
Dannon Baker 546a8c6df9 Remove unnecessary (not sure what the intent was here) assignment in return. 2017-10-24 11:55:10 -04:00
Dannon Baker d97fcf3a8d Prettier pre-bugfix. 2017-10-24 11:53:42 -04:00
Dannon Baker 97ffc5d219 Fix multiple defines/requires in several viz/* modules, and convert to es6 imports. 2017-10-24 11:40:06 -04:00
Dannon Baker 2f2acb98e0 Merge remote-tracking branch 'guerler/remove_toolshed_grids' into dev 2017-10-23 17:23:46 -04:00
Dannon Baker d0c9d68e1b Convert layout imports. 2017-10-23 16:42:27 -04:00
Dannon Baker a2aae9bbaa Add missing localization import to scratchbook. 2017-10-23 16:41:21 -04:00
Dannon Baker 116fb05038 Combine scratchbook requires 2017-10-23 16:39:07 -04:00
Dannon Baker 07e9e94c24 Fix import in analysis.js 2017-10-23 16:05:05 -04:00
Dannon Baker d745423732 Convert galaxy.js imports; minor fixup. 2017-10-23 14:59:02 -04:00
Martin Cech 08913b6f74 repack 2017-10-23 14:44:21 -04:00