 Dannon Baker
|
9cbcb525eb
|
Merge branch 'release_17.05' into dev
|
2017-07-17 09:31:00 -04:00 |
|
|
Dannon Baker
|
d4d558b27a
|
Merge remote-tracking branch 'guerler/fix_id_encoding' into release_17.05
Includes client rebuild.
|
2017-07-17 09:22:10 -04:00 |
|
|
guerler
|
6d1e2cf45c
|
Merge branch 'dev' into grid_trackster_selection
|
2017-07-12 16:52:59 -04:00 |
|
|
Dannon Baker
|
636c30704b
|
Rebuild with new bundled Japanese translations.
|
2017-07-12 14:39:57 -04:00 |
|
|
guerler
|
56d939e38c
|
Fix checkbox handling in grid view, related to the select all feature
|
2017-07-12 12:57:01 -04:00 |
|
|
guerler
|
f94722ea00
|
Fix async url
|
2017-07-12 12:34:50 -04:00 |
|
|
guerler
|
a601e5f78e
|
Remove history selector in favor of history sorting feature
|
2017-07-12 12:32:14 -04:00 |
|
|
Dannon Baker
|
72362815fc
|
Add localization defaults to base locale.js, rebuild client to incorporate latest changes from @manabuishii
|
2017-07-12 10:26:14 -04:00 |
|
|
guerler
|
78ffd4d915
|
Library selection is not possible
|
2017-07-12 10:20:10 -04:00 |
|
|
guerler
|
53a6ea4acc
|
Merge branch 'dev' into grid_trackster_selection
|
2017-07-12 10:14:40 -04:00 |
|
|
guerler
|
3388751834
|
Add dbkey filter support
|
2017-07-12 10:13:21 -04:00 |
|
|
Dannon Baker
|
030eaf83ac
|
Merge pull request #4293 from guerler/grid_pages_selection_grid
Use dictionary endpoints for item selection grids in page editor
|
2017-07-12 10:06:35 -04:00 |
|
|
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 |
|
|
Dannon Baker
|
3d98ce7d86
|
Merge pull request #4291 from guerler/grid_published_histories
Grid published histories
|
2017-07-10 10:53:20 -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 |
|
|
anuprulez
|
574b470eb2
|
Merge branch 'dev' of https://github.com/bgruening/galaxy into enhancement_phylocanvas
|
2017-07-07 14:22:45 +02:00 |
|
|
anuprulez
|
c26d068391
|
Update logic to show node name and bootstrap
|
2017-07-07 14:20:35 +02:00 |
|
|
anuprulez
|
23f3a31d27
|
Round off the confidence values
|
2017-07-07 13:58:49 +02:00 |
|
|
anuprulez
|
ee948063e1
|
Show the confidence value as text on phylogenetic tree branches
|
2017-07-07 13:32:59 +02:00 |
|
|
anuprulez
|
390afd6e83
|
Updating the node tooltip to add confidence level information
|
2017-07-06 18:42:40 +02: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 |
|