opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,279 Commits 69 Branches 243 Tags
8430ca4e3fc506db41357312db0cced248ee43dd
Commit Graph
2627 Commits
Author SHA1 Message Date
Carl Eberhard 8430ca4e3f UI, histories: correct allFetched setting in setCollection to allow fetching after changing collection order 2015-09-03 16:42:48 -04:00
Nicola Soranzo bcbeb75a68 Merge branch 'master' into dev 
Conflicts:
	lib/tool_shed/dependencies/tool/tag_attribute_handler.py
 2015-09-02 16:10:03 +01:00
Dannon Baker c47d4a715e Merge pull request #676 from carlfeberhard/history.multi 
Lazy-load histories into multi-history view
 2015-09-01 13:54:11 -04:00
guerler 4dd6304f05 Fix version parsing in tool form 2015-08-31 12:34:26 -04:00
Carl Eberhard efc1df79f1 UI, histories: move load indicator style to less, use better name 2015-08-31 10:11:54 -04:00
Carl Eberhard 15fe2b7d8f UI, histories: lazy-load histories in the multi-history view, handle search loading indication better, move sort/comparator code into collection 2015-08-31 09:56:20 -04:00
guerler d2e61e8af4 Filter deleted library datasets 2015-08-27 11:52:45 +01:00
Jeremy Goecks 19c85e0705 Fixes to make Sweepster work again: (a) update template syntax to match changes made in underscore v1.7 and (b) update tool rerun to account for API changes. 2015-08-27 11:47:57 +01:00
Martin Cech f9f763f430 add missing js build 2015-08-25 16:35:31 -04:00
carlfeberhard eb59844dd2 Merge pull request #626 from Airistotal/dev 
Bug fix in Reports
 2015-08-21 12:50:05 -04:00
Carl Eberhard d8ee54251a Merge remote-tracking branch 'origin/dev' into history.multi 2015-08-21 10:19:56 -04:00
Carl Eberhard ea130e2c00 Histories: move order parsing into managers; View multi: allow and pass ordering into bootstrapped histories, limit to 10; View multi, client: allow better collection setting and addition 2015-08-21 10:15:38 -04:00
guerler 94dfbaa10a Change pencil icon to edit icon 2015-08-20 15:49:42 -04:00
Airistotal 673dd2b140 Refactored where d3 is coming from 2015-08-20 14:49:09 -05:00
guerler 9fb615f83a Change FTP icon to open folder icon 2015-08-20 15:39:00 -04:00
guerler b19f4b217b Remove unused helper code 2015-08-19 15:33:07 -04:00
guerler 46e47dd4cb Use shorter style name 2015-08-19 14:47:43 -04:00
guerler 312242b217 Floating icon needs special case handling 2015-08-19 14:45:00 -04:00
guerler 8cff4da924 Improve style class naming, reduce classes 2015-08-19 14:18:04 -04:00
guerler d89450a53c Remove helper text from composite dialog 2015-08-19 10:33:16 -04:00
guerler 4d7b3213c9 Change label text 2015-08-19 10:15:30 -04:00
guerler ff0b0baf01 Add icon to helper message 2015-08-19 09:58:07 -04:00
guerler f03840459b Shorten title text, center drop helper labels 2015-08-18 21:19:18 -04:00
guerler 7c0ad6b857 Add similar helper text to composite section 2015-08-18 17:02:57 -04:00
guerler d98aba9c2a Fix ambiguous naming of item/model/row variables, add drag and drop helper text and styles 2015-08-18 15:40:50 -04:00
Dannon Baker b6e0ba2952 Merge pull request #605 from guerler/upload_000 
Add composite file uploader
 2015-08-18 12:56:45 -04:00
Airistotal e7a753bb6f Ran grunt 2015-08-18 11:31:05 -05:00
guerler 89801414bb Enhance FTP visibilty handling 2015-08-17 15:00:06 -04:00
guerler ed171e9519 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	static/maps/utils/utils.js.map
	static/scripts/utils/utils.js
	static/style/blue/base.css
 2015-08-17 11:36:49 -04:00
guerler 0c3fdd2d63 Add test cases for uploader, add generic Galaxy environment to qunit 2015-08-17 11:33:03 -04:00
Dannon Baker 634799803e Merge from release and rebuild. 2015-08-17 09:30:51 -04:00
Dannon Baker 4463676e2c Merge branch 'release_15.07' into dev 2015-08-17 09:30:02 -04:00
carlfeberhard c0119de12e Merge pull request #601 from dannon/grunt_develop_mode 
Grunt develop mode
 2015-08-17 09:13:31 -04:00
Dannon Baker 4459e9411b Merge pull request #578 from carlfeberhard/history.s-n-d 
Remove more history UIController methods.
 2015-08-14 11:32:45 -04:00
guerler 704e031f63 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 2015-08-14 02:24:16 -04:00
guerler 304e693fd3 Allow safe switching between histories while queue is running 2015-08-14 00:45:48 -04:00
Dannon Baker 79dbff1967 Merge pull request #602 from guerler/fix_collections_000 
[15.07] Fix output collection terminal base class
 2015-08-13 16:49:30 -04:00
guerler c938e66e98 Fix output collection terminal base class 2015-08-13 15:34:19 -04:00
Dannon Baker 63d6c37a39 Rebuild client w/ new options. 2015-08-13 15:23:55 -04:00
Nate Coraor d9426dab92 Merge branch 'security-20150812-ldap' into release_15.07 2015-08-12 17:00:28 -04:00
Dannon Baker 303597e48a Remove old cloudlaunch in favor of https://github.com/galaxyproject/cloudlaunch, at launch.usegalaxy.org 2015-08-12 14:17:44 -04:00
guerler dd421d0007 Minor fixes 2015-08-12 11:35:45 -04:00
guerler b07625b0c0 Remove unnecessary if condition in ftp uploader 2015-08-11 14:28:40 -04:00
guerler 1686109ae8 Fix sorting for upper case extension 2015-08-11 14:17:22 -04:00
guerler 82c732752f Fix unload message if queue is running/active 2015-08-11 14:10:00 -04:00
guerler 4da5f1370f Fix corner cases ie missing datatype details 2015-08-11 13:10:45 -04:00
guerler 80e45d230b Add icons to buttons in regular view 2015-08-11 12:55:55 -04:00
guerler a8def9a910 Style fixes, adjustments for ftp popover table 2015-08-11 12:44:49 -04:00
guerler c7ad46099c Enable ftp file selection for composite uploads 2015-08-11 11:55:17 -04:00
guerler b3c0725d97 Continue ftp popup integration 2015-08-11 09:19:28 -04:00