 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 |
|
|
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 |
|
|
Carl Eberhard
|
b0a8c6f52b
|
UI, Histories: use renderItems for batched changes in options menu
|
2015-08-10 10:30:39 -04:00 |
|
|
Carl Eberhard
|
971b96ddd6
|
UI, Histories: when calling 'Delete hidden', both delete *and* unhide the datasets (preventing them from being both deleted and hidden)
|
2015-08-10 10:10:33 -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 |
|