Commit Graph
4731 Commits
Author SHA1 Message Date
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
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 7b3235a71c Rebuild client. 2017-10-26 17:51:34 -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
guerler 620ef86509 Merge branch 'dev' into remove_toolshed_installation_grid 2017-10-25 14:50:39 -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
guerler 3dd45099ba Remove "Lab" from masthead 2017-10-24 16:42:44 -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 2f2acb98e0 Merge remote-tracking branch 'guerler/remove_toolshed_grids' into dev 2017-10-23 17:23:46 -04:00
Martin Cech 08913b6f74 repack 2017-10-23 14:44:21 -04:00
Martin Cech 7c3fdbe1a5 Merge branch 'dev' into remove_samples_000 2017-10-23 14:43:32 -04:00
Martin Cech f6737618e3 expose state, stdout, stderr, uuid in the API
fix few bugs and UI/UX glitches
2017-10-20 16:27:00 -04:00
Nate Coraor 206f5ec034 Merge remote-tracking branch 'origin/release_17.09' into dev 2017-10-20 14:43:43 -04:00
Nate Coraor 1f6df5580b Fix the spinner for the GIE container readiness check. 2017-10-19 13:56:21 -04:00
guerler b218aae1de Use installation monitoring view instead of installation monitoring grid 2017-10-19 05:46:56 -04:00
guerler 0c5c8a95ab Redirect client request urls 2017-10-19 03:26:22 -04:00
guerler a123bee6cf Merge branch 'dev' into remove_samples_000 2017-10-18 17:07:33 -04:00
guerler 7f5048bc98 Merge branch 'dev' into remove_toolshed_grids 2017-10-18 17:06:19 -04:00
guerler f0484351dc Merge branch 'dev' into remove_toolshed_dependency_grid 2017-10-18 17:02:43 -04:00
guerler c9d87cc2e5 Remove unused variables and imports 2017-10-18 15:56:22 -04:00
Dannon Baker 00c8c2d013 Bundles 2017-10-18 14:31:45 -04:00
Dannon Baker 3259ecb789 Fix two invalid targets in dataset list item (top vs _top -- caused new window instead of nav; eventually this'll just be router when everything is compatible) 2017-10-18 11:50:48 -04:00
guerler 454e00d9bf Repack scripts 2017-10-17 17:47:31 -04:00
guerler 3a06f76254 Merge branch 'dev' into remove_samples_000 2017-10-17 17:38:51 -04:00
guerler 0167e41ac1 Merge branch 'dev' into remove_toolshed_grids 2017-10-17 16:24:28 -04:00
guerler bc9b0253ee Merge branch 'dev' into remove_toolshed_grids 2017-10-17 14:12:00 -04:00
Dannon Baker 5b2928f851 Adjust prettier glob, rerun/rebuild. 2017-10-17 13:10:59 -04:00
Dannon Baker 87873c5e2f Make it prettier, rebuild 2017-10-17 12:58:15 -04:00
guerler 857af99c61 Merge branch 'dev' into remove_toolshed_grids 2017-10-13 14:53:14 -04:00
Dannon Baker 5e3187405a Bundle toastr in common libs 2017-10-13 12:45:17 -04:00
Dannon Baker 1486ee3730 Merge remote-tracking branch 'upstream/dev' into es6 2017-10-12 15:57:35 -04:00
guerler 0d5d2aea83 Merge branch 'dev' into remove_samples_000 2017-10-12 15:18:46 -04:00
Dannon Baker 7ceaec4a22 Merge remote-tracking branch 'upstream/release_17.09' into dev 2017-10-12 12:43:05 -04:00
Dannon Baker 66b89f83ad Merge remote-tracking branch 'upstream/dev' into es6 2017-10-12 11:14:17 -04:00
Dannon Baker c4c15e323c Upgrade sinon to the latest (still legacy) version, fix jquery animation tests handling. 2017-10-12 11:09:04 -04:00
John Chilton 90f9a50574 Merge remote-tracking branch 'jmchilton/dev' into revise_dataset_attributes 2017-10-12 09:43:59 -04:00