Commit Graph
4275 Commits
Author SHA1 Message Date
guerler ccc5fc2837 Restore trackster options 2017-07-11 15:16:36 -04:00
guerler 9b1ec4bea2 Remove duplicate trackster options modal 2017-07-11 14:49:03 -04:00
guerler fbecde3526 Repack scripts 2017-07-11 13:56:09 -04:00
guerler b1ed39eb4a Remove add to viz grid mako 2017-07-11 13:54:40 -04:00
guerler 6dbe4d6725 Fix button order 2017-07-11 13:36:48 -04:00
guerler add6efb7da Fix ldda vs hda detection 2017-07-11 13:34:00 -04:00
guerler 8fd5c234b5 Restore library dataset support 2017-07-11 12:04:14 -04:00
guerler 8f018544ef Add library handler 2017-07-10 19:56:23 -04:00
guerler 2908a8e6c1 Remove additional div layer 2017-07-10 16:47:10 -04:00
guerler 02884fa0af Properly refresh grid for new history selection 2017-07-10 16:22:48 -04:00
guerler 548bc675c5 Remove trackster grid makos for library and dataset selection, attempt to refresh grid without rebuild 2017-07-10 16:14:20 -04:00
guerler 0214a55234 Introduce select field for history selection, remove history list grid 2017-07-10 16:08:32 -04:00
guerler 6496aa595a Revise all trackster grids, remove unused grids 2017-07-10 12:57:19 -04:00
guerler ce2c65ff15 Remove debug statement, repack scripts 2017-07-10 11:42:55 -04:00
guerler 3493cbbd38 Replace insertion grid in trackster 2017-07-10 11:26:13 -04:00
guerler 2b36a904df Remove unused dataset selection grid for bookmarks 2017-07-07 12:20:03 -04:00
guerler 3fcd73ee35 Remove change to original handler function 2017-07-07 11:01:36 -04:00
guerler 378319776b Add insert and embed functions 2017-07-07 10:57:49 -04:00
guerler 8a7783809f Use grid view to build embedded selection grids for pages 2017-07-07 10:46:50 -04:00
guerler 411268c013 Apply webpack 2017-07-07 09:50:28 -04:00
guerler 4761e2ccdd Redirect masthead link to client endpoint 2017-07-07 09:41:50 -04:00
Dannon Baker 8b3c10553b Merge remote-tracking branch 'erasche/blockquotep' into dev
(rebuilt client as well)
2017-07-06 09:29:42 -04:00
anuprulez 065ab584c7 Merging with dev 2017-07-05 23:30:35 +02:00
Dannon Baker bec227436c Client build as part of merge. 2017-07-05 16:57:13 -04:00
anuprulez efc877ab29 Adding showBootstrap feature for Phylocanvas viz 2017-07-05 18:44:38 +02:00
Nicola Soranzo 9eb3c0f40a Merge branch 'release_17.05' into dev
Conflicts:
	static/style/blue/base.css
	test/functional/tools/sample_datatypes_conf.xml
2017-07-05 16:19:10 +01:00
John Chilton 7ce50a8ff7 Merge remote-tracking branch 'upstream/dev' into login_only 2017-07-04 05:40:31 -04:00
Jelle Scholtalbers 010beb8270 code optimization - reuse userTab variable 2017-07-04 09:01:10 +02:00
E Rasche eb58436432 Remove p style under blockquote 2017-07-04 01:03:58 +00:00
John Chilton 666c4bcbb0 Merge remote-tracking branch 'guerler/fix_shared_history' into dev 2017-07-03 20:46:42 -04:00
mvdbeek b928236cfa Fix indentation 2017-07-02 16:27:28 +02:00
mvdbeek 36bdd99fbc Keep tool parameters when rerunning a job
with a different tool version, as long as the parameter did not change.
Addresses https://github.com/galaxyproject/galaxy/issues/1729
2017-06-30 16:54:45 +02:00
guerler 5de92dfbf4 Restore basic copy and unshare operations 2017-06-29 04:01:29 +02:00
guerler f8c2c0b035 Add shared history grid to client 2017-06-29 03:47:46 +02:00
Jelle Scholtalbers 9af36bd13b change 'register or login' to just 'login' if 'allow_user_creation=False' 2017-06-28 13:49:19 +02:00
Martin Cech 6a43fad892 Merge branch 'dev' into lib_exclude_restricted
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
2017-06-27 10:49:56 +02:00
Martin Cech c41b284999 adjust logic to match the include deleted checkbox
also make client and set default user preference
2017-06-27 10:41:22 +02:00
Nicola Soranzo a57b4c1715 Merge branch 'release_17.05' into dev
Conflicts:
	static/maps/mvc/tool/tool-form-base.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/tool/tool-form-base.js
2017-06-27 03:25:44 +02:00
Dannon Baker c18479b79c Merge remote-tracking branch 'guerler/grids_published' into dev 2017-06-22 17:15:50 -04:00
Martin Cech 9cec283b5a make the overlay icon toggleable, change wording 2017-06-22 11:28:32 -04: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 bf65490a14 Merge branch 'dev' into grids_published 2017-06-21 12:37:15 -04:00
anuprulez e9b132bd53 Merging with dev 2017-06-21 17:26:48 +02:00
anuprulez 6704872cd9 Moving the creation of script and style tags to Utils 2017-06-21 17:18:46 +02:00
guerler 490d738ba4 Fix left/right panel hiding 2017-06-20 22:26:03 -04:00
Dannon Baker 9b9e2aa227 Merge remote-tracking branch 'bgruening/convertworkflowmako' into dev 2017-06-20 21:22:28 -04:00
anuprulez 19231b73f3 Reduce opening of search overlay to one step - just click on the magnifier 2017-06-20 19:33:49 +02:00
anuprulez 8a09836ba7 Merging with dev 2017-06-19 23:10:14 +02:00