Commit Graph
27562 Commits
Author SHA1 Message Date
guerler 7f111eea52 Add missing spaces 2017-04-11 13:51:27 -04:00
guerler 9c9a7b97c5 Remove parsing of app parameter from select field wrapper 2017-04-11 13:48:52 -04:00
guerler 8ef55bca36 Remove app parameter from callers used in makos 2017-04-11 13:39:05 -04:00
guerler 18b006cb75 Remove app parameter from text conversion caller 2017-04-11 13:36:03 -04:00
guerler 278030638c Use new runtime value identifier for select field context values 2017-04-11 13:12:18 -04:00
guerler 7439d03baf Remove optional app parameter for text conversion caller 2017-04-11 13:10:12 -04:00
guerler c134dac9d5 Identify and handle runtime values when generating displayed text 2017-04-11 12:58:33 -04:00
John Chilton e7a4ae5c15 Merge pull request #3821 from mvdbeek/repository_updates
Merge ToolConfWatchers and separate from Toolbox
2017-04-07 12:34:22 -04:00
John Chilton b5323e7147 Merge pull request #3884 from glormph/kronik_proteomics_datatype
Hardklor and kronik datatypes for proteomics
2017-04-07 12:24:10 -04:00
John Chilton f5ade2b5da Merge pull request #3897 from guerler/fix_refresh_trigger
Add missing trigger event to drop handler in content selector
2017-04-07 12:22:45 -04:00
John Chilton 408906efb1 Merge pull request #3895 from dannon/routes_cleanup
Routes cleanup
2017-04-07 12:22:02 -04:00
Nicola Soranzo 5b880697c2 Merge pull request #3874 from bgruening/new_ucsc
synchronise against latest UCSC versions
2017-04-07 16:58:57 +01:00
Björn Grüning cac9c980df remove obsolete line 2017-04-07 17:13:56 +02:00
guerler ea17f2dacf Merge branch 'dev' into fix_refresh_trigger 2017-04-06 20:40:22 -04:00
Aysam Guerler 8ea4cf29f8 Merge pull request #3868 from dannon/tags_improvements
Adding tagging to collections.
2017-04-06 19:34:22 -04:00
guerler 2b4b431d0a Add missing trigger event to drop handler in content selector 2017-04-06 18:17:10 -04:00
Dannon Baker 483f25c5c2 Merge pull request #3896 from bgruening/bugfix_cytoscape
Cytoscape bugfix for SIF files
2017-04-06 17:27:39 -04:00
anuprulez ee66994c44 Merge branch 'dev' of https://github.com/bgruening/galaxy into bugfix_cytoscape 2017-04-06 23:15:22 +02:00
anuprulez 95fd21230b Adding bug fix for SIF files 2017-04-06 23:13:14 +02:00
Dannon Baker 1a5d570704 Remove comment, rebuild. 2017-04-06 14:35:15 -04:00
Dannon Baker cad62b1f8b Merge remote-tracking branch 'upstream/dev' into tags_improvements 2017-04-06 14:30:46 -04:00
Martin Cech 69ff6ab906 Merge pull request #3894 from dannon/search_controller_removal
Remove old, unused search controller.
2017-04-06 14:13:35 -04:00
Björn Grüning dc80d8c7dc Merge pull request #3890 from jmchilton/fix_docker_testing
Update to a new Docker test image to fix dependency bugs.
2017-04-06 20:03:07 +02:00
Björn Grüning d19be8bf46 Merge pull request #3891 from nsoranzo/python3
Python3: Use shlex_quote() from six.moves instead of pipes.quote()
2017-04-06 20:01:10 +02:00
Dannon Baker a2a64821b4 This login route is also unnecessary 2017-04-06 13:54:34 -04:00
Dannon Baker e085f8cb41 Routes cleanup -- this adjust_hidden route is unnecessary and is handled by the normal controller logic. 2017-04-06 13:50:57 -04:00
Dannon Baker 334f4d7a19 Remove old, unused search controller. This would be implemented as a clientside route if we ever pursued development. 2017-04-06 13:31:47 -04:00
Nicola Soranzo 232e809692 Python3: Use shlex_quote() from six.moves instead of pipes.quote() 2017-04-06 13:52:32 +01:00
John Chilton eb0ff254a5 Update to a new Docker test image to fix dependency bugs.
Hopefully this will fix tests for #3179.
2017-04-06 08:37:09 -04:00
John Chilton af37dd55de Merge pull request #3657 from lecorguille/dynamic_tool_nest_param
Allow nest param in the dynamic_tool rule -> argument
2017-04-06 08:24:55 -04:00
John Chilton bcd24e8454 Merge pull request #3886 from guerler/history_drag_drop_000
History drag-and-drop feature with iframe support for run workflow form
2017-04-06 08:19:57 -04:00
Dannon Baker 9e9a2d8312 Rerender specifically subtitle iff it's the only changed attribute. 2017-04-05 19:22:59 -04:00
Dannon Baker 2ab68fea8b Remove redundant listener, handled in parent. 2017-04-05 19:16:00 -04:00
Dannon Baker d41a4efd88 For datasets, only rerender title bar if tags have changed (for nametags) 2017-04-05 19:08:00 -04:00
guerler 6a625b2c61 Merge branch 'dev' into history_drag_drop_000 2017-04-05 17:58:33 -04:00
Aysam Guerler 5055172e64 Merge pull request #3889 from dannon/unused_glob
Unused glob in buildapp
2017-04-05 17:58:15 -04:00
Dannon Baker 72a3fea37f Unused glob in buildapp 2017-04-05 17:55:57 -04:00
guerler d2205c4167 Merge branch 'dev' into history_drag_drop_000 2017-04-05 17:54:00 -04:00
Dannon Baker 5a513b20bb Remove (previously) never-invoked change code which now double-invokes. Parents will handle this. 2017-04-05 17:53:49 -04:00
Dannon Baker c6ce56dd0a Merge pull request #3888 from guerler/remove_unused_model
Remove unused model import from users api
2017-04-05 17:50:55 -04:00
guerler d9bb8a7d30 Remove unused model import from users api 2017-04-05 17:49:47 -04:00
Dannon Baker 2215869f2d Listen to tag change events, rerender list item for nametags. 2017-04-05 17:47:03 -04:00
guerler 6f95ba9c2c Merge branch 'dev' into history_drag_drop_000 2017-04-05 17:44:47 -04:00
Aysam Guerler c9863b251e Merge pull request #3887 from dannon/fix_broken_jenkins
Fix new history endpoint providing custom builds metadata
2017-04-05 17:28:30 -04:00
Dannon Baker d9d4ce0ad3 Looks like this was always using trans.hsitory instead of the id that was passed to the endpoint. 2017-04-05 17:23:25 -04:00
guerler 37b6d907cb Remove unused cursor style 2017-04-05 17:05:08 -04:00
guerler ba91462362 Add delay attribute to time success/error highlighting 2017-04-05 17:04:24 -04:00
guerler 7304d5bdc4 Merge branch 'dev' into history_drag_drop_000 2017-04-05 17:01:22 -04:00
guerler 74f97a8942 Fix for dropping into run workflow iframe 2017-04-05 16:53:31 -04:00
Dannon Baker 54b7c32bd2 Render nametags from core tag data instead of a different field. This actually should be somewhat faster, along with being easier to track/update. 2017-04-05 15:25:46 -04:00