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
18,941 Commits 69 Branches 243 Tags
80e45d230b1ea5a3bf8a77e573ed8a33a4263f4d
Commit Graph
2577 Commits
Author SHA1 Message Date
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
guerler 4beeeecf4c Fix file names and description 2015-08-10 11:40:20 -04:00
guerler eaff25b6eb Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	client/galaxy/scripts/mvc/upload/upload-view.js
	static/maps/mvc/upload/upload-view.js.map
	static/scripts/mvc/upload/upload-view.js
	static/style/blue/base.css
 2015-08-10 11:26:37 -04:00
guerler 92526c8340 Fix update screen calls 2015-08-10 11:24:37 -04:00
guerler 5e4c0bcf64 Fix start button style 2015-08-10 10:03:26 -04:00
guerler 17b84cb7b4 Fix paste/fetch field style 2015-08-10 09:54:12 -04:00
Martin Cech c51b5c9b8d Merge pull request #472 from Airistotal/Reports_homepage 
Reports homepage
 2015-08-09 20:57:34 -04:00
guerler 3fae23368b Fix color to primary/blue 2015-08-07 20:07:07 -04:00
guerler 1f3ee5f648 Adjust start button location 2015-08-07 16:41:00 -04:00
guerler b0c7b736d4 Add green start button, fix text field 2015-08-07 16:36:22 -04:00
guerler d76efc5752 Activate paste/fetch feature, improve behavior 2015-08-07 16:24:24 -04:00
guerler 2d332e9b71 Disable restart button if upload completed 2015-08-07 15:18:30 -04:00
Martin Cech d6d8604d53 update with @jxtx suggesting of using existing classes 2015-08-07 15:18:18 -04:00
guerler 960d9e5634 Fix ui behavior for restart, progress and result states 2015-08-07 15:06:14 -04:00
Martin Cech b887606616 make the 'Start' button green when enabled 
I have seen numerous times how people struggle to find the correct
button when uploading. This should help them.
 2015-08-07 14:41:05 -04:00
Airistotal c7b9ee3c13 Merge branch 'dev' of https://github.com/Airistotal/galaxy into Reports_homepage 
Conflicts:
	client/galaxy/style/less/base.less
	static/style/blue/base.css
 2015-08-06 15:44:22 -05:00
Martin Cech 86757fb13a Merge pull request #410 from Airistotal/Reports_newpage 
Reports newpage
 2015-08-06 16:26:53 -04:00
John Chilton 4441fb4732 Merge pull request #568 from ericenns/new-tool-form-batch-collection 
[15.05] Fix batch mode input in new tool form ui
 2015-08-06 20:36:27 +01:00
Eric Enns 864e2b5111 Fix batch mode for collection, when collection maps to multiple inputs 2015-08-06 14:29:51 -05:00
John Chilton 668e650f52 Merge pull request #526 from carlfeberhard/trackster.existing-browser 
Visualizations, trackster: allow the user to add the dataset launched…
 2015-08-05 20:50:18 +01:00
guerler 8eca23e4b4 Attach success, error handlers for composite uploads, fixes 2015-08-05 05:43:29 -04:00
guerler 8e093847f9 Enable composite data submission 2015-08-05 04:41:18 -04:00
guerler 42c61535d6 Separate upload post function, remove some unnecessary functions 2015-08-05 01:49:10 -04:00
guerler cc46b65d16 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	static/style/blue/base.css
 2015-08-05 01:05:35 -04:00
guerler 1338904288 Separate file submission from upload queue, augment and generalize send function 2015-08-05 01:03:40 -04:00
Airistotal 8395244a38 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_homepage 
Conflicts:
	static/style/blue/base.css
 2015-08-04 13:08:03 -05:00
Airistotal 5df41184d4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_newpage 
Conflicts:
	static/style/blue/base.css
 2015-08-04 13:07:08 -05:00
Airistotal 7eb075e711 Added cursor change to indicate that you can zoom 
Added comments to script to make it easier to find
Organized script to make it easier to understand
 2015-08-04 12:04:17 -05:00
guerler efcfc897d6 Filter deleted library datasets 2015-08-03 15:02:20 -04:00
guerler ea26355761 More cleanup, fix model creation 2015-08-03 13:51:37 -04:00
guerler 1f9d5443fb Style margin fixes 2015-08-02 19:25:32 -04:00
guerler ecd38ef6db Enable drag-and-drop, use dropdown instead of select, style fix uploadbox.js 2015-08-02 12:54:05 -04:00
Björn Grüning cf516c5698 Merge pull request #536 from carlfeberhard/client.update-libs 
Update client libs: farbtastic, jqtouch, bib2json
 2015-08-01 12:42:50 +02:00
Carl Eberhard ba4aabc186 Client, libs: update and track farbtastic and jqtouch; compress scripts 2015-07-31 12:48:10 -04:00
guerler f753a6159e Fix for settings popup and more code cleanup 2015-07-31 10:32:12 -04:00
guerler 237a3d307d More touchup/cleanup for upload views 2015-07-30 14:27:24 -04:00
Carl Eberhard de375004c9 UI, histories: render nice_size on the client 2015-07-30 13:10:13 -04:00
guerler f83eaa8fe7 Uploadbox plugin touchup 2015-07-30 12:52:47 -04:00
guerler 5cdd511b7a Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 
Conflicts:
	static/style/blue/base.css
 2015-07-30 12:46:12 -04:00
Airistotal 13522af7d1 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_newpage 2015-07-29 16:24:27 -05:00
Airistotal cc2cd0fb01 Merge branch 'dev' of https://github.com/Airistotal/galaxy into Reports_homepage 
Conflicts:
	static/scripts/reports_webapp/run_stats.js
 2015-07-29 16:12:31 -05:00
Airistotal 8d5ef14d4f Changed spacing 2015-07-29 16:06:23 -05:00
guerler a9274619af Adjust icon styles 2015-07-29 16:06:22 -04:00
Dannon Baker 09f0aaf371 Run grunt. 2015-07-29 15:53:31 -04:00
Dannon Baker 9c3be3efb4 Merge branch 'Reports_homepage' of https://github.com/Airistotal/galaxy into Airistotal-Reports_homepage 2015-07-29 15:46:06 -04:00
guerler bb7f9a8a51 [WIP] Further adjustments to styles and colors 2015-07-29 15:23:44 -04:00
Carl Eberhard 2c2f49bf8e Visualizations, trackster: allow the user to add the dataset launched from as a new track in an existing trackster visualization; add utils/query-string-parsing.js for pulling query params from the query string 2015-07-29 13:57:34 -04:00